cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-cocoon2 build.xml changes.xml properties.xml
Date Thu, 19 Dec 2002 01:17:26 GMT
nicolaken    2002/12/18 17:17:26

  Modified:    .        build.xml changes.xml properties.xml
  Log:
    <action dev="NKB" type="update">
      Created .src/deprecated directory to contain all deprecated classes.
      This will help in maintaining Cocoon free from deprecated classes.
      Started by moving some deprecated caching stuff.
    </action>
  
  Revision  Changes    Path
  1.292     +58 -6     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.291
  retrieving revision 1.292
  diff -u -r1.291 -r1.292
  --- build.xml	18 Dec 2002 20:04:31 -0000	1.291
  +++ build.xml	19 Dec 2002 01:17:26 -0000	1.292
  @@ -850,17 +850,16 @@
       <copy todir="${build.src}" filtering="on">
         <fileset dir="${java.dir}">
         
  +<!-- moved to block      
           <exclude name="**/poi/**"                  unless="poi.present"/>
           <exclude name="**/HSSFSerializer.java"     unless="poi.present"/>
           <exclude name="**/poi.*"                   unless="poi.present"/>
           <exclude name="**/POIFSSerializer.java"    unless="poi.present"/>
  -              
  +-->              
           <exclude name="**/java/Pizza.java"         unless="pizza.present"/>
           <exclude name="**/java/pizza.*"            unless="pizza.present"/>
           <exclude name="**/java/javac.*"            if="pizza.present"/>
   
  -        <exclude name="**/JSP*.java"               unless="servlet.present"/>
  -        <exclude name="**/Jsp*.java"               unless="servlet.present"/>
           <exclude name="**/servlet.*"               unless="servlet.present"/>
           <exclude name="**/deli/DeliImpl.java"      unless="servlet.present"/>
           <exclude name="**/servlet/*.java"          unless="servlet.present"/>
  @@ -868,24 +867,30 @@
           <exclude name="**/generation/StreamGenerator.java" unless="servlet.present"/>
           <exclude name="**/components/request/**"   unless="servlet.present"/>
   
  +<!-- moved to block      
           <exclude name="**/ScriptAction.java"       unless="bsf.present"/>
           <exclude name="**/ScriptGenerator.java"    unless="bsf.present"/>
           <exclude name="**/bsf.*"                   unless="bsf.present"/>
  +-->
   
           <exclude name="**/deli/DeliImpl.java"      unless="deli.present"/>
           <exclude name="**/deli.*"                  unless="deli.present"/>
   
  +<!-- moved to block      
           <exclude name="**/HTMLGenerator.java"      unless="tidy.present"/>
           <exclude name="**/tidy.*"                  unless="tidy.present"/>
  +-->
   
           <exclude name="**/VelocityGenerator.java"  unless="velocity.present"/>
           <exclude name="**/velocity.*"              unless="velocity.present"/>
   
  +<!-- moved to block      
           <exclude name="**/SVG*.java"                                   unless="svg.present"/>
           <exclude name="**/svg.*"                                       unless="svg.present"/>
           <exclude name="**/components/transcoder/**.java"               unless="svg.present"/>
           <exclude name="**/components/url/Parsed**ProtocolHandler.java" unless="svg.present"/>
  -<!--
  +-->        
  +<!-- moved to block      
           <exclude name="**/FOP*"                    unless="fop.present"/>
           <exclude name="**/renderer/*"              unless="fop.present"/>
           <exclude name="**/fop.*"                   unless="fop.present"/>
  @@ -905,19 +910,24 @@
           <exclude name="**/resolver.*"                            unless="resolver.present"/>
   
           <exclude name="**/Jstyle*"             unless="jstyle.present"/>
  -        
  +
  +<!-- moved to block      
           <exclude name="**/Php*"                unless="php.present"/>
           <exclude name="**/php.*"               unless="php.present"/>
  +-->
   
           <!-- excludes for oracle and informix moved to tools/src/blocks-build.xsl -->
   
           <exclude name="**/Sendmail*.java"      unless="mail.present"/>
   
  +<!-- moved to block      
           <exclude name="**/LDAPTransformer*"    unless="naming.present"/>
           <exclude name="**/samples/parentcm/*"  unless="naming.present"/>
           <exclude name="**/naming.*"            unless="naming.present"/>
  -
  +-->
  +<!-- moved to block      
           <exclude name="**/JSPEngineImplWLS.java"   unless="weblogic.present"/>
  +-->
   
           <exclude name="**/XMLDB*.java"        unless="xmldb.present"/>
           <exclude name="**/DbXML*.java"        unless="xmldb.present"/>
  @@ -933,9 +943,11 @@
           <exclude name="**/components/hsqldb/ServerImpl.java" unless="hsqldb.present"/>
           <exclude name="**/hsqldb.*"                          unless="hsqldb.present"/>
   
  +<!-- moved to block      
           <exclude name="**/components/search/*"             unless="lucene.present"/>
           <exclude name="**/generation/SearchGenerator.java" unless="lucene.present"/>
           <exclude name="**/lucene.*"                        unless="lucene.present"/>
  +-->
   
           <exclude name="**/components/store/Jisp*.java" unless="jisp.present"/>
           <exclude name="**/store/jisp.*"                unless="jisp.present"/>
  @@ -986,6 +998,15 @@
           <exclude name="**/slide*" unless="transaction.present"/>
         </fileset>
       </copy>
  +    
  +    <mkdir dir="${build.deprecated.src}"/>
  +    <mkdir dir="${build.deprecated.dest}"/>
  +    <copy todir="${build.deprecated.src}" filtering="on">
  +      <fileset dir="${deprecated.src}">
  +        <include name="**/*.java"/>
  +      </fileset>
  +    </copy>
  +     
     </target>
   
     <!-- =================================================================== -->
  @@ -1068,6 +1089,28 @@
              target="${target.vm}">
         <classpath refid="scratchpad.classpath"/>
       </javac>
  +    
  +
  +    <copy todir="${build.deprecated.dest}">
  +      <fileset dir="${build.deprecated.src}">
  +        <include name="**/Manifest.mf"/>
  +        <include name="**/*.xsl"/>
  +        <include name="**/*.wsdd"/>
  +        <include name="**/*.roles"/>
  +        <include name="META-INF/**"/>
  +      </fileset>
  +    </copy>
  +
  +    <javac srcdir="${build.deprecated.src}"
  +           destdir="${build.deprecated.dest}"
  +           debug="${debug}"
  +           optimize="${optimize}"
  +           deprecation="${deprecation}"
  +           target="${target.vm}">
  +      <classpath refid="scratchpad.classpath"/>
  +    </javac>
  +        
  +    
     </target>
   
     <!-- =================================================================== -->
  @@ -1108,6 +1151,13 @@
           <include name="org/**"/>
         </fileset>
       </jar>
  +    
  +    <jar jarfile="${build.dir}/${deprecated.name}.jar">
  +      <fileset dir="${build.deprecated.dest}">
  +        <include name="org/**"/>
  +      </fileset>
  +    </jar>
  +        
     </target>
   
     <!-- =================================================================== -->
  @@ -1700,6 +1750,7 @@
         <fileset dir="${build.dir}">
           <include name="src/**/*.java"/>
           <include name="blocks/**/*.java"/>
  +        <include name="deprecated/**/*.java"/>
         </fileset>
         <fileset dir="${blocks.dir}">
           <include name="**/mocks/**/*.java"/>
  @@ -1728,6 +1779,7 @@
         <fileset dir="${build.dir}">
           <include name="src/**/*.java"/>
           <include name="blocks/**/*.java"/>
  +        <include name="deprecated/**/*.java"/>        
         </fileset>
         <fileset dir="${blocks.dir}">
           <include name="**/mocks/**/*.java"/>
  
  
  
  1.314     +6 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.313
  retrieving revision 1.314
  diff -u -r1.313 -r1.314
  --- changes.xml	19 Dec 2002 00:03:58 -0000	1.313
  +++ changes.xml	19 Dec 2002 01:17:26 -0000	1.314
  @@ -41,6 +41,11 @@
   
    <release version="@version@" date="@date@">
     <action dev="NKB" type="update">
  +    Created .src/deprecated directory to contain all deprecated classes.
  +    This will help in maintaining Cocoon free from deprecated classes.
  +    Started by moving some deprecated caching stuff.
  +  </action>   
  +  <action dev="NKB" type="update">
       Moved code to new blocks: html, php, lucene, bsf
     </action>   
     <action dev="NKB" type="update">
  
  
  
  1.23      +10 -0     xml-cocoon2/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/properties.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- properties.xml	19 Dec 2002 00:21:57 -0000	1.22
  +++ properties.xml	19 Dec 2002 01:17:26 -0000	1.23
  @@ -34,6 +34,11 @@
         src="./build/cocoon/scratchpad/src"
         dest="./build/cocoon/scratchpad/classes" />
   
  +     <deprecated
  +      dir="./build/cocoon/deprecated"
  +      src="./build/cocoon/deprecated/java"
  +      dest="./build/cocoon/deprecated/classes" />
  +      
        <docs
         printer="./build/cocoon/printer-docs"
         loglevel="ERROR" />
  @@ -83,6 +88,11 @@
       webapp="./src/scratchpad/webapp"
       name="cocoon-scratchpad" />
   
  +   <deprecated
  +    dir="./src/deprecated"
  +    src="./src/deprecated/java"
  +    name="cocoon-deprecated" />
  +    
      <dist
       root="./dist"
       name="cocoon-dev"
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message