You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by hu...@apache.org on 2003/09/30 03:44:44 UTC

cvs commit: jakarta-commons-sandbox/chain build.xml build.properties.sample

husted      2003/09/29 18:44:44

  Modified:    chain    build.xml build.properties.sample
  Log:
  Add commons-logging -- optional support.
  
  Revision  Changes    Path
  1.4       +8 -9      jakarta-commons-sandbox/chain/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/chain/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	29 Sep 2003 06:02:13 -0000	1.3
  +++ build.xml	30 Sep 2003 01:44:44 -0000	1.4
  @@ -94,8 +94,6 @@
     <!-- Construct compile classpath -->
     <path id="compile.classpath">
       <pathelement location="${build.home}/classes"/>
  -    <pathelement location="${commons-beanutils.jar}"/>
  -    <pathelement location="${commons-collections.jar}"/>
       <pathelement location="${commons-digester.jar}"/>
       <pathelement location="${commons-logging.jar}"/>
       <pathelement location="${jsf-api.jar}"/>
  @@ -111,10 +109,7 @@
     <path id="test.classpath">
       <pathelement location="${build.home}/classes"/>
       <pathelement location="${build.home}/tests"/>
  -    <pathelement location="${commons-beanutils.jar}"/>
  -    <pathelement location="${commons-collections.jar}"/>
       <pathelement location="${commons-digester.jar}"/>
  -    <pathelement location="${commons-logging.jar}"/>
       <pathelement location="${junit.jar}"/>
       <pathelement location="${jsf-api.jar}"/>
       <pathelement location="${portlet-api.jar}"/>
  @@ -134,6 +129,7 @@
     <target name="flags">
       <available property="digester.present" file="${commons-digester.jar}"/>
       <available property="faces.present"    file="${jsf-api.jar}"/>
  +    <available property="logging.present"  file="${commons-logging.jar}"/>
       <available property="portlet.present"  file="${portlet-api.jar}"/>
       <available property="servlet.present"  file="${servlet-api.jar}"/>
       <available property="servlet23.present" classpathref="compile.classpath"
  @@ -146,6 +142,7 @@
       <echo message="-------- ${component.name} ${component.version} --------"/>
       <echo message="digester.present =      ${digester.present}"/>
       <echo message="faces.present =         ${faces.present}"/>
  +    <echo message="logging.present =       ${logging.present}"/>
       <echo message="portlet.present =       ${portlet.present}"/>
       <echo message="servlet.present =       ${servlet.present}"/>
       <echo message="servlet23.present =     ${servlet23.present}"/>
  @@ -191,7 +188,9 @@
                   unless="portlet.present"/>
         <exclude    name="org/apache/commons/chain/web/servlet/*.java"
                   unless="servlet.present"/>
  -      <exclude    name="org/apache.commons/chain/config/*.java"
  +     <exclude    name="org/apache/commons/chain/web/servlet/config/*.java"
  +                unless="logging.present"/>
  +      <exclude    name="org/apache/commons/chain/config/*.java"
                   unless="digester.present"/>
       </javac>
       <copy    todir="${build.home}/classes" filtering="on">
  @@ -216,7 +215,7 @@
                   unless="servlet.present"/>
         <exclude    name="org/apache/commons/chain/web/*Servlet*.java"
                   unless="servlet.present"/>
  -      <exclude    name="org/apache.commons/chain/config/*.java"
  +      <exclude    name="org/apache/commons/chain/config/*.java"
                   unless="digester.present"/>
       </javac>
       <copy    todir="${build.home}/tests" filtering="on">
  @@ -281,7 +280,7 @@
   
   
     <target name="install-jar" depends="dist"
  -   description="--> Installs jar file in ${lib.repo}">
  +   description="Installs jar file in ${lib.repo}">
       <copy todir="${lib.repo}" filtering="no">
         <fileset dir="${dist.home}">
           <include name="commons-${component.name}.jar"/>
  
  
  
  1.3       +13 -4     jakarta-commons-sandbox/chain/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/chain/build.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.properties.sample	12 Aug 2003 19:33:03 -0000	1.2
  +++ build.properties.sample	30 Sep 2003 01:44:44 -0000	1.3
  @@ -6,21 +6,30 @@
   junit.jar = ${junit.home}/junit.jar
   
   # (OPTIONAL) The pathname of the "faces-api.jar" file
  -# To disable, set to a non-existant path
  +# To disable, set to a non-existant path (e.g. /absent.jar)
   jsf-api.jar=${user.home}/jwsdp-1.2/jsf/lib/jsf-api.jar
   
   # (OPTIONAL) The pathname of the "portlet-api.jar" file
  -# To disable, set to a non-existant path
  +# To disable, set to a non-existant path (e.g. /absent.jar)
   portlet-api.jar=../../jakarta-jetspeed-2/portlet-api/target/portlet-api-0.6.6.jar
   
   # (OPTIONAL) The pathname of the "servlet-api.jar" file
   # Version 2.2 or later required, version 2.4 is supported
  -# To disable, set to a non-existant path
  +# To disable, set to a non-existant path (e.g. /absent.jar)
   servlet-api.jar = /usr/local/jwsdp-1.2/common/lib/servlet-api.jar
   
  +# (OPTIONAL) The pathname of the "commons-logging.jar" file
  +# required only if you are using or compiling the org.apache.commons.web.servlet package
  +# To disable, set to a non-existant path (e.g. /absent.jar)
  +commons-logging.jar = ../../jakarta-commons/logging/dist/commons-logging.jar
  +
   # (OPTIONAL) The pathname of the "commons-digester.jar" file
   # required only if you are using the org.apache.commons.chain.config package
  -# To disable, set to a non-existant path
  +# To disable, set to a non-existant path (e.g. /absent.jar)
   commons-digester.jar = ../../jakarta-commons/digester/dist/commons-digester.jar
   
  +# (OPTIONAL) The pathname of the shared JAR repository
  +# required only if you are using the install-jar target
  +# To disable, set to a non-existant path (e.g. /absent.jar)
  +lib.repo = /usr/local/common/lib
   
  
  
  

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