You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/05/05 00:56:56 UTC

cvs commit: jakarta-tomcat-connectors/jk build.xml

costin      2003/05/04 15:56:56

  Modified:    .        build.xml
               jk       build.xml
  Added:       .        README.txt RELEASE-NOTES.txt
               doc      install_tomcat33.html install_tomcat40.html
                        install_tomcat41.html
  Log:
  Add extra docs.
  
  Finish up the dist target
  
  Fix jkconfig jar.
  
  Revision  Changes    Path
  1.7       +24 -7     jakarta-tomcat-connectors/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	4 May 2003 19:36:48 -0000	1.6
  +++ build.xml	4 May 2003 22:56:55 -0000	1.7
  @@ -11,9 +11,19 @@
     <property name="lib.dir" location="${dist.dir}/lib" />
     <property name="build.dir" location="build" />
   
  +  <target name="dist" 
  +          description="Compile jtc distribution" depends="build,javadoc">
  +    <copy file="LICENSE" todir="${dist.dir}" />
  +    <copy file="README.txt" todir="${dist.dir}" />
  +    <copy file="RELEASE-NOTES.txt" todir="${dist.dir}" />
  +
  +    <copy todir="${dist.dir}/doc">
  +     <fileset dir="doc" includes="**" />
  +    </copy>
  +  </target>
   
   
  -  <target name="dist" 
  +  <target name="build" 
             description="Compile jtc">
       <mkdir dir="${build.dir}/classes" />
       <mkdir dir="${lib.dir}" />
  @@ -53,15 +63,22 @@
         <property name="jmx.detect" value="true"/>
         <property name="tomcat-coyote.jar" value="${lib.dir}/tomcat-coyote.jar" />
         <property name="jk.build" value="${build.dir}"/>
  -      <!-- exclude ajp -->
  -      <property name="tomcat5.detect" value="true"/>
  -      <property name="tomcat-jk.jar" value="${lib.dir}/tomcat-jk.jar" />
  -      <property name="tomcat-jkconfig.jar" value="${lib.dir}/jkconfig.jar" />
  -      <property name="tomcat-jkshm.jar" value="${lib.dir}/jkshm.jar" />
  +
         <property name="tomcat-jk2.jar" value="${lib.dir}/tomcat-jk2.jar" />
  -      <property name="tomcat-jni.jar" value="${lib.dir}/tomcat-jni.jar" />
  +      <property name="tomcat-jkconfig.jar" value="${lib.dir}/jkconfig.jar" />
  +
  +      <!-- don't include in dist -->
  +      <property name="tomcat5.detect" value="true"/>
  +      <property name="tomcat-jk.jar" value="${build.dir}/lib/tomcat-jk.jar" /> 
  +      <property name="tomcat-jkshm.jar" value="${build.dir}/lib/jkshm.jar" />
  +      <property name="tomcat-jni.jar" value="${build.dir}/lib/tomcat-jni.jar" />
       </ant>
   
  +    <jar file="${dist.dir}/lib/tomcat33-resources.jar" >
  +      <fileset dir="${build.dir}/classes" >
  +        <include name="**/*.properties" />
  +      </fileset>
  +    </jar>
     </target>
   
     <target name="javadoc" 
  
  
  
  1.1                  jakarta-tomcat-connectors/README.txt
  
  Index: README.txt
  ===================================================================
  Jakarta Tomcat Connector 
  
  This package contains only the tomcat connector:
  
  - tomcat-utils.jar includes general purpose utilities used in tomcat - buffers, 
  thread pools, network code, introspection
  - tomcat-coyote.jar includes the base representation of Request, Response and the code common
  to all protocols
  - tomcat-http11.jar includes the HTTP/1.1 implementation, based on coyote.
  - tomcat-jk2.jar includes the Ajp java implementation along with Jk2 java components
  
  
  
  
  1.1                  jakarta-tomcat-connectors/RELEASE-NOTES.txt
  
  Index: RELEASE-NOTES.txt
  ===================================================================
  
                       Tomcat Connectors Version @VERSION@
                              Release Notes
  
  This version matches the version included with tomcat-5.0.2, and supports tomcat 3.3, 4.0, 4.1, 5.0.
  Bugs and issues will be tracked with tomcat5 - this file will list only issues related with
  older versions.
  
  
  
  
  
  1.1                  jakarta-tomcat-connectors/doc/install_tomcat33.html
  
  Index: install_tomcat33.html
  ===================================================================
  <html>
  <head>
  <title>Installing tomcat-connector in tomcat3.3</title>
  </head>
  <body>
  <h2>Installing tomcat-connector in tomcat3.3</h2>
  <ul>
  <li> copy mx4j-jmx.jar ( or jmxri.jar ) to lib/common</li>
  <li> copy tomcat-coyote.jar, tomcat33-coyote.jar, tomcat-jk2.jar,
  tomcat-http11.jar to lib/container</li>
  <li> replace lib/common/connector-util.jar with tomcat-util.jar</li>
  <li> copy commons-logging-api.jar and tomcat33-resources.jar to lib/common</li>
  <li> edit conf/modules.xml and insert:<br />
  &nbsp; &lt;module name="CoyoteConnector"
  &nbsp; javaClass="org.apache.coyote.tomcat3.CoyoteInterceptor2"/&gt; </li>
  <li>edit conf/server.xml and replace Http10Connector and Ajp13Connector  with: <br />
  &nbsp; &lt;CoyoteConnector port="8080" /&gt;
  &nbsp; <br /> and<br />
  &nbsp; &lt;CoyoteConnector port="8009"
  &nbsp; processorClassName="org.apache.jk.server.JkCoyoteHandler"/&gt;
  </li>
  </ul>
  </body>
  </html>
  
  
  
  1.1                  jakarta-tomcat-connectors/doc/install_tomcat40.html
  
  Index: install_tomcat40.html
  ===================================================================
  <html>
  <head>
  <title>Installing tomcat-connector in tomcat4.0</title>
  </head>
  <body>
  <h2>Installing tomcat-connector in tomcat4.0</h2>
  </body>
  <ul>
  <li>replace tomcat-coyote.jar, tomcat-http11.jar, tomcat-jk2.jar
  and tomcat-util.jar in server/lib</li>
  <li>add tomcat4-coyote.jar to server/lib</li>
  <li>copy mx4j-jmx.jar ( or jmxri.jar ) to common/lib. </li>
  <li>edit server.xml, comment out the original connector (
  org.apache.catalina.connector.http.HttpConnector ) and uncomment the
  coyote connector ( in &lt;Connector className="org.apache.coyote.tomcat4.CoyoteConnector" /&gt; )
  </li>
  <li>also in server.xml, comment out the ajp connector (
  org.apache.ajp.tomcat4.Ajp13Connector ) and add a jk2 connector:
  <br />&nbsp; &lt;Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
  &nbsp; port="8009" minProcessors="5" maxProcessors="75"
  &nbsp; enableLookups="true" redirectPort="8443"
  &nbsp; acceptCount="10" debug="0" connectionTimeout="0"
  &nbsp; useURIValidationHack="false"
  &nbsp; protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/&gt;
  </li>
  </ul>
  </body>
  </html>
  
  
  1.1                  jakarta-tomcat-connectors/doc/install_tomcat41.html
  
  Index: install_tomcat41.html
  ===================================================================
  <html>
  <head>
  <title>Installing tomcat-connector in tomcat4.1</title>
  </head>
  <body>
  <h2>Installing tomcat-connector in tomcat4.1</h2>
  <ul>
  <li>get the new connector ( I'll post the URL soon )</li>
  <li>move mx4j-jmx.jar from server/lib to common/lib. This is not required, but allows you to use JMX. If you run
   tomcat in a sandbox - you can replace mx4j-jmx with jmxri-1.2, which has policy-based security.</li>
  <li>in server/lib, replace tomcat-util.jar, tomcat-jk2.jar, tomcat-coyote.jar and tomcat-http11.jar with the new
   versions.</li>
  <li>copy tomcat4-coyote.jar to server/lib. This is a new file containing the coyote adapter for tomcat4, used to
   be in tomcat-coyote.jar</li>
  <li>remove bin/tomcat-jni.jar ( it is an odd file that causes several
  problems - if you use in-process tomcat we'll provide a different
  mechanism )</li>
  </ul>
  </body>
  </html>
  
  
  
  1.67      +1 -1      jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- build.xml	8 Apr 2003 03:54:32 -0000	1.66
  +++ build.xml	4 May 2003 22:56:55 -0000	1.67
  @@ -209,7 +209,7 @@
                index="true"
   	     basedir="${jk.build}/classes" 
                manifest="conf/jkconfig.manifest">
  -            <include name="org/apache/ajp/config/**" />
  +            <include name="org/apache/jk/config/**" />
           </jar>
   	
   	<jar jarfile="${tomcat-jkshm.jar}"
  
  
  

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