pfc-prolog-cvs

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix
In directory sc8-pr-cvs1:/tmp/cvs-serv9365

Modified Files:
	build.xml 
Log Message:
Added construction of web-client including struts required files (untested in jboss)

Index: build.xml
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** build.xml	11 Jul 2003 11:30:07 -0000	1.25
--- build.xml	11 Jul 2003 19:44:47 -0000	1.26
***************
*** 14,17 ****
--- 14,18 ----
    <property name="interpreter" value="prolix-dummy-interpreter.jar"/>
    <property name="war.file" value="prolixjsp.war"/>
+   <property name="struts.jar.file" value="my-struts.jar"/>
    
    <target name="check-jboss" unless="jboss.home">
***************
*** 99,102 ****
--- 100,104 ----
     <property name="src.web.dir" value="${basedir}/web"/>
     <property name="struts.lib.dir" value="${lib.dir}/struts"/>
+    <property name="etc.dir" value="${basedir}/etc"/>
  
     <!-- Removed properties
***************
*** 350,353 ****
--- 352,369 ----
  
      <!-- Client web war -->
+ 
+     <!-- Temporaly until webdoclet generate it -->
+     <copy file="${etc.dir}/struts-config.xml" todir="${build.generate.web-conf}/WEB-INF" />
+ 
+     <mkdir dir="${build.dir}/WEB-INF"/>
+     <mkdir dir="${build.dir}/WEB-INF/lib"/>
+     <jar jarfile="${build.dir}/WEB-INF/lib/${struts.jar.file}">
+       <fileset
+ 	dir="${build.classes.dir}/${package.path}"
+ 	includes="web/**/*.class"
+ 	>
+ 	</fileset>
+     </jar>
+      
       <jar jarfile="${dist.dir}/${war.file}">
            <fileset
***************
*** 361,369 ****
                     >
            </fileset>
!          <fileset
! 	dir="${lib.web.client.dir}"
! 	includes="WEB-INF/lib/**"
! 	>
!       </fileset>
        </jar>
     </target>
--- 377,390 ----
                     >
            </fileset>
!           <fileset 
! 	           dir="${etc.dir}"
! 	           includes="Resources.properties"
!                    >
!           </fileset>
!           <fileset
! 	           dir="${build.dir}" 
! 	           includes="WEB-INF/lib/${struts.jar.file}"
! 	           >
!           </fileset>
        </jar>
     </target>
***************
*** 439,443 ****
      <filter token="dist.dir" value="${dist.dir}"/>
      <copy todir="${dist.dir}" filtering="yes">
!       <fileset dir="${basedir}/etc" includes="run-*-client.sh">
        </fileset>
      </copy>
--- 460,464 ----
      <filter token="dist.dir" value="${dist.dir}"/>
      <copy todir="${dist.dir}" filtering="yes">
!       <fileset dir="${etc.dir}" includes="run-*-client.sh">
        </fileset>
      </copy>