Changeset 2482

Timestamp:

09/30/08 17:32:25 (3 months ago)

Author:

dsanders

Message:

Changed how dependent libs are added to war targets.

Location:

trunk/otis

Files:

• build.xml (modified) (4 diffs)
• otis.war.targets.xml (modified) (1 diff)

trunk/otis/build.xml

@@ -28 +28 @@
         <property name="war.config.dir" value="${out.config.root.dir}/war"/>
         <property name="sdk.config.dir" value="${out.config.root.dir}/sdk"/>
+        <property name="dep.lib.dir" value="${build.dir}/deplibs" />
 
         <property name="war.demo.file" value="otisDemo.war" />
@@ -38 +39 @@
         <property name="war.test.file" value="${test.name.prefix}-${project.version}.war"/>
         
+
+        
         <import file="otis.war.targets.xml"/>
         <import file="other.targets.xml" optional="true"/>
 
     <target name="clean">
-        <delete dir="${build.dir}" />
+                <delete dir="${build.dir}" />
                 <delete dir="${junit.output.dir}" />
                 <delete dir="${test.name.prefix}" />
@@ -231 +234 @@
 
         <target name="-warbuilder" depends="jar.nosrc,compile.srv">
+                <delete dir="${dep.lib.dir}" />
+                
+                <mkdir dir="${dep.lib.dir}"/>
+
+                <copy toDir="${dep.lib.dir}" overwrite="true" flatten="true">
+                        <fileset refid="${war.cp.fileset.id}" />
+                </copy>
+
                 <war
                         destfile="${build.dir}/${war.file.name}"
@@ -251 +262 @@
                         <lib dir="${lib.dir}/srv/config" includes="*.jar" />
                         <!-- cp and dependencies (set by caller) -->
-                        <lib refid="${war.cp.fileset.id}" />
+                        <lib dir="${dep.lib.dir}" />
                         
                 </war>

trunk/otis/otis.war.targets.xml

@@ -55 +55 @@
                                         GET_RoleResponse.fmt 
         "/>                     
-        <fileset id="war.wag.cp.fileset" dir="${lib.dir}/cp-jndi" includes="*.jar" />
+        <fileset id="war.wag.cp.fileset" dir="${lib.dir}" includes="cp-jndi/*.jar cp-xmlfile/*.jar cp-inmem/*.jar" />
         <target name="war.wag">
                 <concat destfile="${out.config.root.dir}/filter.properties">