[OFBiz] SVN: r6662 - in trunk/framework/webtools: . webapp/webtools/print

[jaz@svn.ofbiz.org]

Author: jaz
Date: 2006-02-02 11:39:09 -0600 (Thu, 02 Feb 2006)
New Revision: 6662

Modified:
   trunk/framework/webtools/build.xml
   trunk/framework/webtools/webapp/webtools/print/printStart.ftl
Log:
changed applet building to include all libraries in a single jar


Modified: trunk/framework/webtools/build.xml
===================================================================
--- trunk/framework/webtools/build.xml	2006-02-02 07:59:45 UTC (rev 6661)
+++ trunk/framework/webtools/build.xml	2006-02-02 17:39:09 UTC (rev 6662)
@@ -110,19 +110,17 @@
     </target>
 
     <target name="main-jar" depends="stubs">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes">
-            <fileset dir="${build.dir}/classes" excludes="org/ofbiz/webtools/print/**"/>            
-        </jar>
+        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
     </target>
 
     <target name="print-jar" depends="stubs">
-        <jar jarfile="${build.dir}/lib/${name}-print.jar">
-            <fileset dir="${build.dir}/classes" includes="org/ofbiz/webtools/print/**"/>
-        </jar>
         <delete>
             <fileset dir="webapp/webtools/applet" includes="*.jar"/>
         </delete>
-        <copy todir="webapp/webtools/applet">
+
+        <!-- unjar the required libraries -->
+        <mkdir dir="${build.dir}/tmp"/>
+        <unjar dest="${build.dir}/tmp">
             <fileset file="${build.dir}/lib/${name}-print.jar"/>
             <fileset file="../../base/lib/avalon-framework-4.1.5.jar"/>
             <fileset file="../../base/lib/commons/commons-codec.jar"/>
@@ -130,8 +128,18 @@
             <fileset file="../webapp/lib/barcode4j-fop-ext-0.20.5-complete.jar"/>
             <fileset file="../webapp/lib/batik.jar"/>
             <fileset file="../webapp/lib/fop.jar"/>
-        </copy>
+        </unjar>
 
+        <!-- re-jar everything together -->
+        <jar jarfile="${build.dir}/lib/${name}-print.jar">
+            <fileset dir="${build.dir}/classes" includes="org/ofbiz/webtools/print/**"/>
+            <fileset dir="${build.dir}/tmp" includes="**"/>
+        </jar>
+
+        <!-- move the new complete archive to the applet directory -->
+        <move file="${build.dir}/lib/${name}-print.jar" todir="webapp/webtools/applet"/>
+        <delete dir="${build.dir}/tmp"/>
+        
         <!-- change this to use your personal certificate -->
         <signjar sectionsonly="true" keystore="../../base/config/ofbizssl.jks"
                  storepass="changeit" keypass="changeit" storetype="jks" alias="ssl">

Modified: trunk/framework/webtools/webapp/webtools/print/printStart.ftl
===================================================================
--- trunk/framework/webtools/webapp/webtools/print/printStart.ftl	2006-02-02 07:59:45 UTC (rev 6661)
+++ trunk/framework/webtools/webapp/webtools/print/printStart.ftl	2006-02-02 17:39:09 UTC (rev 6662)
@@ -37,10 +37,7 @@
       <center>
        <#if screens?has_content>
         <object align="center" height="50" width="350" classid="java:org.ofbiz.webtools.print.applet.FopPrintApplet"
-                type="application/x-java-applet" mayscript="true" archive="/webtools/applet/ofbiz-webtools-print.jar,
-                /webtools/applet/avalon-framework-4.1.5.jar, /webtools/applet/commons-cli.jar, /webtools/applet/commons-codec.jar,
-                /webtools/applet/barcode4j-fop-ext-0.20.5-complete.jar, /webtools/applet/batik.jar, /webtools/applet/fop.jar"
-
+                type="application/x-java-applet" mayscript="true" archive="/webtools/applet/ofbiz-webtools-print.jar"
                 codebase="/webtools/applet" server-url="${serverRoot}" session-id="${sessionId}" reset-cookies="${resetCookie}"
                 <#assign count = 1>
                 <#list screens as screen>
@@ -55,9 +52,7 @@
                 </#list>>
 
             <object align="center" height="200" width="600" classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93">
-	            <param name="archive" value="/webtools/applet/ofbiz-webtools-print.jar,
-                /webtools/applet/avalon-framework-4.1.5.jar, /webtools/applet/commons-cli.jar, /webtools/applet/commons-codec.jar,
-                /webtools/applet/barcode4j-fop-ext-0.20.5-complete.jar, /webtools/applet/batik.jar, /webtools/applet/fop.jar">
+	            <param name="archive" value="/webtools/applet/ofbiz-webtools-print.jar">
 
                 <param name="codebase" value="/webtools/applet">
                 <param name="code" value="org.ofbiz.webtools.print.applet.FopPrintApplet">