[Laszlo-checkins] r5981 - in labs/lzproject/trunk: . lzx/__PROXIED_html
raju@openlaszlo.org
raju at openlaszlo.org
Thu Aug 9 11:09:55 PDT 2007
Author: raju
Date: 2007-08-09 11:09:51 -0700 (Thu, 09 Aug 2007)
New Revision: 5981
Modified:
labs/lzproject/trunk/build.xml
labs/lzproject/trunk/lzx/__PROXIED_html/LZProject-DHTML.html
Log:
HTML wrapper for DHTML runtime PROXIED fixed.
Modified: labs/lzproject/trunk/build.xml
===================================================================
--- labs/lzproject/trunk/build.xml 2007-08-09 18:03:19 UTC (rev 5980)
+++ labs/lzproject/trunk/build.xml 2007-08-09 18:09:51 UTC (rev 5981)
@@ -9,14 +9,14 @@
<loadfile property="copyright" srcFile="copyright.txt"/>
<!-- Include property files with my settings -->
- <property file="my.ant.properties" />
+ <property file="ant.properties" />
<!-- Environment vars -->
<property environment="env"/>
<!-- name of Java web application / WAR-file
in case of SOLO war the char sequence "-SOLO" is added -->
- <property name="webapp.name" value="blueprint" />
+ <property name="webapp.name" value="lzproject" />
<!-- Markers in the LZX files like @copyright@ which will be replaced -->
<property name="marker.copyright" value="copyright" />
@@ -25,7 +25,8 @@
<!-- OpenLaszlo version used.
To compile the application, a version OpenLaszlo servlet distribution
has to be unzipped into the openlaszlo folder,
- e.g. ./openlaszo/opernlaszlo-4.0.3 -->
+ e.g. ./openlaszo/opernlaszlo-4.0.3.
+ The directory name can then be adjusted in the ant.properties file -->
<property name="openlaszlo.dir" location="openlaszlo" />
<!-- OpenLaszlo version has to be set in my.properties property file -->
<property name="openlaszlo.home" value="${openlaszlo.dir}/${openlaszlo.version}" />
@@ -120,12 +121,9 @@
<!-- Copy LZX, JSP and other text files into folder ${temp.dir} -->
<target name="copy-files-temp" depends="init">
- <echo message="Copying files from ${lzx.dir} to ${temp.dir}" />
+ <echo message="Copying files from ${lzx.dir} to ${temp.dir}/lzproject" />
<echo message="Replacing @${marker.webapp}@ with ${webapp.name} in all copied files" />
- <echo message="Replacing @${marker.fileoptions}@ with 'lzx?lzt=swf' in all copied files" />
- <echo message="Replacing @${marker.openlaszlo.debug}@ with '${openlaszlo.isDebug}' in all copied files" />
- <parallel></parallel>
- <copy todir="${temp.dir}">
+ <copy todir="${temp.dir}/lzproject">
<fileset dir="${lzx.dir}" casesensitive="no">
<include name="**/*.lzx" />
<include name="**/*.xml" />
@@ -148,12 +146,12 @@
<!-- If you use the webapp name inside LZX, just place this marker there
and it will be replaced: @webapp_name@ -->
<filter token="${marker.webapp}" value="${webapp.name}" />
- <!-- Copyright-Informationen einfügen -->
+ <!-- automatically add copyright information -->
<filter token="${marker.copyright}" value="${copyright}" />
</filterset>
</copy>
<!-- Now copy the files where don't have to check for markers -->
- <copy todir="${temp.dir}">
+ <copy todir="${temp.dir}/lzproject">
<fileset dir="${lzx.dir}" casesensitive="no">
<include name="**/*.css" />
<include name="**/*.gif" />
@@ -239,7 +237,7 @@
<echo message="Adding libs from ${openlaszlo.home}/WEB-INF/libs" />
<!-- now copy the proxied DHTML wrapper -->
<copy todir="${temp.dir}/lzproject" verbose="true">
- <fileset dir="${lzx.dir}/lzproject/__PROXIED_html" casesensitive="no">
+ <fileset dir="${lzx.dir}/__PROXIED_html" casesensitive="no">
<include name="*.html" />
</fileset>
</copy>
@@ -298,7 +296,7 @@
<echo message="Using web.xml at ${webapp.webinf.dir}/web.xml" />
<!-- now copy the SOLO DHTML wrapper -->
<copy todir="${temp.dir}/lzproject" verbose="true">
- <fileset dir="${lzx.dir}/lzproject/__SOLO_html" casesensitive="no">
+ <fileset dir="${lzx.dir}/__SOLO_html" casesensitive="no">
<include name="*.html" />
</fileset>
</copy>
@@ -395,6 +393,8 @@
<param name="file" value="${temp.dir}/lzproject/LZProject.lzx" />
<param name="args" value="--runtime=dhtml" />
</antcall>
+ <!-- the naming scheme for files compiled through lzc is different
+ from the server, correct that -->
<!--move file="${temp.dir}/lzproject/LZProject.lzx.lzr=null.swf"
tofile="${temp.dir}/lzproject/LzTrack.lzx.lzr=swf7.swf"
verbose="true" /-->
@@ -402,7 +402,7 @@
<param name="file" value="${temp.dir}/lzproject/LZProject.lzx" />
<param name="args" value="--runtime=swf7" />
</antcall>
- <!-- the naming schema for files compiled through lzc is different
+ <!-- the naming scheme for files compiled through lzc is different
from the server, correct that -->
<move file="${temp.dir}/lzproject/LZProject.js"
tofile="${temp.dir}/lzproject/LZProject.lzx.js"
Modified: labs/lzproject/trunk/lzx/__PROXIED_html/LZProject-DHTML.html
===================================================================
--- labs/lzproject/trunk/lzx/__PROXIED_html/LZProject-DHTML.html 2007-08-09 18:03:19 UTC (rev 5980)
+++ labs/lzproject/trunk/lzx/__PROXIED_html/LZProject-DHTML.html 2007-08-09 18:09:51 UTC (rev 5981)
@@ -29,9 +29,9 @@
})(null, null);
}
</script><script type="text/javascript">
- lzOptions = { ServerRoot: '/blueprint'};
- </script><script type="text/javascript" src="/blueprint/lps/includes/embed-compressed.js"></script><script type="text/javascript">
- Lz.dhtmlEmbedLFC('/blueprint/lps/includes/lfc/LFCdhtml.js');
+ lzOptions = { ServerRoot: '/lzproject'};
+ </script><script type="text/javascript" src="/lzproject/lps/includes/embed-compressed.js"></script><script type="text/javascript">
+ Lz.dhtmlEmbedLFC('/lzproject/lps/includes/lfc/LFCdhtml.js');
</script><style type="text/css">
html, body
{
@@ -48,7 +48,7 @@
}
img { border: 0 none; }
- </style></head><body><div id="lzsplash" style="z-index: 10000000; top: 0; left: 0; width: 100%; height: 100%; position: fixed; display: table"><p style="display: table-cell; vertical-align: middle;"><img src="/blueprint/lps/includes/spinner.gif" style="display: block; margin: 20% auto"></p></div><script type="text/javascript">
+ </style></head><body><div id="lzsplash" style="z-index: 10000000; top: 0; left: 0; width: 100%; height: 100%; position: fixed; display: table"><p style="display: table-cell; vertical-align: middle;"><img src="/lzproject/lps/includes/spinner.gif" style="display: block; margin: 20% auto"></p></div><script type="text/javascript">
Lz.dhtmlEmbed({url: 'LZProject.lzx?lzt=object&lzr=dhtml&_canvas_debug=false', bgcolor: '#e5e5e5', width: '100%', height: '100%', id: 'lzapp'});
</script><noscript>
Please enable JavaScript in order to use this application.
More information about the Laszlo-checkins
mailing list