[jboss-cvs] Repository SVN: r30865 - in apache-logging: 1.1.0.jboss.patch01-brew and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 5 16:36:45 EST 2009
Author: mbenitez
Date: 2009-11-05 16:36:45 -0500 (Thu, 05 Nov 2009)
New Revision: 30865
Added:
apache-logging/1.1.0.jboss.patch01-brew/
apache-logging/1.1.0.jboss.patch01-brew/component-info.xml
apache-logging/1.1.0.jboss.patch01-brew/lib/
apache-logging/1.1.0.jboss.patch01-brew/lib/commons-logging-src.zip
apache-logging/1.1.0.jboss.patch01-brew/lib/commons-logging.jar
apache-logging/1.1.0.jboss.patch01-brew/src/
apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1-build_xml.patch
apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1-src.tar.gz
apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur0.patch
apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur1.patch
apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur2.patch
Log:
Add brew-build 1.1.0.jboss.patch01-brew
Added: apache-logging/1.1.0.jboss.patch01-brew/component-info.xml
===================================================================
--- apache-logging/1.1.0.jboss.patch01-brew/component-info.xml (rev 0)
+++ apache-logging/1.1.0.jboss.patch01-brew/component-info.xml 2009-11-05 21:36:45 UTC (rev 30865)
@@ -0,0 +1,15 @@
+<project name="apache-commons-logging">
+ <component id="apache-logging"
+ licenseType="apache-2.0"
+ version="1.1.0.jboss.patch01-brew"
+ tag="jakarta-commons-logging-jboss-1_1-5_ep1_el4"
+ projectHome="http://jakarta.apache.org/commons/logging/"
+ description="Yet another logging api. This is the 1.1 release with the reflective log4j logger patch.">
+ <artifact id="commons-logging.jar"/>
+ <artifact id="commons-logging-src.zip"/>
+ <export>
+ <include input="commons-logging.jar"/>
+ </export>
+ </component>
+
+</project>
Added: apache-logging/1.1.0.jboss.patch01-brew/lib/commons-logging-src.zip
===================================================================
(Binary files differ)
Property changes on: apache-logging/1.1.0.jboss.patch01-brew/lib/commons-logging-src.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-logging/1.1.0.jboss.patch01-brew/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: apache-logging/1.1.0.jboss.patch01-brew/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1-build_xml.patch
===================================================================
--- apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1-build_xml.patch (rev 0)
+++ apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1-build_xml.patch 2009-11-05 21:36:45 UTC (rev 30865)
@@ -0,0 +1,37 @@
+--- build.xml.sav 2007-02-11 15:26:01.000000000 -0500
++++ build.xml 2008-08-18 17:26:49.984700644 -0400
+@@ -457,6 +457,9 @@
+ <copy todir="${build.home}/classes" filtering="on">
+ <fileset dir="${source.home}" excludes="**/*.java"/>
+ </copy>
++ <copy todir="${build.home}/conf" filtering="off">
++ <fileset dir="${conf.home}" />
++ </copy>
+ <mkdir dir="${build.home}/classes/META-INF"/>
+ <copy file="LICENSE.txt"
+ todir="${build.home}/classes/META-INF"/>
+@@ -785,5 +788,24 @@
+ One or more unit tests failed.
+ </fail>
+ </target>
++
++ <target name="javadoc" depends="compile"
++ description="Create component Javadoc documentation">
++ <mkdir dir="${dist.home}"/>
++ <mkdir dir="${dist.home}/docs"/>
++ <mkdir dir="${dist.home}/docs/api"/>
++ <javadoc sourcepath="${source.home}"
++ destdir="${dist.home}/docs/api"
++ packagenames="org.apache.commons.*"
++ author="true"
++ private="true"
++ version="true"
++ doctitle="<h1>${component.title} (Version ${component.version})</h1>"
++ windowtitle="${component.title} (Version ${component.version})"
++ bottom='Copyright 2001-2005 The Apache Software Foundation.'>
++ <classpath refid="javadoc.classpath"/>
++ </javadoc>
++ </target>
++
+
+ </project>
Added: apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1-src.tar.gz
===================================================================
(Binary files differ)
Property changes on: apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1-src.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur0.patch
===================================================================
--- apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur0.patch (rev 0)
+++ apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur0.patch 2009-11-05 21:36:45 UTC (rev 30865)
@@ -0,0 +1,37 @@
+--- commons-logging/src/java/org/apache/commons/logging/impl/Log4jProxy.java.orig 2009-10-29 11:22:26.000000000 -0400
++++ commons-logging/src/java/org/apache/commons/logging/impl/Log4jProxy.java 2009-10-29 11:40:39.000000000 -0400
+@@ -27,6 +27,7 @@
+ import java.net.URL;
+
+ import org.apache.commons.logging.Log;
++import org.apache.commons.logging.LogFactory;
+
+ /**
+ * A Log implementation that reflectively queries for the log4j Logger methods
+@@ -61,7 +62,17 @@
+ {
+ public Object run()
+ {
+- ClassLoader loader = Thread.currentThread().getContextClassLoader();
++ ClassLoader loader = null;
++ if(!LogFactory.useTCCL)
++ {
++ loader = LogFactory.thisClassLoader;
++ }
++ // Fall back to the original behavior
++ if(LogFactory.useTCCL || loader == null)
++ {
++
++ loader = Thread.currentThread().getContextClassLoader();
++ }
+ // Validate that TCL can actually see the log4j classes
+ try
+ {
+@@ -73,7 +84,6 @@
+ ClassLoader testCL = levelClass.getClassLoader();
+ if( testCL != loggerClass.getClassLoader()
+ || testCL != categoryClass.getClassLoader()
+- || testCL != loggerClass.getClassLoader()
+ || testCL != priorityClass.getClassLoader() )
+ {
+ loader = Log4jProxy.class.getClassLoader();
Added: apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur1.patch
===================================================================
--- apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur1.patch (rev 0)
+++ apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur1.patch 2009-11-05 21:36:45 UTC (rev 30865)
@@ -0,0 +1,13 @@
+--- commons-logging/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java.orig 2009-10-29 11:30:29.000000000 -0400
++++ commons-logging/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java 2009-10-29 11:31:21.000000000 -0400
+@@ -184,7 +184,9 @@
+ * Determines whether logging classes should be loaded using the thread-context
+ * classloader, or via the classloader that loaded this LogFactoryImpl class.
+ */
+- private boolean useTCCL = true;
++ // false by default to prohibit webapps
++ // moved to LogFactory protected boolean useTCCL
++ //private boolean useTCCL = true;
+
+ /**
+ * The string prefixed to every message output by the logDiagnostic method.
Added: apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur2.patch
===================================================================
--- apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur2.patch (rev 0)
+++ apache-logging/1.1.0.jboss.patch01-brew/src/commons-logging-1.1.0-jboss.diff-ur2.patch 2009-11-05 21:36:45 UTC (rev 30865)
@@ -0,0 +1,32 @@
+--- commons-logging/src/java/org/apache/commons/logging/LogFactory.java.orig 2009-10-29 11:32:14.000000000 -0400
++++ commons-logging/src/java/org/apache/commons/logging/LogFactory.java 2009-10-29 11:35:58.000000000 -0400
+@@ -66,6 +66,7 @@
+ * context class loader (TCCL), or not. By default, the TCCL is used.
+ */
+ public static final String TCCL_KEY = "use_tccl";
++ public static boolean useTCCL = false;
+
+ /**
+ * The name (<code>org.apache.commons.logging.LogFactory</code>) of the property
+@@ -178,7 +179,8 @@
+ * AccessControllers etc. It's more efficient to compute it once and
+ * cache it here.
+ */
+- private static ClassLoader thisClassLoader;
++ // TBD - might be useful
++ public static ClassLoader thisClassLoader;
+
+ // ----------------------------------------------------------- Constructors
+
+@@ -820,6 +822,11 @@
+ {
+ ClassLoader classLoader = null;
+
++ if(!useTCCL)
++ {
++ return thisClassLoader;
++ }
++
+ try {
+ // Are we running on a JDK 1.2 or later system?
+ Method method = Thread.class.getMethod("getContextClassLoader",
More information about the jboss-cvs-commits
mailing list