vmassol 2002/07/22 11:40:21
Modified: documentation/docs/xdocs/images classpath.jpg config.jpg
documentation/docs/xdocs/original archi_classpath.ppt
framework/src/java/share/org/apache/cactus/util
Configuration.java
sample-servlet/conf/sample/build/j2ee12
build-tests-enhydra-31.xml build-tests-resin-12.xml
build-tests-tomcat-32.xml build-tests-tomcat-33.xml
build-tests-weblogic-51.xml
sample-servlet/conf/sample/build/j2ee13
build-tests-resin-13.xml
sample-servlet/conf/sample/build/share build-share.xml
build-tests-orion-14.xml build-tests-orion-15.xml
build-tests-orion-16.xml build-tests-resin-20.xml
build-tests-tomcat-40.xml
build-tests-weblogic-61.xml
build-tests-weblogic-70.xml
sample-servlet/conf/sample/conf/test/j2ee12
cactus.properties
sample-servlet/conf/sample/conf/test/j2ee13
cactus.properties
Log:
* use log4j.properties instead of cactus_server.properties and
cactus_client.properties as this is the default log4j config file
* removed "logging enabled" cactus property as it is no longer needed (NoOpLogger
instead - see howto_config)
Revision Changes Path
1.3 +196 -147 jakarta-cactus/documentation/docs/xdocs/images/classpath.jpg
<<Binary file>>
1.4 +66 -25 jakarta-cactus/documentation/docs/xdocs/images/config.jpg
<<Binary file>>
1.3 +90 -156
jakarta-cactus/documentation/docs/xdocs/original/archi_classpath.ppt
<<Binary file>>
1.9 +1 -17
jakarta-cactus/framework/src/java/share/org/apache/cactus/util/Configuration.java
Index: Configuration.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/util/Configuration.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Configuration.java 21 Jul 2002 12:09:16 -0000 1.8
+++ Configuration.java 22 Jul 2002 18:40:19 -0000 1.9
@@ -88,12 +88,6 @@
private static final String CACTUS_CONFIG_PROPERTY = "cactus.config";
/**
- * Name of Cactus property that enables Cactus logging.
- */
- public static final String CACTUS_ENABLE_LOGGING_PROPERTY =
- "cactus.enableLogging";
-
- /**
* Name of Cactus property that specify the URL up to the webapp context.
* This is the base URL to call for the redirectors. It is made up of :
* "http://"; + serverName + port + "/" + contextName.
@@ -172,14 +166,4 @@
return contextURL;
}
- /**
- * @return true if logging is enabled or false otherwise.
- */
- public static boolean isLoggingEnabled()
- {
- initialize();
-
- return Boolean.valueOf(
- System.getProperty(CACTUS_ENABLE_LOGGING_PROPERTY)).booleanValue();
- }
}
1.6 +0 -4
jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-enhydra-31.xml
Index: build-tests-enhydra-31.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-enhydra-31.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-tests-enhydra-31.xml 22 Jul 2002 12:26:05 -0000 1.5
+++ build-tests-enhydra-31.xml 22 Jul 2002 18:40:20 -0000 1.6
@@ -26,10 +26,6 @@
<target name="start.enhydra.31">
<java classname="org.apache.cactus.ant.EnhydraRun" fork="yes">
-
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<arg value="-start"/>
<arg value="${target.enhydra31.dir}/conf/multiserver.conf"/>
<classpath>
1.5 +0 -3
jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-resin-12.xml
Index: build-tests-resin-12.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-resin-12.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-resin-12.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-resin-12.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -32,9 +32,6 @@
<arg value="-conf"/>
<arg value="resin.conf"/>
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<!-- Needed so that Resin use the resin.home.12 variable as it's
root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${target.resin12.dir}"/>
1.6 +0 -4
jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-tomcat-32.xml
Index: build-tests-tomcat-32.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-tomcat-32.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-tests-tomcat-32.xml 22 Jul 2002 12:26:05 -0000 1.5
+++ build-tests-tomcat-32.xml 22 Jul 2002 18:40:20 -0000 1.6
@@ -26,10 +26,6 @@
<target name="start.tomcat.32">
<java classname="org.apache.tomcat.startup.Tomcat" fork="yes">
-
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<arg value="-config"/>
<arg value="${target.tomcat32.dir}/conf/server.xml"/>
<classpath>
1.5 +0 -4
jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-tomcat-33.xml
Index: build-tests-tomcat-33.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-tomcat-33.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-tomcat-33.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-tomcat-33.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -26,10 +26,6 @@
<target name="start.tomcat.33">
<java classname="org.apache.tomcat.startup.Main" fork="yes">
-
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<jvmarg value="-Dtomcat.home=${target.tomcat33.full.dir}"/>
<jvmarg value="-Dtomcat.install=${tomcat.home.33}"/>
<arg value="start"/>
1.5 +0 -3
jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-weblogic-51.xml
Index: build-tests-weblogic-51.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build-tests-weblogic-51.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-weblogic-51.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-weblogic-51.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -32,9 +32,6 @@
<pathelement location="${weblogic.home.51}/classes/boot"/>
</classpath>
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
<jvmarg
value="-Dweblogic.class.path=${weblogic.home.51}/lib/weblogic510sp8.jar;${weblogic.home.51}/license;${weblogic.home.51}/classes;${weblogic.home.51}/lib/weblogicaux.jar"/>
1.5 +0 -3
jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build-tests-resin-13.xml
Index: build-tests-resin-13.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build-tests-resin-13.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-resin-13.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-resin-13.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -32,9 +32,6 @@
<arg value="-conf"/>
<arg value="resin.conf"/>
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<!-- Needed so that Resin use the resin.home.13 variable as it's
root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${target.resin13.dir}"/>
1.6 +15 -12
jakarta-cactus/sample-servlet/conf/sample/build/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-share.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-share.xml 22 Jul 2002 12:26:05 -0000 1.5
+++ build-share.xml 22 Jul 2002 18:40:20 -0000 1.6
@@ -51,6 +51,8 @@
<property name="target.classes.unit.dir"
value="${target.classes.dir}/unit"/>
<property name="target.conf.dir" value="${target.dir}/conf"/>
+ <property name="target.conf.client.dir" value="${target.conf.dir}/client"/>
+ <property name="target.conf.server.dir" value="${target.conf.dir}/server"/>
<property name="target.doc.dir" value="${target.dir}/doc"/>
<property name="target.doc.api.dir" value="${target.doc.dir}/api"/>
<property name="target.test.dir" value="${target.dir}/test"/>
@@ -242,10 +244,10 @@
-->
<target name="war" depends="compile" description="Generate the runtime war">
- <mkdir dir="${target.conf.dir}"/>
+ <mkdir dir="${target.conf.client.dir}"/>
<!-- Copy the manifest in order to replace the version token filter -->
- <copy todir="${target.conf.dir}" filtering="on">
+ <copy todir="${target.conf.client.dir}" filtering="on">
<fileset dir="${conf.dir}" >
<include name="manifest"/>
</fileset>
@@ -253,7 +255,7 @@
<war warfile="${target.dir}/${sample.war.name}.war"
webxml="${conf.dir}/web.xml"
- manifest="${target.conf.dir}/manifest">
+ manifest="${target.conf.client.dir}/manifest">
<classes dir="${target.classes.sample.dir}">
<!-- Do not include test files in the runtime war -->
@@ -339,10 +341,10 @@
<target name="prepare.test" depends="init">
<!-- Copy cactus.properties to replace the token filters -->
- <copy todir="${target.conf.dir}"
+ <copy todir="${target.conf.client.dir}"
file="${conf.test.dir}/cactus.properties" filtering="on"/>
<!-- Copy log_client.properties so that it is in the classpath -->
- <copy todir="${target.conf.dir}"
+ <copy tofile="${target.conf.client.dir}/log4j.properties"
file="${conf.test.dir}/log_client.properties"/>
</target>
@@ -352,13 +354,10 @@
<junit printsummary="yes" haltonfailure="yes" haltonerror="yes"
fork="yes">
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_client.properties"/>
-
<classpath>
<!-- Cactus.propertie and log_client.properties need to be in
the classpath -->
- <pathelement location="${target.conf.dir}"/>
+ <pathelement location="${target.conf.client.dir}"/>
<pathelement location="${target.classes.sample.dir}"/>
<pathelement location="${target.classes.unit.dir}"/>
<path refid="project.class.path"/>
@@ -406,6 +405,11 @@
<copy todir="${target.lib.dir}" file="${aspectjrt.jar}"/>
<copy todir="${target.lib.dir}" file="${commons.logging.jar}"/>
+ <!-- Copy the log4j server configuration file in order to change its
+ name to log4j.properties (the default name for Log4j) -->
+ <copy tofile="${target.conf.server.dir}/log4j.properties"
+ file="${conf.test.dir}/log_server.properties"/>
+
<!-- Make sure the directory for the war exist -->
<mkdir dir="${target.test.dir}"/>
@@ -417,9 +421,8 @@
<classes dir="${target.classes.unit.dir}"/>
<!-- log_server.properties need to be in the server classpath -->
- <classes dir="${conf.test.dir}">
- <include name="log_server.properties"/>
- <include name="cactus.properties"/>
+ <classes dir="${target.conf.server.dir}">
+ <include name="log4j.properties"/>
</classes>
<!-- We need to copy all dependent jar in the war. This is
1.5 +0 -4
jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-14.xml
Index: build-tests-orion-14.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-14.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-orion-14.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-orion-14.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -26,10 +26,6 @@
<target name="start.orion.14">
<java classname="com.evermind.server.ApplicationServer" fork="yes">
-
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<arg value="-config"/>
<arg value="${target.orion14.dir}/conf/server.xml"/>
<classpath>
1.5 +0 -4
jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-15.xml
Index: build-tests-orion-15.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-15.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-orion-15.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-orion-15.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -26,10 +26,6 @@
<target name="start.orion.15">
<java classname="com.evermind.server.ApplicationServer" fork="yes">
-
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<arg value="-config"/>
<arg value="${target.orion15.dir}/conf/server.xml"/>
<classpath>
1.3 +0 -4
jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-16.xml
Index: build-tests-orion-16.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-16.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-orion-16.xml 22 Jul 2002 12:26:05 -0000 1.2
+++ build-tests-orion-16.xml 22 Jul 2002 18:40:20 -0000 1.3
@@ -26,10 +26,6 @@
<target name="start.orion.16">
<java classname="com.evermind.server.ApplicationServer" fork="yes">
-
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<arg value="-config"/>
<arg value="${target.orion16.dir}/conf/server.xml"/>
<classpath>
1.5 +0 -3
jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-resin-20.xml
Index: build-tests-resin-20.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-resin-20.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-resin-20.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-resin-20.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -32,9 +32,6 @@
<arg value="-conf"/>
<arg value="resin.conf"/>
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<!-- Needed so that Resin use the resin.home.20 variable as it's
root directory for resolving file paths -->
<jvmarg value="-Dresin.home=${target.resin20.dir}"/>
1.3 +0 -3
jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-tomcat-40.xml
Index: build-tests-tomcat-40.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-tomcat-40.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-tests-tomcat-40.xml 22 Jul 2002 12:26:05 -0000 1.2
+++ build-tests-tomcat-40.xml 22 Jul 2002 18:40:20 -0000 1.3
@@ -30,9 +30,6 @@
<jvmarg value="-Dcatalina.home=${tomcat.home.40}"/>
<jvmarg value="-Dcatalina.base=${target.tomcat40.dir}"/>
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<arg value="start"/>
<classpath>
1.5 +0 -3
jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-weblogic-61.xml
Index: build-tests-weblogic-61.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-weblogic-61.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-weblogic-61.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-weblogic-61.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -42,9 +42,6 @@
<pathelement location="${junit.jar}"/>
</classpath>
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<jvmarg value="-hotspot"/>
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
1.5 +0 -3
jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-weblogic-70.xml
Index: build-tests-weblogic-70.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-weblogic-70.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-weblogic-70.xml 22 Jul 2002 12:26:05 -0000 1.4
+++ build-tests-weblogic-70.xml 22 Jul 2002 18:40:20 -0000 1.5
@@ -42,9 +42,6 @@
<pathelement location="${junit.jar}"/>
</classpath>
- <!-- When using Log4j for logging -->
- <jvmarg value="-Dlog4j.configuration=log_server.properties"/>
-
<jvmarg value="-hotspot"/>
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
1.3 +0 -3
jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee12/cactus.properties
Index: cactus.properties
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee12/cactus.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cactus.properties 14 Apr 2002 15:56:28 -0000 1.2
+++ cactus.properties 22 Jul 2002 18:40:21 -0000 1.3
@@ -16,6 +16,3 @@
# Default JSP Redirector Name. Used by JspTestCase test cases.
cactus.jspRedirectorName = JspRedirector
-
-# Enable Cactus internal logging
-cactus.enableLogging = true
\ No newline at end of file
1.4 +0 -3
jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee13/cactus.properties
Index: cactus.properties
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee13/cactus.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cactus.properties 19 Apr 2002 21:43:36 -0000 1.3
+++ cactus.properties 22 Jul 2002 18:40:21 -0000 1.4
@@ -26,6 +26,3 @@
# cactus.filterRedirectorName = FilterRedirector
cactus.filterRedirectorName = test/filterRedirector.jsp
-
-# Enable Cactus internal logging
-cactus.enableLogging = true
\ No newline at end of file
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
