You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tdk-dev@turbine.apache.org by jv...@apache.org on 2001/05/07 01:50:06 UTC

cvs commit: jakarta-turbine-tdk/src/share/common turbine-web.xml

jvanzyl     01/05/06 16:50:06

  Modified:    .        .cvsignore
               build    build.xml
               src      build.xml
  Removed:     src/share/common turbine-web.xml
  Log:
  - more cleanups
  
  Revision  Changes    Path
  1.2       +1 -1      jakarta-turbine-tdk/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	2000/08/28 03:10:48	1.1
  +++ .cvsignore	2001/05/06 23:50:05	1.2
  @@ -1 +1 @@
  -dist
  +dist*
  
  
  
  1.3       +16 -4     jakarta-turbine-tdk/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/build/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	2001/05/06 22:58:47	1.2
  +++ build.xml	2001/05/06 23:50:05	1.3
  @@ -8,10 +8,11 @@
     <property file="build.properties" />
   
     <property name="tdk.src" value="../src"/>
  +  <property name="tdk.lib" value="../lib"/>
     <property name="tdk.xdocs" value="../xdocs"/>
     <property name="tdk.base" value="../dist"/>
     <property name="tdk.dist" value="../dist/tdk"/>
  -  <property name="tdk.lib" value="${tdk.dist}/share/tdk-lib"/>
  +  <property name="tdk.dist.lib" value="${tdk.dist}/share/lib"/>
     <property name="tdk.webapp" value="${tdk.dist}/webapps/tdk"/>
     <property name="tdk.site" value="${tdk.dist}/webapps/site"/>
   
  @@ -155,7 +156,7 @@
         the Jetspeed problem aswell.
       -->
   
  -    <copy todir="${tdk.lib}">
  +    <copy todir="${tdk.dist.lib}">
         <fileset dir="${turbine.lib}">
           <exclude name="castor*.jar"/>
           <exclude name="webmacro*.jar"/>
  @@ -164,10 +165,21 @@
       </copy>
   
       <!-- =================================================================== -->
  +    <!-- T D K  J A R  F I L E S                                             -->
  +    <!-- =================================================================== -->
  +    <!-- These are JAR files that we provide for convenience and/or added    -->
  +    <!-- functionality. For example we provide some unit testing             -->
  +    <!-- capability.                                                         -->
  +    
  +    <copy todir="${tdk.dist.lib}">
  +      <fileset dir="${tdk.lib}"/>
  +    </copy>
  +    
  +    <!-- =================================================================== -->
       <!-- T U R B I N E  J A R  F I L E                                       -->
       <!-- =================================================================== -->
   
  -    <copy todir="${tdk.lib}">
  +    <copy todir="${tdk.dist.lib}">
         <fileset dir="${turbine.bin}">
           <include name="**/turbine*.jar"/>
         </fileset>
  @@ -177,7 +189,7 @@
       <!-- H Y P E R S O N I C                                                 -->
       <!-- =================================================================== -->
   
  -    <copy todir="${tdk.lib}">
  +    <copy todir="${tdk.dist.lib}">
         <fileset dir="${hypersonic.lib}">
           <include name="${hsql.jar}"/>
         </fileset>
  
  
  
  1.2       +2 -2      jakarta-turbine-tdk/src/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/src/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	2001/05/06 17:56:21	1.1
  +++ build.xml	2001/05/06 23:50:06	1.2
  @@ -25,7 +25,7 @@
   
     <!-- Build classpath -->
     <path id="classpath">
  -    <fileset dir="./share/tdk-lib">
  +    <fileset dir="./share/lib">
         <include name="**/*.jar"/>
       </fileset>
       <fileset dir="./lib">
  @@ -222,7 +222,7 @@
   
       <!-- copy the lib directory over to the new app lib directory -->
       <copy todir="${newapp.home}/WEB-INF/lib">
  -      <fileset dir="${tomcat.home}/share/tdk-lib"/>
  +      <fileset dir="${tomcat.home}/share/lib"/>
       </copy>
   
       <!-- ================================================================= -->
  
  
  

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