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/src/java/org/apache/cocoon/components/language/markup/xsp EsqlConnection.java
Date Wed, 12 Jun 2002 06:29:00 GMT
cziegeler    2002/06/11 23:29:00

  Modified:    .        Tag: cocoon_2_0_3_branch build.xml
               src/java/org/apache/cocoon/components/language/markup/xsp
                        Tag: cocoon_2_0_3_branch EsqlConnection.java
  Log:
  Synced build file
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.196.2.6 +43 -14    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.196.2.5
  retrieving revision 1.196.2.6
  diff -u -r1.196.2.5 -r1.196.2.6
  --- build.xml	11 Jun 2002 20:24:12 -0000	1.196.2.5
  +++ build.xml	12 Jun 2002 06:29:00 -0000	1.196.2.6
  @@ -202,7 +202,7 @@
       <property name="images.dir"   value="${src.dir}/documentation/images"/>
       <property name="webapp.dir"   value="${src.dir}/webapp"/>
       <property name="resource.dir" value="${src.dir}/resources"/>
  -    <property name="packages"     value="org.apache.*"/>
  +    <property name="packages"     value="org.apache"/>
       <property name="context.dir"  value="${src.dir}/documentation"/>
   
       <property name="scratchpad.dir"     value="${src.dir}/scratchpad"/>
  @@ -479,13 +479,13 @@
     <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="*/"/>
  +    <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=""/>
  +    <filter token="JDBC3_START" value="*/"/>
  +    <filter token="JDBC3_END" value="/*"/>
     </target>
   
     <!-- =================================================================== -->
  @@ -907,6 +907,8 @@
           <include name="**/*.xsl"/>
           <include name="**/*.roles"/>
           <include name="**/*.xml"/>
  +        <include name="**/*.js"/>
  +        <include name="**/*.scm"/>
           <include name="META-INF/**"/>
         </fileset>
       </copy>
  @@ -1118,7 +1120,7 @@
         <taskdef name="xconf-tool" classname="XConfToolTask" 
             classpath="${tools.dir}/anttasks"/>
   
  -      <!-- Invoke the XConfTool to add entries for optional components -->
  +      <!-- Invoke the XConfTool to add optional entries for components -->
         <xconf-tool directory="${build.src}"
                     extension="xmap"
                     configuration="${build.war}/sitemap.xmap"/>
  @@ -1387,8 +1389,9 @@
     <!-- Set a variable if javadoc is already up-to-date.                    -->
     <!-- =================================================================== -->
     <target name="javadocs_check">
  +    <mkdir dir="${build.javadocs}"/> 
       <uptodate property="javadocs.notrequired" targetfile="${build.javadocs}/packages.html"
>
  -      <srcfiles dir= "${build.src}" includes="**/*.java"/>
  +      <srcfiles dir= "${build.src}" includes="**/*.java,**/package.html"/>
       </uptodate>
     </target>
   
  @@ -1404,13 +1407,29 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Creates the API documentation                                       -->
  +  <!-- Creates the API documentation for pre JDK 1.4                       -->
     <!-- =================================================================== -->
  -  <target name="javadocs" depends="prepare-src-main, javadocs_check, javadocs_done"
  -      unless="javadocs.notrequired"
  -      description="* Generates the API documentation">
  -    <mkdir dir="${build.javadocs}"/>
  -    <javadoc packagenames="${packages}"
  +  <target name="javadocs13" unless="jdbc3.present">
  +    <javadoc packagenames="${packages}.*"
  +             sourcepath="${build.src}"
  +             destdir="${build.javadocs}"
  +             author="true"
  +             version="true"
  +             use="false"
  +             noindex="true"
  +             windowtitle="${Name} API"
  +             doctitle="${Name}"
  +             bottom="Copyright &#169; ${year} Apache Software Foundation. All Rights
Reserved."
  +             stylesheetfile="${resource.dir}/javadoc.css">
  +      <classpath refid="classpath"/>
  +    </javadoc>
  +  </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- Creates the API documentation for JDK 1.4                           -->
  +  <!-- =================================================================== -->
  +  <target name="javadocs14" if="jdbc3.present">
  +    <javadoc additionalparam="-subpackages ${packages}"
                sourcepath="${build.src}"
                destdir="${build.javadocs}"
                author="true"
  @@ -1426,6 +1445,16 @@
     </target>
   
     <!-- =================================================================== -->
  +  <!-- Creates the API documentation                                       -->
  +  <!-- =================================================================== -->
  +  <target name="javadocs" depends="prepare-src-main, javadocs_check, javadocs_done"
  +         unless="javadocs.notrequired"
  +         description="Builds the API documentation (javadocs)">
  +      <antcall target="javadocs13"/>
  +      <antcall target="javadocs14"/>
  +  </target>
  +
  +  <!-- =================================================================== -->
     <!-- Creates the API documentation (using the Sun XML doclet)            -->
     <!-- =================================================================== -->
     <target name="xjavadocs" depends="prepare-src-main, javadocs_check, javadocs_done"
  @@ -1445,7 +1474,7 @@
     </target>
     
     <!-- =================================================================== -->
  -  <!-- Creates the source distribution                                     -->
  +  <!-- Prepares the source distribution                                    -->
     <!-- =================================================================== -->
     <target name="dist-src" depends="docs, javadocs" 
             description="Prepares the source distribution">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.2   +3 -3      xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/EsqlConnection.java
  
  Index: EsqlConnection.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/EsqlConnection.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- EsqlConnection.java	4 Jun 2002 09:37:17 -0000	1.6.2.1
  +++ EsqlConnection.java	12 Jun 2002 06:29:00 -0000	1.6.2.2
  @@ -238,7 +238,7 @@
       return(connection.prepareCall(s,i1,i2));
     }
   
  -@JDBC3_START@
  +  /* @JDBC3_START@
       public void setHoldability(int holdability)
           throws SQLException
       {
  @@ -321,7 +321,7 @@
       {
           return connection.prepareStatement(sql, columnNames);
       }
  -@JDBC3_END@
  +@JDBC3_END@ */
   
   }
   
  
  
  

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