From: remm Date: Fri, 13 Oct 2006 15:13:57 +0000 (+0000) Subject: - Add a build script to build extras. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bec9a935a17261ae2f7170134b71be69bda4c1ff;p=tomcat7.0 - Add a build script to build extras. - Update the logging documentation. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@463702 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build.properties.default b/build.properties.default index 07f3030f2..27e944a68 100644 --- a/build.properties.default +++ b/build.properties.default @@ -24,12 +24,8 @@ compile.debug=true base-jakarta.loc=http://archive.apache.org/dist/jakarta base-tomcat.loc=http://archive.apache.org/dist/tomcat -# ----- Commons Logging, version 1.0.1 or later ----- -commons-logging.home=${base.path}/commons-logging-1.0.4 -commons-logging.lib=${commons-logging.home} -commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar -commons-logging.jar=${commons-logging.lib}/commons-logging.jar -commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz +# ----- Commons Logging, version 1.1 or later ----- +commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1-src.tar.gz # ----- Eclipse JDT, version 3.2 or later ----- jdt.home=${base.path}/eclipse/plugins diff --git a/extras.xml b/extras.xml new file mode 100644 index 000000000..703b6e0b7 --- /dev/null +++ b/extras.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml index c260884ec..3df93db7a 100644 --- a/webapps/docs/building.xml +++ b/webapps/docs/building.xml @@ -16,20 +16,13 @@

-Building Tomcat from SVN is very easy, and is the first step to contributing to +Building Apache Tomcat from SVN is very easy, and is the first step to contributing to Tomcat. The following is a step by step TODO list.

-
- -

-The default distribution of Tomcat 5.5.x requires a 5.0 or later JDK. Tomcat -can be built using a 1.4.x JDK but you will need to copy the contents of the -compat directory (created by the build process) to your build directory before -Tomcat will start. -

+

The Sun JDK can be downloaded here. @@ -42,10 +35,10 @@ directory into which you installed the JDK release.

-
+

-Download a binary distribution of Ant 1.6.2 or later from +Download a binary distribution of Ant 1.6.5 or later from here.

@@ -66,22 +59,35 @@ available, which will be used to actually perform the build.
-
+
+ +

+ Tomcat SVN repository URL: + http://svn.apache.org/repos/asf/tomcat/tc6.0.x/ +

+ +

+ Download a source package from: + http://tomcat.apache.org/download-60.cgi +

+ +

+ Checkout the source using SVN, selecting the desired version or + branch (current development source is at + http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/), or + unpack the source package. The location where the source has been + placed will be referred as ${tomcat.source}. +

-

-Download the main build.xml script from here. -

+
-

-Create a new directory, and copy the newly download build.xml to it. This - directory will be referred to as the ${tomcat.source} directory in the rest - of this document. -

+

-Go to that directory, and do: +Use the following commands:
cd ${tomcat.source}
+ ant download
ant

@@ -92,8 +98,8 @@ NOTE: Users accessing the Internet through a proxy must use a properties

-WARNING: Running this command will checkout the Tomcat 5 sources from SVN, as - well as download binaries to the /usr/share/java directory. +WARNING: Running this command will download binaries to the + /usr/share/java directory. Make sure this is appropriate to do so on your computer. On Windows, this usually corresponds to the C:\usr\share\java directory, unless Cygwin is used. Read below to customize the directory used @@ -119,29 +125,6 @@ The build can be controlled by creating a ${tomcat.source}/build.properties

-
- -

-It is recommended to regularly update the downloaded Tomcat 5 sources. -To do this, execute the following commands: - -
- cd ${tomcat.source}
- ant checkout
- -

- -

-For a quick rebuild of only modified code you can use: -
- cd ${tomcat.source}
- ant build
- - -

- -
-

diff --git a/webapps/docs/extras.xml b/webapps/docs/extras.xml new file mode 100644 index 000000000..be2caafc8 --- /dev/null +++ b/webapps/docs/extras.xml @@ -0,0 +1,57 @@ + + +]> + + + &project; + + + Additional Components + Remy Maucherat + + + + +

+

+ A number of additional third party components may be used with Apache Tomcat, but are not + provided directly in the downlad bundle for a variety of reasons. These may be built by + users should they need it. +

+ +
+ +
+ +

+ The additional components are built using the extras.xml Ant script which is + present in the source bundle of Tomcat. +

+ +

The build process is the following:

+ +
    +
  • Follow the build instructions to build a Tomcat binary from + the source bundle (note: it will be used by the build process of the additional components, but + does not need to be actually used later on)
    • +
  • Execute the command ant -f extras.xml to run the build script
    • +
  • The additional components JARs will be placed in the output/extras folder
    • +
  • Refer to the documentation below about the usage of these JARs
    • +
+ +
+ +
+ +

+ Tomcat uses a package renamed commons-logging API implementation which is hardcoded to use + the java.util.logging API. The commons-logging additional component builds a full fledged + package renames commons-logging implementation which can be used to replace the implementation + provided with Tomcat. See the logging page for usage instructions. +

+ +
+ + + diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml index 7f6e1d73e..93f6a5b72 100644 --- a/webapps/docs/logging.xml +++ b/webapps/docs/logging.xml @@ -14,6 +14,16 @@ +
+

+ By default, only java.util.logging is available for the core Tomcat, as Tomcat uses + a package renamed logging implementation which is hardcoded for that logger. Usage of + alternate loggers is available after building the extra components (see + the extras components documentation), which includes + a full commons-logging implementation. +

+
+

Tomcat 6.0 uses @@ -61,7 +71,7 @@

  1. Create a file called log4j.properties with the following content - and save it into common/classes. + and save it into $CATALINA_HOME/lib. log4j.rootLogger=debug, R
    log4j.appender.R=org.apache.log4j.RollingFileAppender
    @@ -75,12 +85,16 @@
  2. Download Log4J - (v1.2 or later) and place the log4j jar in $CATALINA_HOME/common/lib.
    3. + (v1.2 or later) and place the log4j jar in $CATALINA_HOME/lib. + +
  3. Build the commons-logging additional component using the extras.xml + Ant build script which is part of teh Tomcat source bundle.
    4. + +
  4. Replace $CATALINA_HOME/bin/tomcat-juli.jar with + output/extras/tomcat-juli.jar.
    5. -
  5. - Download Commons Logging and place the commons-logging.jar - (not commons-logging-api.jar) in $CATALINA_HOME/common/lib with - the log4j jar.
    6. +
  6. Place $CATALINA_HOME/bin/tomcat-juli-adapters.jar in + $CATALINA_HOME/lib.
  7. Start Tomcat
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml index 2ac5084ea..1ee08378b 100644 --- a/webapps/docs/project.xml +++ b/webapps/docs/project.xml @@ -45,6 +45,8 @@ +