cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/lib/optional hsqldb-1.61.jar
Date Mon, 14 Jan 2002 11:15:55 GMT
cziegeler    02/01/14 03:15:55

  Modified:    .        build.xml
  Added:       lib/optional hsqldb-1.61.jar
  Removed:     lib      avalon-excalibur-20011229.jar
                        avalon-framework-20011229.jar axis-samples.jar
                        axis.jar batik-libs-1.1.1.jar bsf-2.2.jar
                        commons-collections-1.0.jar
                        commons-httpclient-20011012.jar deli.jar
                        fop-0.20.2.jar hsqldb-1.61.jar
                        jakarta-regexp-1.2.jar jena.jar jimi-1.0.jar
                        jstyle.jar jtidy-04aug2000r7-dev.jar
                        logkit-20011212.jar lucene-1.2-rc2.jar
                        maybeupload_1-0-5pre3.jar rdffilter.jar
                        resolver.jar rhino-1.5r2.jar servlet_2_2.jar
                        velocity-1.2.jar xalan-2.2.0-D14.jar
                        xerces-1.4.4.jar xml-apis.jar xmldb-20010924.jar
                        xt.jar
               lib/core hsqldb-1.61.jar
  Log:
  hsqldb is now really optional
  
  Revision  Changes    Path
  1.133     +29 -13    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.132
  retrieving revision 1.133
  diff -u -r1.132 -r1.133
  --- build.xml	14 Jan 2002 11:04:16 -0000	1.132
  +++ build.xml	14 Jan 2002 11:15:44 -0000	1.133
  @@ -351,6 +351,10 @@
       <ClassAvailable classpathref="classpath" 
                       property="lucene.present" 
                       classname="org.apache.lucene.search.Searcher"/>
  +
  +    <ClassAvailable classpathref="classpath" 
  +                    property="hsqldb.present" 
  +                    classname="org.hsqldb.Server"/>
     </target>
     
     <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
  @@ -391,7 +395,7 @@
       <antcall target="op-warning">
         <param name="thing" value="BSF"/>
         <param name="recovery" 
  -        value="Get the BSF package and place the jar in the lib dir"/>
  +        value="Get the BSF package and place the jar in the lib/optional dir"/>
         <param name="message"
                value="BSF is required for the script action."/>
       </antcall>
  @@ -401,7 +405,7 @@
       <antcall target="op-warning">
         <param name="thing" value="JFOR"/>
         <param name="recovery" 
  -        value="Get the JFOR package from http://www.jfor.org/ and place the jar in the
lib dir"/>
  +        value="Get the JFOR package from http://www.jfor.org/ and place the jar in the
lib/optional dir"/>
         <param name="message"
                value="JFOR is required for the fo2rtf serializer."/>
       </antcall>
  @@ -411,7 +415,7 @@
       <antcall target="op-warning">
         <param name="thing" value="XMLDB"/>
         <param name="recovery" 
  -        value="Get the xmldb package from http://www.xmldb.org/xapi/ and place the xmldb-api
jar in the lib dir"/>
  +        value="Get the xmldb package from http://www.xmldb.org/xapi/ and place the xmldb-api
jar in the lib/optional dir"/>
         <param name="message"
                value="XMLDB is required for the xmldb and xmldbcollection generator."/>
       </antcall>
  @@ -421,7 +425,7 @@
       <antcall target="op-warning">
         <param name="thing" value="XT"/>
         <param name="recovery" 
  -        value="Get the xt package from http://www.jclark.com/xml/xt.html and place xt.jar
in the lib dir"/>
  +        value="Get the xt package from http://www.jclark.com/xml/xt.html and place xt.jar
in the lib/optional dir"/>
         <param name="message"
                value="XT is required for the xt transformer."/>
       </antcall>
  @@ -431,7 +435,7 @@
       <antcall target="op-warning">
         <param name="thing" value="PHP"/>
         <param name="recovery" 
  -        value="Get the PHP servlet (phpsrvlt.jar) and place the jar in the lib dir"/>
  +        value="Get the PHP servlet (phpsrvlt.jar) and place the jar in the lib/optional
dir"/>
         <param name="message"
                value="PHP is required for the php generator."/>
       </antcall>
  @@ -441,7 +445,7 @@
       <antcall target="op-warning">
         <param name="thing" value="JNDI"/>
         <param name="recovery" 
  -        value="Get the jndi.jar from Sun and place the jar in the lib dir"/>
  +        value="Get the jndi.jar from Sun and place the jar in the lib/optional dir"/>
         <param name="message"
                value="JNDI is required for the ldap generator and the parentcm generator."/>
       </antcall>
  @@ -451,7 +455,7 @@
       <antcall target="op-warning">
         <param name="thing" value="Batik"/>
         <param name="recovery" 
  -        value="Get Batik from http://xml.apache.org/batik and place the jar in the lib
