Author: hqm
Date: 2007-12-04 06:07:51 -0800 (Tue, 04 Dec 2007)
New Revision: 7442
Modified:
openlaszlo/trunk/WEB-INF/lps/config/lps.properties
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Canvas.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
openlaszlo/trunk/lps/includes/source/embednew.js
Log:
Change 20071204-hqm-a by [EMAIL PROTECTED] on 2007-12-04 01:19:56 EST
in /cygdrive/c/users/hqm/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: change runtime default to swf8, also change default cache sizes
New Features:
Bugs Fixed: LPP-5188
Technical Reviewer: ptw
QA Reviewer: max
Doc Reviewer:
Documentation:
Release Notes:
Details:
Change default runtime to swf8. Needed to modify embednew.js because it
had swf7 hardcoded in as the default runtime.
Also, changed LPS server cache sizes to match the demo server deployed values
which seem to make the server be stable these days.
Tests:
run this app and verify that it thinks the runtime is swf8
<canvas width="100%" height="80%" >
<simplelayout/>
<text text="${'canvas.runtime='+canvas.runtime}"/>
<text text="${'$swf7='+ $swf7+ ', $swf8=' + $swf8}"/>
</canvas>
Modified: openlaszlo/trunk/WEB-INF/lps/config/lps.properties
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/config/lps.properties 2007-12-04 13:28:13 UTC
(rev 7441)
+++ openlaszlo/trunk/WEB-INF/lps/config/lps.properties 2007-12-04 14:07:51 UTC
(rev 7442)
@@ -96,9 +96,13 @@
# Runtime Data cache
#dcache.directory=WEB-INF/lps/work/dcache
+cache.disk.size=20000000
+cache.mem.item.max=1000000
+cache.mem.size=1000000
+
# Cache sizes (0 = disabled (or allow 1 item for disk caches), -1 means
infinite)
# Defaults are 500000000 for disk and 1000000 for mem
-#mcache.disk.size=500000000
+mcache.disk.size=20000000
#mcache.mem.size=1000000
# Max size allowable for an item to be cached in memory
@@ -114,6 +118,7 @@
# Compiler Media Cache
# there is no need to keep any of these files in memory
cmcache.mem.size=0
+cmcache.disk.size=20000000
# Keeps script cache small
scache.disk.size=10000000
@@ -148,7 +153,7 @@
# Where the LFC lives (relative to HOME)
compiler.runtime.dir=lps/includes/lfc
# Default runtime
-compiler.runtime.default=swf7
+compiler.runtime.default=swf8
# Turn backtraces on in the debugger (slower, off by default)
# compiler.debug.backtrace=true
# TODO: Remove after Leopard
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Canvas.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Canvas.java
2007-12-04 13:28:13 UTC (rev 7441)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Canvas.java
2007-12-04 14:07:51 UTC (rev 7442)
@@ -110,7 +110,7 @@
private String mTitle = DEFAULT_TITLE;
/** Version of the flash player file format which we compile to **/
- private String mRuntime = LPS.getProperty("compiler.runtime.default",
"swf7");
+ private String mRuntime = LPS.getProperty("compiler.runtime.default",
LPS.getRuntimeDefault() );
/** computed debug flag, based on canvas 'debug' attribute + compilation
request args **/
private boolean mDebug = false;
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java
2007-12-04 13:28:13 UTC (rev 7441)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/Main.java
2007-12-04 14:07:51 UTC (rev 7442)
@@ -111,7 +111,9 @@
String scacheDir = LPS.getWorkDirectory() + File.separator + "scache";
ScriptCompiler.initScriptCompilerCache(new File(scacheDir), new
Properties());
// Set default runtime to compiler.runtime.default
- compiler.setProperty(CompilationEnvironment.RUNTIME_PROPERTY,
LPS.getProperty("compiler.runtime.default", "swf7"));
+ compiler.setProperty(CompilationEnvironment.RUNTIME_PROPERTY,
+ LPS.getProperty("compiler.runtime.default",
+ LPS.getRuntimeDefault()));
boolean flushScriptCache = false;
for (int i = 0; i < args.length; i++) {
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
2007-12-04 13:28:13 UTC (rev 7441)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
2007-12-04 14:07:51 UTC (rev 7442)
@@ -66,7 +66,7 @@
options.putBoolean(OBFUSCATE, false);
}
if (! options.containsKey(RUNTIME)) {
- options.put(RUNTIME, LPS.getProperty("compiler.runtime.default",
"swf7"));
+ options.put(RUNTIME, LPS.getProperty("compiler.runtime.default",
LPS.getRuntimeDefault()));
}
defaultOptions();
if (options.getBoolean(PRINT_COMPILER_OPTIONS)) {
Modified: openlaszlo/trunk/lps/includes/source/embednew.js
===================================================================
--- openlaszlo/trunk/lps/includes/source/embednew.js 2007-12-04 13:28:13 UTC
(rev 7441)
+++ openlaszlo/trunk/lps/includes/source/embednew.js 2007-12-04 14:07:51 UTC
(rev 7442)
@@ -56,7 +56,7 @@
var i = url.indexOf('lzr=swf');
if (i == -1) {
// add default version if missing
- url += '&lzr=swf7';
+ url += '&lzr=swf8';
i = url.indexOf('lzr=swf');
//alert('added version ' + url + ', ' + i);
}
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
