cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject cvs commit: xml-cocoon2/src/webapp/WEB-INF cocoon.xconf
Date Fri, 18 Oct 2002 14:09:06 GMT
haul        2002/10/18 07:09:06

  Modified:    .        build.xml module.xml properties.xml
               src/webapp sitemap.xmap
               src/webapp/WEB-INF cocoon.xconf
  Log:
  
  
  Revision  Changes    Path
  1.271     +4 -14     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.270
  retrieving revision 1.271
  diff -u -r1.270 -r1.271
  --- build.xml	3 Oct 2002 04:27:05 -0000	1.270
  +++ build.xml	18 Oct 2002 14:09:06 -0000	1.271
  @@ -468,17 +468,9 @@
                  classname="javax.transaction.Transaction"/>
     </target>
     
  +  <!-- moved to tools/src/blocks-build.xsl
     <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
  -
  -  <target name="filter-jdbc" unless="jdbc3.present">
  -    <filter token="JDBC3_START" value=""/>
  -    <filter token="JDBC3_END" value=""/>
  -  </target>
  -
  -  <target name="nofilter-jdbc" if="jdbc3.present">
  -    <filter token="JDBC3_START" value="*/"/>
  -    <filter token="JDBC3_END" value="/*"/>
  -  </target>
  +  -->
   
     <!-- =================================================================== -->
     <!-- Macro for optional warnings                                         -->
  @@ -784,7 +776,7 @@
     <!-- =================================================================== -->
     <!-- Prepares the source code                                            -->
     <!-- =================================================================== -->
  -  <target name="prepare-src-main" depends="prepare,generate-java-code,prepare-jdbc">
  +  <target name="prepare-src-main" depends="prepare,generate-java-code">
       <mkdir dir="${build.src}"/>
       <mkdir dir="${build.dest}"/>
       <copy todir="${build.src}" filtering="on">
  @@ -849,9 +841,7 @@
           <exclude name="**/Php*"                unless="php.present"/>
           <exclude name="**/php.*"               unless="php.present"/>
   
  -        <exclude name="**/Ora*.java"           unless="ora.driver.present"/>
  -
  -        <exclude name="**/Ifx*.java"           unless="ifx.driver.present"/>
  +        <!-- excludes for oracle and informix moved to tools/src/blocks-build.xsl -->
   
           <exclude name="**/Sendmail*.java"      unless="mail.present"/>
   
  
  
  
  1.10      +37 -0     xml-cocoon2/module.xml
  
  Index: module.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/module.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- module.xml	2 Oct 2002 08:10:34 -0000	1.9
  +++ module.xml	18 Oct 2002 14:09:06 -0000	1.10
  @@ -233,4 +233,41 @@
       
       <jar name="portal-fw-block.jar"/>
     </project>
  +
  +  <project name="databases-block">
  +    <package>org.apache.cocoon</package>
  +    
  +    <ant target="block">
  +      <property name="block-name" value="databases"/>
  +    </ant>
  +    
  +    <depend project="xml-cocoon2"/>
  +    
  +    <work nested="tools/anttasks"/>
  +    <home nested="build/cocoon"/>
  +    
  +    <jar name="databases-block.jar"/>
  +
  +    <nag from="Christian Haul &lt;haul@apache.org&gt;"
  +         to="cocoon-dev@xml.apache.org"/>
  +  </project>
  +
  +  <project name="hsqldb-block">
  +    <package>org.apache.cocoon</package>
  +    
  +    <ant target="block">
  +      <property name="block-name" value="hsqldb"/>
  +    </ant>
  +    
  +    <depend project="xml-cocoon2"/>
  +    <depend project="databases-block"/>
  +    
  +    <work nested="tools/anttasks"/>
  +    <home nested="build/cocoon"/>
  +    
  +    <jar name="hsqldb-block.jar"/>
  +
  +    <nag from="Christian Haul &lt;haul@apache.org&gt;"
  +         to="cocoon-dev@xml.apache.org"/>
  +  </project>
   </module>
  
  
  
  1.8       +2 -0      xml-cocoon2/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/properties.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- properties.xml	27 Sep 2002 11:46:12 -0000	1.7
  +++ properties.xml	18 Oct 2002 14:09:06 -0000	1.8
  @@ -109,6 +109,8 @@
           <session-fw include="true"/>
           <authentication-fw include="true"/>
           <portal-fw include="true"/>
  +        <databases include="true"/>
  +        <hsqldb include="true"/>
         </blocks>
   
         <!-- Specify what should be included in the web application (war) file -->
  
  
  
  1.78      +0 -2      xml-cocoon2/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- sitemap.xmap	8 Oct 2002 09:48:01 -0000	1.77
  +++ sitemap.xmap	18 Oct 2002 14:09:06 -0000	1.78
  @@ -111,8 +111,6 @@
   
       <map:transformer logger="sitemap.transformer.cinclude" name="cinclude" pool-grow="2"
pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
   
  -   <map:transformer logger="sitemap.transformer.sql" name="sql" src="org.apache.cocoon.transformation.SQLTransformer"/>
  -
      <map:transformer logger="sitemap.transformer.extractor" name="extractor" src="org.apache.cocoon.transformation.FragmentExtractorTransformer"/>
   
      <map:transformer logger="sitemap.transformer.filter" name="filter" src="org.apache.cocoon.transformation.FilterTransformer"/>
  
  
  
  1.41      +0 -33     xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- cocoon.xconf	22 Sep 2002 20:20:35 -0000	1.40
  +++ cocoon.xconf	18 Oct 2002 14:09:06 -0000	1.41
  @@ -280,15 +280,6 @@
             <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/cookie.xsl"/>
           </builtin-logicsheet>
   
  -        <!-- The ESQL logicsheet is an XSP logicsheet that performs sql queries and

  -             serializes their results as XML. This allows you to work with data from a

  -             wide variety of different sources when using Apache Cocoon. -->
  -        <builtin-logicsheet>
  -          <parameter name="prefix" value="esql"/>
  -          <parameter name="uri" value="http://apache.org/cocoon/SQL/v2"/>
  -          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/esql.xsl"/>
  -        </builtin-logicsheet>
  -
           <builtin-logicsheet>
             <parameter name="prefix" value="log"/>
             <parameter name="uri" value="http://apache.org/xsp/log/2.0"/>
  @@ -382,30 +373,6 @@
   
     <!-- Datasources: -->
     <datasources>
  -    <jdbc logger="core.datasources.personnel" name="personnel">
  -      <!--
  -          If you have an Oracle database, and are using the the
  -      pool-controller below, you should add the attribute
  -      "oradb" and set it to true.
  -
  -      <pool-controller min="5" max="10" oradb="true"/>
  -
  -      That way the test to see if the server has disconnected
  -      the JdbcConnection will function properly.
  -      -->
  -      <pool-controller max="10" min="5"/>
  -      <!--
  -          If you need to ensure an autocommit is set to true or
  -      false, then create the "auto-commit" element below.
  -
  -      <auto-commit>false</auto-commit>
  -
  -      The default is true.
  -      -->
  -      <dburl>jdbc:hsqldb:hsql://localhost:9002</dburl>
  -      <user>sa</user>
  -      <password/>
  -    </jdbc>
     </datasources>
   
     <!-- Compiling xml to byte streams.
  
  
  

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