[jboss-cvs] jboss-seam/examples/hibernate2 ...

[Michael Yuan]

  User: myuan   
  Date: 07/07/17 12:43:22

  Modified:    examples/hibernate2  build.xml
  Log:
  Correct for Tomcat builds
  
  Revision  Changes    Path
  1.22      +12 -3     jboss-seam/examples/hibernate2/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate2/build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- build.xml	17 Jul 2007 15:30:48 -0000	1.21
  +++ build.xml	17 Jul 2007 16:43:22 -0000	1.22
  @@ -22,8 +22,12 @@
        	<ant antfile="build-websphere61.xml"/>
      </target>
   
  -   <target name="tomcat" description="Build the Hibernate Booking example artifacts, suitable for deployment to Tomcat 5.5">
  -     	<ant antfile="build-tomcat.xml"/>
  +   <target name="tomcat55" description="Build the Hibernate Booking example artifacts, suitable for deployment to Tomcat 5.5">
  +     	<ant antfile="build-tomcat55.xml"/>
  +   </target>
  +
  +   <target name="tomcat6" description="Build the Hibernate Booking example artifacts, suitable for deployment to Tomcat 6">
  +     	<ant antfile="build-tomcat6.xml"/>
      </target>
   
      <target name="clean" description="Clean up the example">
  @@ -32,11 +36,16 @@
       	<ant antfile="build-glassfish.xml" target="clean" />
       	<ant antfile="build-weblogic92.xml" target="clean" />
       	<ant antfile="build-websphere61.xml" target="clean" />
  +<<<<<<< build.xml
  +    	<ant antfile="build-tomcat55.xml" target="clean" />
  +    	<ant antfile="build-tomcat6.xml" target="clean" />
  +=======
       	<ant antfile="build-tomcat55.xml" target="clean" />
   		<ant antfile="build-tomcat6.xml" target="clean" />
  +>>>>>>> 1.21
      </target>
   
  -   <target name="all" depends="jboss, jboss405, glassfish, weblogic92, websphere61, tomcat" description="Build Hibernate Booking example, for deployment to all supported application servers"/>
  +   <target name="all" depends="jboss, jboss405, glassfish, weblogic92, websphere61, tomcat55, tomcat6" description="Build Hibernate Booking example, for deployment to all supported application servers"/>
   
   </project>