Changeset 11837

Timestamp:

10/07/08 13:27:27 (4 years ago)

Author:

anp

Message:

debug genDeploy FTP; review libext

Location:

trunk

Files:

• Bui_Core/xBuildServer_SCserver.xml (modified) (2 diffs)
• Bui_scServer/_lin/resources/buiWebApp.sh (modified) (1 diff)
• Bui_scServer/_win/resources/buiWebApp.bat (modified) (1 diff)
• Bui_scServer/build.xml (modified) (1 diff)
• Bui_scServer/resources/genBui/build.xml (modified) (2 diffs)
• Lib_Java/ant/ant-trax.jar (added)
• Lib_Java/build.properties (modified) (1 diff)

trunk/Bui_Core/xBuildServer_SCserver.xml

@@ -137 +137 @@
                 <copy file="${ant.nodeps.jar}" tofile="${destlibext}/ant.nodeps.jar" preservelastmodified="true" failonerror="true"/>
                 <copy file="${ant.launcher.jar}" tofile="${destlibext}/ant.launcher.jar" preservelastmodified="true" failonerror="true"/>
+                <copy file="${ant.contrib.jar}" tofile="${destlibext}/ant.contrib.jar" preservelastmodified="true" failonerror="true"/>
+                <copy file="${ant.xmltask.jar}" tofile="${destlibext}/ant.xmltask.jar" preservelastmodified="true" failonerror="true"/>
+                <copy file="${ant.trax.jar}" tofile="${destlibext}/ant.trax.jar" preservelastmodified="true" failonerror="true"/>
+                <copy file="${ant.bsf.jar}" tofile="${destlibext}/ant.bsf.jar" preservelastmodified="true" failonerror="true"/>
                 <copy file="${bsf.jar}" tofile="${destlibext}/bsf.jar" preservelastmodified="true" failonerror="true"/>
                 <copy file="${net.jar}" tofile="${destlibext}/net.jar" preservelastmodified="true" failonerror="true"/>
                 <copy file="${beanshell.jar}" tofile="${destlibext}/beanshell.jar" preservelastmodified="true"/>
+                <copy file="${logging.jar}" tofile="${destlibext}/logging.jar" preservelastmodified="true"/>
                 <copy file="${fileupload.jar}" tofile="${destlibext}/fileupload.jar" preservelastmodified="true"/>
                 <copy file="${webmacro.jar}" tofile="${destlibext}/webmacro.jar" preservelastmodified="true"/>
@@ -148 +153 @@
                 <copy file="${oo.unofinder.jar}" tofile="${destjardir}/unofinder.jar" preservelastmodified="true"/><!-- FIXME : à personnaliser -->
                 <copy file="${jing.res.jar}" tofile="${destjardir}/jingrelaxng.jar" preservelastmodified="true" failonerror="true"/><!-- FIXME : à personnaliser -->
-                <copy file="${ant.contrib.jar}" tofile="${destjardir}/ant.contrib.jar" preservelastmodified="true" failonerror="true"/>
-                <copy file="${ant.xmltask.jar}" tofile="${destjardir}/ant.xmltask.jar" preservelastmodified="true" failonerror="true"/>
                 <copy file="${scxmlserializer.res.jar}" tofile="${destjardir}/scxmlserializer.jar" preservelastmodified="true" failonerror="true"/>
                 <copy file="${scxmlserializer.res.jar}" tofile="${destjardir}/scxmlserializer.jar" preservelastmodified="true" failonerror="true"/>

trunk/Bui_scServer/_lin/resources/buiWebApp.sh

@@ -28 +28 @@
 echo "Compilation, scserver"
 
-$vJavaCmd -classpath "libext/ant.jar:libext/ant.nodeps.jar:libext/ant.launcher.jar:webApp/WEB-INF/lib/ant.contrib.jar" -Xmx150m org.apache.tools.ant.Main -buildfile build.xml
+$vJavaCmd -classpath "libext/ant.jar:libext/ant.nodeps.jar:libext/ant.launcher.jar:libext/ant.contrib.jar" -Xmx150m org.apache.tools.ant.Main -buildfile build.xml

trunk/Bui_scServer/_win/resources/buiWebApp.bat

@@ -1 +1 @@
 echo "Compilation, scserver"
-java.exe -classpath "libext\ant.jar;libext\ant.nodeps.jar;libext\ant.launcher.jar;webApp\WEB-INF\lib\ant.contrib.jar" -Xmx150m org.apache.tools.ant.Main -buildfile build.xml
+java.exe -classpath "libext\ant.jar;libext\ant.nodeps.jar;libext\ant.launcher.jar;libext\ant.contrib.jar" -Xmx150m org.apache.tools.ant.Main -buildfile build.xml

trunk/Bui_scServer/build.xml

@@ -84 +84 @@
 server.work.path=${server.work.path}
 server.url=${server.url}
-        
+
+###
+# Packaging
+server.libExt.includeInWebapp=true
+                        
 ###
 # Configuration des applications tierces

trunk/Bui_scServer/resources/genBui/build.xml

@@ -13 +13 @@
         <property name="server.conf.repos.asp.domain.path" value="${server.work.path}/domains"/>
         <property name="server.conf.repos.asp.templateDomainKey" value="${server.conf.repos.asp.templateDomainKey}"/>
+        <property name="server.libext.path" value="${basedir}/libext"/>
         
                         
@@ -58 +59 @@
                 <replaceregexp file="##destwebappdirname##/conf/init.xml" match="##scServer_conf_repos_asp_domain_path##" replace="${server.conf.repos.asp.domain.path}" byline="yes" flags="g"/>
                 <replaceregexp file="##destwebappdirname##/conf/init.xml" match="##server_conf_repos_asp_templateDomainKey##" replace="${server.conf.repos.asp.templateDomainKey}" byline="yes" flags="g"/>
+                <!-- Copie des libExt dans la webApp -->
+                <if>
+                        <equals arg1="${server.libExt.includeInWebapp}" arg2="true"/>
+                        <then>
+                                <copy todir="##destwebappdirname##/WEB-INF/lib">
+                                        <fileset dir="${server.libext.path}" includes="*.jar"/>
+                                </copy>
+                        </then>
+                </if>
                 <!-- # création du war -->
                 <ant target="xCreateWar"/>

trunk/Lib_Java/build.properties

@@ -6 +6 @@
 ant.nodeps.jar=${libjavadir}/ant/ant-nodeps.jar
 ant.contrib.jar=${libjavadir}/ant/ant-contrib.jar
+ant.trax.jar=${libjavadir}/ant/ant-trax.jar
 ant.xmltask.jar=${libjavadir}/ant/xmltask.jar
+ant.bsf.jar=${libjavadir}/ant/ant-apache-bsf.jar
 avalon.jar=${libjavadir}/fop/avalon-framework.jar
 batik.jar=${libjavadir}/batik/batik.jar