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

[Michael Yuan]

  User: myuan   
  Date: 06/11/08 19:37:29

  Modified:    examples/hibernate2  build.xml
  Log:
  Build, xhtml changes to jpa and hibernate2 examples
  
  Revision  Changes    Path
  1.2       +17 -66    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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- build.xml	8 Nov 2006 10:00:23 -0000	1.1
  +++ build.xml	9 Nov 2006 00:37:29 -0000	1.2
  @@ -6,9 +6,7 @@
     <description>Hibernate Booking</description>
     <property name="projname" value="jboss-seam-hibernate" />
   
  -  <property file="../build.properties"/>
  -  <property name="jboss.deploy"
  -    location="${jboss.home}/server/default/deploy"/>
  +  <property file="../../build.properties"/>
   
     <property name="lib" location="../../lib" />
     <property name="applib" location="lib" />
  @@ -31,7 +29,7 @@
       <delete dir="build"/>
     </target>
   
  -  <target name="main" depends="jboss"/>
  +  <target name="main" depends="deploy"/>
   
     <target name="compile">
       <mkdir dir="${build.classes}"/>
  @@ -125,12 +123,12 @@
           <include name="jsf-facelets.jar" />
           <include name="ajax4jsf.jar" />
           <include name="oscache-2.3.2.jar" />
  +        <include name="jboss-tomcat-support.jar" />
         </lib>
         <lib dir="${lib}">
           <include name="myfaces-api-1.1.4.jar" />
           <include name="myfaces-impl-1.1.4.jar" />
           <include name="hibernate-all.jar" />
  -        <include name="jboss-ejb3-all.jar" />
           <include name="thirdparty-all.jar" />
           <include name="commons*.jar" />
         </lib>
  @@ -146,71 +144,24 @@
       </war>
     </target>
     
  -  <!--
  -  <target name="tomcat" depends="compile">
  -    <mkdir dir="${build.jars}"/>
  -    
  -    <jar destfile="${build.jars}/${projname}.jar">
  -      <fileset dir="${build.classes}">
  -        <include name="**/*.class"/>
  -      </fileset>
  -      <fileset dir="${resources}">
  -        <include name="seam.properties" />
  -        <include name="import.sql" />
  -      </fileset>
  -      <metainf dir="${resources}/tomcat">
  -        <include name="persistence.xml" />
  -      </metainf>
  -    </jar>
  +  <target name="deploy" depends="jboss">
  +    <copy file="${build.jars}/${projname}.war"
  +      todir="${jboss.home}/server/default/deploy"/>
  +  </target>
   
  -    <war destfile="${build.jars}/${projname}.war"
  -         webxml="${resources}/tomcat/web.xml">
  -      <webinf dir="${resources}">
  -        <include name="faces-config.xml" />
  -        <include name="components.xml" />
  -        <include name="pages.xml" />
  -        <include name="navigation.xml" />
  -      </webinf>
  -      <lib dir="${seamlib}">
  -        <include name="jboss-seam*.jar" />
  -      </lib>
  -      <lib dir="${applib}">
  -        <include name="el-api.jar" />
  -        <include name="el-ri.jar" />
  -        <include name="jsf-facelets.jar" />
  -        <include name="ajax4jsf.jar" />
  -        <include name="oscache-2.3.2.jar" />
  -        <include name="cglib.jar" />
  -        <include name="hibernate*.jar" />
  -        <include name="ejb3-persistence.jar" />
  -        <include name="derby.jar" />
  -      </lib>
  -      <lib dir="${lib}">
  -        <include name="myfaces-api-1.1.4.jar" />
  -        <include name="myfaces-impl-1.1.4.jar" />
  -        <include name="jboss-ejb3-all.jar" />
  -        <include name="thirdparty-all.jar" />
  -        <include name="commons*.jar" />
  -      </lib>
  -      <lib dir="${build.jars}">
  -        <include name="${projname}.jar" />
  -      </lib>
  -      <classes dir="${resources}/tomcat">
  -        <include name="log4j.xml" />
  -      </classes>
  -      <fileset dir="${view}"/>
  -    </war>
  +  <target name="undeploy">
  +    <delete
  +        file="${jboss.home}/server/default/deploy/${projname}.war"/>
     </target>
  -  -->
     
  -  <target name="deploy">
  +  <target name="deploy.tomcat" depends="tomcat">
       <copy file="${build.jars}/${projname}.war"
  -      todir="${jboss.deploy}"/>
  +      todir="${tomcat.home}/webapps"/>
     </target>
   
  -  <target name="undeploy">
  -    <delete
  -        file="${jboss.deploy}/${projname}.war"/>
  +  <target name="undeploy.tomcat">
  +    <delete file="${tomcat.home}/webapps/${projname}.war"/>
  +    <delete dir="${tomcat.home}/webapps/${projname}"/>
     </target>
   
   </project>