[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] jboss-tomcat build.xml
From:       Remy Maucherat <remm () users ! sourceforge ! net>
Date:       2003-11-29 21:23:18
[Download RAW message or body]

  User: remm    
  Date: 03/11/29 13:23:18

  Modified:    .        Tag: Branch_3_2 build.xml
  Log:
  - Port of the clustering code to TC 5. It builds, but is untested.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.7 +39 -13    jboss-tomcat/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-tomcat/build.xml,v
  retrieving revision 1.1.1.1.2.6
  retrieving revision 1.1.1.1.2.7
  diff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7
  --- build.xml	10 Nov 2003 06:45:55 -0000	1.1.1.1.2.6
  +++ build.xml	29 Nov 2003 21:23:18 -0000	1.1.1.1.2.7
  @@ -14,7 +14,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.1.1.1.2.6 2003/11/10 06:45:55 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.1.1.1.2.7 2003/11/29 21:23:18 remm Exp $ -->
   
   <project default="main" name="JBoss/Tomcat-4">
   
  @@ -71,15 +71,13 @@
         <path refid="jboss.common.classpath"/>
         <path refid="jboss.jmx.classpath"/>
         <path refid="jboss.cluster.classpath"/>
  -      <path refid="apache.tomcat41.classpath"/>
  -      <path refid="apache.tomcat50.classpath"/>
       </path>
   
  -     <!-- The combined thirdparty classpath -->
  -     <path id="thirdparty.classpath">
  -       <path refid="library.classpath"/>
  -       <path refid="dependentmodule.classpath"/>
  -     </path>
  +    <!-- The combined thirdparty classpath -->
  +    <path id="thirdparty.classpath">
  +      <path refid="library.classpath"/>
  +      <path refid="dependentmodule.classpath"/>
  +    </path>
   
       <!-- Where source files live -->
       <property name="source.java" value="${module.source}/main"/>
  @@ -107,15 +105,29 @@
       <property name="local.classpath" value=""/>
   
       <!-- The classpath required to build classes. -->
  -    <path id="javac.classpath">
  +    <path id="javac.tomcat41.classpath">
  +      <pathelement path="${classpath}"/>
  +      <pathelement path="${local.classpath}"/>
  +      <path refid="thirdparty.classpath"/>
  +      <path refid="apache.tomcat41.classpath" />
  +    </path>
  +
  +    <!-- The classpath required to build classes. -->
  +    <path id="javac.tomcat50.classpath">
         <pathelement path="${classpath}"/>
         <pathelement path="${local.classpath}"/>
         <path refid="thirdparty.classpath"/>
  +      <path refid="apache.tomcat50.classpath" />
  +    </path>
  +
  +    <!-- The classpath required to build classes. -->
  +    <path id="javac.classpath">
  +      <path refid="javac.tomcat50.classpath"/>
       </path>
   
       <!-- The classpath required to build javadocs. -->
       <path id="javadoc.classpath">
  -      <path refid="javac.classpath"/>
  +      <path refid="javac.tomcat50.classpath"/>
       </path>
   
       <!-- Packages to include when generating api documentation -->
  @@ -148,7 +160,22 @@
   	   includeJavaRuntime="${javac.include.java.runtime}"
   	   failonerror="${javac.fail.onerror}">
          <src path="${source.java}"/>
  -       <classpath refid="javac.classpath"/>
  +       <exclude name="org/jboss/web/tomcat/tc5/**"/>
  +       <classpath refid="javac.tomcat41.classpath"/>
  +    </javac>
  +    <javac destdir="${build.classes}"
  +           optimize="${javac.optimize}"
  +	   target="${javac.target}"
  +           debug="${javac.debug}"
  +	   depend="${javac.depend}"
  +	   verbose="${javac.verbose}"
  +	   deprecation="false"
  +	   includeAntRuntime="${javac.include.ant.runtime}"
  +	   includeJavaRuntime="${javac.include.java.runtime}"
  +	   failonerror="${javac.fail.onerror}">
  +       <src path="${source.java}"/>
  +       <include name="org/jboss/web/tomcat/tc5/**"/>
  +       <classpath refid="javac.tomcat50.classpath"/>
       </javac>
   
     </target>
  @@ -243,9 +270,8 @@
         <fileset dir="${build.classes}">
           <include name="org/jboss/net/**"/>
           <include name="org/jboss/web/tomcat/Log4j*"/>
  -        <include name="org/jboss/web/tomcat/tc5/*"/>
  +        <include name="org/jboss/web/tomcat/tc5/**"/>
           <include name="org/jboss/web/tomcat/security/**"/>
  -        <include name="org/jboss/web/tomcat/session/**"/>
         </fileset>
         <!-- Get the property-files -->
         <fileset dir="${source.java}">
  
  
  


-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]