dir"/>
  +        value="Get Batik from http://xml.apache.org/batik and place the jar in the lib/optional
dir"/>
         <param name="message"
                value="Batik is required for the svg serializers."/>
       </antcall>
  @@ -461,7 +465,7 @@
       <antcall target="op-warning">
         <param name="thing" value="FOP"/>
         <param name="recovery" 
  -        value="Get FOP from http://xml.apache.org/fop and place the jar in the lib dir"/>
  +        value="Get FOP from http://xml.apache.org/fop and place the jar in the lib/optional
dir"/>
         <param name="message"
                value="FOP is required for the fo2pdf, fo2ps and fo2pcl serializer."/>
       </antcall>
  @@ -471,7 +475,7 @@
       <antcall target="op-warning">
         <param name="thing" value="JTidy"/>
         <param name="recovery" 
  -        value="Get JTidy from http://sourceforge.net/projects/jtidy/ and place the jar
in the lib dir"/>
  +        value="Get JTidy from http://sourceforge.net/projects/jtidy/ and place the jar
in the lib/optional dir"/>
         <param name="message"
                value="JTidy is required for the html generator."/>
       </antcall>
  @@ -481,7 +485,7 @@
       <antcall target="op-warning">
         <param name="thing" value="MaybeUpload"/>
         <param name="recovery" 
  -        value="Get MaybeUpload from http://www.weft.co.uk/library/maybeupload/ and place
the jar in the lib dir"/>
  +        value="Get MaybeUpload from http://www.weft.co.uk/library/maybeupload/ and place
the jar in the lib/optional dir"/>
         <param name="message"
                value="MaybeUpload simplifies the handling of uploaded files."/>
       </antcall>
  @@ -491,7 +495,7 @@
       <antcall target="op-warning">
         <param name="thing" value="Lucene"/>
         <param name="recovery" 
  -        value="Get Lucene from http://jakarta.apache.org/lucene/ and place the jar in the
lib dir"/>
  +        value="Get Lucene from http://jakarta.apache.org/lucene/ and place the jar in the
lib/optional dir"/>
         <param name="message"
                value="Lucene is required for the Cocoon searches."/>
       </antcall>
  @@ -513,7 +517,17 @@
         <param name="recovery" 
           value="Get Velocity from http://jakarta.apache.org and place the jar in the lib/optional
dir"/>
         <param name="message"
  -             value="Velocity is required for the velocity generator"/>
  +             value="Velocity is required for the velocity generator."/>
  +    </antcall>
  +  </target>
  +  <target name="hsqldb-warn" unless="hsqldb.present" depends="optional-tests"
  +      description="Outputs a warning if org.hsqldb.* classes are missing during compilation">
  +    <antcall target="op-warning">
  +      <param name="thing" value="hsqldb"/>
  +      <param name="recovery" 
  +        value="Get hsqldb and place the jar in the lib/optional dir"/>
  +      <param name="message"
  +             value="hsqldb is required for the sql examples."/>
       </antcall>
     </target>
     
  @@ -521,7 +535,7 @@
     <!-- Print out warnings for optional components                          -->
     <!-- =================================================================== -->
     <target name="optional-warnings" 
  -          depends="bsf-warn, jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn, svg-warn,
fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn, velocity-warn" 
  +          depends="bsf-warn, jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn, svg-warn,
fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn, velocity-warn, hsqldb-warn"

         description="Outputs warnings if some optional jars are missing from the environment">
     </target>
   
  @@ -599,6 +613,8 @@
           <exclude name="**/Jaxen*"                    unless="jaxen.present"/>
   
           <exclude name="**/CocoonServlet*.java"       unless="servlet.present"/>
  +
  +        <exclude name="**/components/hsqldb/ServerImpl.java"       unless="hsqldb.present"/>
   
           <exclude name="**/components/search/*"                 unless="lucene.present"/>
           <exclude name="**/generation/SearchGenerator.java"     unless="lucene.present"/>
  
  
  
  1.1                  xml-cocoon2/lib/optional/hsqldb-1.61.jar
  
  	<<Binary file>>
  
  

----------------------------------------------------------------------
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