db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb build.xml
Date Sat, 19 Feb 2005 21:42:53 GMT
arminw      2005/02/19 13:42:53

  Modified:    .        build.xml
  Log:
  fix lockservlet-war generation
  
  Revision  Changes    Path
  1.166     +18 -8     db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.165
  retrieving revision 1.166
  diff -u -r1.165 -r1.166
  --- build.xml	9 Feb 2005 11:15:46 -0000	1.165
  +++ build.xml	19 Feb 2005 21:42:53 -0000	1.166
  @@ -563,7 +563,7 @@
       <!-- ================================================================== -->
       <!-- Build sample war-file for deployment in tomcat                     -->
       <!-- ================================================================== -->
  -    <target name="lockservlet-war" depends="jar, prepare-testdb"
  +    <target name="lockservlet-war" depends="jar, prepare, prepare-repository"
               description="Builds The Lockserver servlet for deployment in tomcat">
   
           <property name="build.servlet" value="${build.dir}/lock-servlet"/>
  @@ -578,7 +578,9 @@
   
           <!-- 2. OJB.properties and repository*.* files -->
           <copy todir="${build.servlet}/WEB-INF/classes">
  -            <fileset dir="${build.test}/ojb" includes="*.properties,*.dtd,*.xml"/>
  +            <fileset dir="${build.test}/ojb" includes="*.properties,*.dtd,*.xml">
  +                <exclude name="Test_*"/>
  +            </fileset>
           </copy>
   
           <copy todir="${build.servlet}/WEB-INF">
  @@ -588,19 +590,27 @@
           <!-- 3. additional jar files -->
           <copy todir="${build.servlet}/WEB-INF/lib">
               <fileset dir="${lib}">
  -              <include name="log4j*.jar"/>
  -			  <include name="commons-logging*.jar"/>
  -			  <include name="commons-lang*.jar"/>
  +                <include name="**/*.jar"/>
  +                <exclude name="jdo*.jar"/>
  +                <exclude name="ant-*.jar"/>
  +                <exclude name="xerces*.jar"/>
  +                <exclude name="xml-*.jar"/>
  +                <exclude name="xalan*.jar"/>
  +                <exclude name="jakarta-regexp*.jar"/>
  +                <exclude name="torque*.jar"/>
  +                <exclude name="velocity*.jar"/>
  +                <exclude name="xdoclet*.jar"/>
  +                <exclude name="xjava*.jar"/>
               </fileset>
           </copy>
   
   
   		<!-- 4. the business code, that is our servlet-->
           <copy todir="${build.servlet}/WEB-INF/classes">
  -            <fileset dir="${build.dest}" includes="org/apache/ojb/odmg/locking/**"/>
  +            <fileset dir="${build.dest}" includes="org/apache/ojb/broker/locking/**"/>
           </copy>
   
  -        <jar jarfile="${dist}/ojb-lockserver.war" basedir="${build.dir}"
  +        <jar jarfile="${dist}/ojb-lockserver.war" basedir="${build.servlet}"
                includes="WEB-INF/**"/>
       </target>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message