Author: hqm
Date: 2007-10-01 14:14:24 -0700 (Mon, 01 Oct 2007)
New Revision: 6707
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/server/LPS.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/LZServlet.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderOBJECT.java
Log:
Change 20071001-hqm-0 by [EMAIL PROTECTED] on 2007-10-01 13:24:07 EDT
in /cygdrive/c/users/hqm/openlaszlo/trunk2
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: allow dhtml as default runtime
New Features:
Bugs Fixed: LPP-3705
Technical Reviewer: pbr
QA Reviewer: ptw
Doc Reviewer: jrs
Documentation:
Release Notes:
Details:
Assign default runtime from one place (LPS.java), and assume runtime default if
no 'lzr'
query arg is supplied in RESPONDERObject.java for lzt=object requests
Tests:
restart tomcat, and see if apps come up as DHTML by default with no lzr arg,
and with lzt=html queries
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
2007-10-01 19:35:14 UTC (rev 6706)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/CompilationEnvironment.java
2007-10-01 21:14:24 UTC (rev 6707)
@@ -129,7 +129,7 @@
private static int mDefaultTextWidth = 100;
/** Default SWF version to compile to */
- private String mDefaultRuntime =
LPS.getProperty("compiler.runtime.default", "swf7");
+ private String mDefaultRuntime = LPS.getRuntimeDefault();
/** Constructs an instance.
* @param properties compilation properties
Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/server/LPS.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/server/LPS.java
2007-10-01 19:35:14 UTC (rev 6706)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/server/LPS.java
2007-10-01 21:14:24 UTC (rev 6707)
@@ -48,6 +48,8 @@
public static String VERSION_FILE = "/org/openlaszlo/server/lps.xml";
+ public static String mDefaultRuntime = "swf8";
+
private static String mBuildID;
private static String mBuildDate;
private static String mVersionID;
@@ -210,7 +212,7 @@
String lfc = "LFC";
String extension = "js";
if (runtime == null) {
- runtime = LPS.getProperty("compiler.runtime.default", "swf7");
+ runtime = getRuntimeDefault();
}
if (runtime.indexOf("swf") == 0) {
@@ -327,31 +329,21 @@
/**
* Set SWF version default.
*/
- public static void setSWFVersionDefault(String swfversion) {
- if (swfversion.equals("swf8")) {
+ public static void setRuntimeDefault(String runtime) {
+ mDefaultRuntime = runtime;
+ if (runtime.equals("swf8")) {
mSWFVersionNumDefault = 8;
mSWFVersionDefault = "swf8";
- } else if (swfversion.equals("swf7")) {
+ } else if (runtime.equals("swf7")) {
mSWFVersionNumDefault = 7;
mSWFVersionDefault = "swf7";
- } else if (swfversion.equals("swf6")) {
- mSWFVersionNumDefault = 6;
- mSWFVersionDefault = "swf6";
- } else if (swfversion.equals("swf5")) {
- mSWFVersionNumDefault = 5;
- mSWFVersionDefault = "swf5";
- } else {
- throw new RuntimeException(
-/* (non-Javadoc)
- * @i18n.test
- * @org-mes="Unknown SWF version: " + p[0]
- */
- org.openlaszlo.i18n.LaszloMessages.getMessage(
- LPS.class.getName(),"051019-305", new Object[] {swfversion})
- );
- }
+ }
}
+ public static String getRuntimeDefault() {
+ return LPS.getProperty("compiler.runtime.default", mDefaultRuntime);
+ }
+
/**
* @return swf version number
*/
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/LZServlet.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/LZServlet.java
2007-10-01 19:35:14 UTC (rev 6706)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/LZServlet.java
2007-10-01 21:14:24 UTC (rev 6707)
@@ -3,7 +3,7 @@
*
****************************************************************************/
/* J_LZ_COPYRIGHT_BEGIN *******************************************************
-* Copyright 2001-2006 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* J_LZ_COPYRIGHT_END *********************************************************/
@@ -250,7 +250,7 @@
//------------------------------------------------------------
mProperties = LPS.getProperties();
- LPS.setSWFVersionDefault(LPS.getProperty("compiler.runtime.default",
"swf7"));
+ LPS.setRuntimeDefault(LPS.getRuntimeDefault());
// Create responders that create caches (media, data, and compiler)
String[] lzt = { "swf", "media", "data" };
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderOBJECT.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderOBJECT.java
2007-10-01 19:35:14 UTC (rev 6706)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderOBJECT.java
2007-10-01 21:14:24 UTC (rev 6707)
@@ -3,7 +3,7 @@
*
****************************************************************************/
/* J_LZ_COPYRIGHT_BEGIN *******************************************************
-* Copyright 2001-2006 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* J_LZ_COPYRIGHT_END *********************************************************/
@@ -22,6 +22,7 @@
import org.openlaszlo.utils.FileUtils;
import org.openlaszlo.utils.LZHttpUtils;
import org.openlaszlo.utils.StringUtils;
+import org.openlaszlo.server.LPS;
import org.openlaszlo.compiler.CompilationError;
import org.openlaszlo.utils.ChainedException;
@@ -68,14 +69,9 @@
String runtime = req.getParameter("lzr");
if (runtime == null) {
- throw new ChainedException(
- /* (non-Javadoc)
- * @i18n.test
- * @org-mes="no runtime (lzr) query arg supplied"
- */
-
org.openlaszlo.i18n.LaszloMessages.getMessage(Responder.class.getName(),
"060211-100")
- );
+ runtime = LPS.getRuntimeDefault();
}
+
input = mCompMgr.getObjectStream(fileName, props);
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
