Attached is a diff that addresses bug 10479 in the manner suggested by
Dims below. Dims, would you please review the fix and commit it if you
agree with the content. In addition to applying the patch, the
following files need to be removed.
Src/log4j.properties
Lib/log4j-1.2.4.jar
Lib/log4j-1.2.4.LICENSE
This changes the default logging behavior of Axis by removing Log4J from
the distribution. The new behavior in order of evaluation is:
1. Use the log implementation specified as a property
2. Use Log4J if available in the classpath
3. Use JDK 1.4 logging if available in the classpath
4. Use the commons SimpleLog which writes to Standard.err
So, if you want Log4J logging, simply put it in the classpath and place
your properties file in the appropriate place. Otherwise you get JDK
1.4 or Simple depending on your JVM.
The only weird part about this fix is that I had to change
test.wsdl.extensibility.ExtensibilityQueryTestCase. This testcase
relied on Log4J. When I commented out the references to Log4J classes
all-tests ran fine. Could the author of this test case please comment
on whether this is safe?
Thanks,
Jaime
-----Original Message-----
From: Davanum Srinivas [mailto:[EMAIL PROTECTED]]
Sent: Friday, December 06, 2002 9:30 AM
To: Jaime Meritt
Subject: Re: Bug 10479
Jaime,
If you remove log4j.properties and the log4j.jar, the discovery code
will auto-magically use the
console logger. Try it out. This could be the default and users can add
their own log4j.properties
and drop-in the log4j.jar to use log4j. We need to make sure both
scenario's work. Code should be
already in both commons' logger to make this happen.
Thanks,
dims
--- Jaime Meritt <[EMAIL PROTECTED]> wrote:
> Dims,
>
> In the bug scrub call you appeared to have some comments about how
this
> should be handled that I never got to hear the end of. You mentioned
> using the commons ConsoleLogger by default. Would you please give me
> any comments you have about this fix? I just want to make sure that I
> do it in the way you intended.
>
> Thanks,
> Jaime
> ---
> Jaime Meritt
> Manager, Software Engineering
> Sonic Software Corporation
> 400 Technology Square
> Progress Software Suite
> Cambridge, MA 02139
> Phone: 617-551-6613
>
>
>
=====
Davanum Srinivas - http://xml.apache.org/~dims/
__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com
cvs diff -u -w (in directory C:\CVSStore\xml-axis\java)
? src/org/apache/axis/diff.txt
? src/org/apache/axis/transport/jms/session.zip
cvs server: Diffing .
Index: axis.properties
===================================================================
RCS file: /home/cvspublic/xml-axis/java/axis.properties,v
retrieving revision 1.11
diff -u -w -r1.11 axis.properties
--- axis.properties 7 Oct 2002 14:35:09 -0000 1.11
+++ axis.properties 9 Dec 2002 16:58:36 -0000
@@ -17,7 +17,6 @@
wsdl4j.jar=lib/wsdl4j.jar
commons-logging.jar=lib/commons-logging.jar
commons-discovery.jar=lib/commons-discovery.jar
-log4j-core.jar=lib/log4j-1.2.4.jar
junit.jar=lib/junit.jar
Index: build.xml
===================================================================
RCS file: /home/cvspublic/xml-axis/java/build.xml,v
retrieving revision 1.218
diff -u -w -r1.218 build.xml
--- build.xml 6 Dec 2002 18:21:40 -0000 1.218
+++ build.xml 9 Dec 2002 16:58:37 -0000
@@ -21,7 +21,6 @@
wsdl4j from http://www-124.ibm.com/developerworks/projects/wsdl4j/
commons-logging from http://jakarta.apache.org/commons/logging.html
commons-discovery from http://jakarta.apache.org/commons/discovery.html
- log4j from http://jakarta.apache.org/log4j
activation from http://java.sun.com/products/javabeans/glasgow/jaf.html
mailapi from http://java.sun.com/products/javamail/
@@ -153,8 +152,6 @@
toDir="${build.dest}/org/apache/axis/server"/>
<copy file="${src.dir}/org/apache/axis/client/client-config.wsdd"
toDir="${build.dest}/org/apache/axis/client"/>
- <copy file="${src.dir}/log4j.properties"
- toDir="${build.dest}"/>
<copy file="${src.dir}/simplelog.properties"
toDir="${build.dest}"/>
<copy file="${src.dir}/org/apache/axis/i18n/resource.properties"
@@ -170,7 +167,6 @@
<jar jarfile="${build.lib}/${name}.jar" basedir="${build.dest}" >
<include name="org/**" />
- <include name="log4j.properties"/>
<include name="simplelog.properties"/>
</jar>
<jar jarfile="${build.lib}/${jaxrpc}.jar" basedir="${build.dest}" >
@@ -183,7 +179,6 @@
<copy file="${wsdl4j.jar}" toDir="${build.lib}"/>
<copy file="${commons-logging.jar}" toDir="${build.lib}"/>
<copy file="${commons-discovery.jar}" toDir="${build.lib}"/>
- <copy file="${log4j-core.jar}" toDir="${build.lib}"/>
<!-- Build the new org.apache.axis.tools.ant stuff -->
<ant inheritAll="${ant.inheritAll}" inheritRefs="${ant.inheritRefs}"
dir="${axis.home}/tools" antfile="build.xml" />
cvs server: Diffing docs
cvs server: Diffing docs/ant
cvs server: Diffing docs/images
cvs server: Diffing lib
cvs server: cannot find lib/log4j-1.2.4.LICENSE
cvs server: cannot find lib/log4j-1.2.4.jar
cvs server: Diffing samples
cvs server: Diffing samples/addr
cvs server: Diffing samples/attachments
cvs server: Diffing samples/bidbuy
cvs server: Diffing samples/client
cvs server: Diffing samples/echo
cvs server: Diffing samples/encoding
cvs server: Diffing samples/integrationGuide
cvs server: Diffing samples/integrationGuide/example1
cvs server: Diffing samples/integrationGuide/example2
cvs server: Diffing samples/jaxm
cvs server: Diffing samples/jaxrpc
cvs server: Diffing samples/jaxrpc/address
cvs server: Diffing samples/jaxrpc/hello
cvs server: Diffing samples/jms
cvs server: Diffing samples/message
cvs server: Diffing samples/misc
cvs server: Diffing samples/proxy
cvs server: Diffing samples/security
cvs server: Diffing samples/stock
cvs server: Diffing samples/transport
cvs server: Diffing samples/transport/tcp
cvs server: Diffing samples/userguide
cvs server: Diffing samples/userguide/example1
cvs server: Diffing samples/userguide/example2
cvs server: Diffing samples/userguide/example3
cvs server: Diffing samples/userguide/example4
cvs server: Diffing samples/userguide/example5
cvs server: Diffing samples/userguide/example6
cvs server: Diffing src
cvs server: cannot find src/log4j.properties
cvs server: Diffing src/javax
cvs server: Diffing src/javax/xml
cvs server: Diffing src/javax/xml/messaging
cvs server: Diffing src/javax/xml/namespace
cvs server: Diffing src/javax/xml/rpc
cvs server: Diffing src/javax/xml/rpc/encoding
cvs server: Diffing src/javax/xml/rpc/handler
cvs server: Diffing src/javax/xml/rpc/handler/soap
cvs server: Diffing src/javax/xml/rpc/holders
cvs server: Diffing src/javax/xml/rpc/server
cvs server: Diffing src/javax/xml/rpc/soap
cvs server: Diffing src/javax/xml/soap
cvs server: Diffing src/javax/xml/transform
cvs server: Diffing src/javax/xml/transform/dom
cvs server: Diffing src/javax/xml/transform/sax
cvs server: Diffing src/javax/xml/transform/stream
cvs server: Diffing src/org
cvs server: Diffing src/org/apache
cvs server: Diffing src/org/apache/axis
cvs server: Diffing src/org/apache/axis/attachments
cvs server: Diffing src/org/apache/axis/client
cvs server: Diffing src/org/apache/axis/components
cvs server: Diffing src/org/apache/axis/components/compiler
cvs server: Diffing src/org/apache/axis/components/image
cvs server: Diffing src/org/apache/axis/components/jms
cvs server: Diffing src/org/apache/axis/components/logger
cvs server: Diffing src/org/apache/axis/components/net
cvs server: Diffing src/org/apache/axis/components/script
cvs server: Diffing src/org/apache/axis/components/threadpool
cvs server: Diffing src/org/apache/axis/components/uuid
cvs server: Diffing src/org/apache/axis/configuration
cvs server: Diffing src/org/apache/axis/deployment
cvs server: Diffing src/org/apache/axis/deployment/wsdd
cvs server: Diffing src/org/apache/axis/deployment/wsdd/providers
cvs server: Diffing src/org/apache/axis/description
cvs server: Diffing src/org/apache/axis/encoding
cvs server: Diffing src/org/apache/axis/encoding/ser
cvs server: Diffing src/org/apache/axis/encoding/ser/castor
cvs server: Diffing src/org/apache/axis/enum
cvs server: Diffing src/org/apache/axis/features
cvs server: Diffing src/org/apache/axis/handlers
cvs server: Diffing src/org/apache/axis/handlers/http
cvs server: Diffing src/org/apache/axis/handlers/soap
cvs server: Diffing src/org/apache/axis/holders
cvs server: Diffing src/org/apache/axis/i18n
cvs server: Diffing src/org/apache/axis/ime
cvs server: Diffing src/org/apache/axis/ime/event
cvs server: Diffing src/org/apache/axis/ime/internal
cvs server: Diffing src/org/apache/axis/ime/internal/transports
cvs server: Diffing src/org/apache/axis/ime/internal/transports/http
cvs server: Diffing src/org/apache/axis/ime/internal/transports/java
cvs server: Diffing src/org/apache/axis/ime/internal/transports/local
cvs server: Diffing src/org/apache/axis/ime/internal/util
cvs server: Diffing src/org/apache/axis/ime/internal/util/handler
cvs server: Diffing src/org/apache/axis/message
cvs server: Diffing src/org/apache/axis/monitor
cvs server: Diffing src/org/apache/axis/providers
cvs server: Diffing src/org/apache/axis/providers/java
cvs server: Diffing src/org/apache/axis/schema
cvs server: Diffing src/org/apache/axis/security
cvs server: Diffing src/org/apache/axis/security/servlet
cvs server: Diffing src/org/apache/axis/security/simple
cvs server: Diffing src/org/apache/axis/server
cvs server: Diffing src/org/apache/axis/session
cvs server: Diffing src/org/apache/axis/soap
cvs server: Diffing src/org/apache/axis/strategies
cvs server: Diffing src/org/apache/axis/test
cvs server: Diffing src/org/apache/axis/transport
cvs server: Diffing src/org/apache/axis/transport/http
cvs server: Diffing src/org/apache/axis/transport/java
cvs server: Diffing src/org/apache/axis/transport/jms
cvs server: Diffing src/org/apache/axis/transport/local
cvs server: Diffing src/org/apache/axis/types
cvs server: Diffing src/org/apache/axis/utils
cvs server: Diffing src/org/apache/axis/utils/bytecode
cvs server: Diffing src/org/apache/axis/utils/cache
cvs server: Diffing src/org/apache/axis/wsdl
cvs server: Diffing src/org/apache/axis/wsdl/fromJava
cvs server: Diffing src/org/apache/axis/wsdl/gen
cvs server: Diffing src/org/apache/axis/wsdl/symbolTable
cvs server: Diffing src/org/apache/axis/wsdl/toJava
cvs server: Diffing test
cvs server: Diffing test/MSGDispatch
cvs server: Diffing test/RPCDispatch
cvs server: Diffing test/badWSDL
cvs server: Diffing test/chains
cvs server: Diffing test/components
cvs server: Diffing test/concurrency
cvs server: Diffing test/doesntWork
cvs server: Diffing test/dynamic
cvs server: Diffing test/encoding
cvs server: Diffing test/encoding/beans
cvs server: Diffing test/faults
cvs server: Diffing test/functional
cvs server: Diffing test/httpunit
cvs server: Diffing test/httpunit/lib
cvs server: Diffing test/httpunit/src
cvs server: Diffing test/httpunit/src/test
cvs server: Diffing test/inheritance
cvs server: Diffing test/lib
cvs server: Diffing test/md5attach
cvs server: Diffing test/message
cvs server: Diffing test/outparams
cvs server: Diffing test/properties
cvs server: Diffing test/rpc
cvs server: Diffing test/saaj
cvs server: Diffing test/session
cvs server: Diffing test/soap
cvs server: Diffing test/soap12
cvs server: Diffing test/templateTest
cvs server: Diffing test/types
cvs server: Diffing test/utils
cvs server: Diffing test/utils/cache
cvs server: Diffing test/wsdd
cvs server: Diffing test/wsdl
cvs server: Diffing test/wsdl/_import
cvs server: Diffing test/wsdl/addrNoImplSEI
cvs server: Diffing test/wsdl/anytype
cvs server: Diffing test/wsdl/arrays
cvs server: Diffing test/wsdl/attachments
cvs server: Diffing test/wsdl/clash
cvs server: Diffing test/wsdl/dataset
cvs server: Diffing test/wsdl/datatypes
cvs server: Diffing test/wsdl/echo
cvs server: Diffing test/wsdl/esr
cvs server: Diffing test/wsdl/extensibility
Index: test/wsdl/extensibility/ExtensibilityQueryTestCase.java
===================================================================
RCS file:
/home/cvspublic/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java,v
retrieving revision 1.13
diff -u -w -r1.13 ExtensibilityQueryTestCase.java
--- test/wsdl/extensibility/ExtensibilityQueryTestCase.java 19 Sep 2002 20:25:12
-0000 1.13
+++ test/wsdl/extensibility/ExtensibilityQueryTestCase.java 9 Dec 2002 16:58:39
+-0000
@@ -16,8 +16,9 @@
import org.apache.axis.encoding.ser.BeanSerializerFactory;
import org.apache.axis.encoding.ser.BeanDeserializerFactory;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+//Removing Log4J references for bug 10479 fix -Jaime Meritt
+//import org.apache.log4j.Level;
+//import org.apache.log4j.Logger;
import javax.xml.rpc.encoding.TypeMapping;
import javax.xml.namespace.QName;
@@ -33,9 +34,9 @@
}
public void testQuery() {
ExtensibilityQueryPortType binding;
- Logger root = Logger.getRootLogger();
- Level origLevel = root.getEffectiveLevel();
- root.setLevel(Level.FATAL);
+// Logger root = Logger.getRootLogger();
+// Level origLevel = root.getEffectiveLevel();
+// root.setLevel(Level.FATAL);
try {
ExtensibilityQueryLocator locator = new ExtensibilityQueryLocator();
binding = locator.getExtensibilityQueryPort();
@@ -48,9 +49,9 @@
catch (Exception e) {
throw new junit.framework.AssertionFailedError("Binding initialization
Exception caught: " + e);
}
- finally {
- root.setLevel(origLevel);
- }
+// finally {
+// root.setLevel(origLevel);
+// }
assertTrue("binding is null", binding != null);
try {
cvs server: Diffing test/wsdl/extra
cvs server: Diffing test/wsdl/faults
cvs server: Diffing test/wsdl/filegen
cvs server: Diffing test/wsdl/gateway
cvs server: Diffing test/wsdl/getPort
cvs server: Diffing test/wsdl/header
cvs server: Diffing test/wsdl/import2
cvs server: Diffing test/wsdl/import2/interface1
cvs server: Diffing test/wsdl/import2/interface1/interface2
cvs server: Diffing test/wsdl/import2/service1
cvs server: Diffing test/wsdl/import2/service1/service2
cvs server: Diffing test/wsdl/import2/types1
cvs server: Diffing test/wsdl/import2/types1/types2
cvs server: Diffing test/wsdl/import2/types1/types3
cvs server: Diffing test/wsdl/import3
cvs server: Diffing test/wsdl/import3/MultiImpIncl
cvs server: Diffing test/wsdl/import3/MultiImpIncl/cmp
cvs server: Diffing test/wsdl/import3/MultiImpIncl/includes
cvs server: Diffing test/wsdl/import3/MultiImpIncl/tbl1
cvs server: Diffing test/wsdl/import3/MultiImpIncl/tbl2
cvs server: Diffing test/wsdl/import3/MultiImpIncl/wsdl
cvs server: Diffing test/wsdl/include
cvs server: Diffing test/wsdl/include/address
cvs server: Diffing test/wsdl/include/state
cvs server: Diffing test/wsdl/inheritance
cvs server: Diffing test/wsdl/inout
cvs server: Diffing test/wsdl/interop
cvs server: Diffing test/wsdl/interop3
cvs server: Diffing test/wsdl/interop3/compound1
cvs server: Diffing test/wsdl/interop3/compound2
cvs server: Diffing test/wsdl/interop3/docLit
cvs server: Diffing test/wsdl/interop3/docLitParam
cvs server: Diffing test/wsdl/interop3/emptysa
cvs server: Diffing test/wsdl/interop3/groupE
cvs server: Diffing test/wsdl/interop3/groupE/client
cvs server: Diffing test/wsdl/interop3/import1
cvs server: Diffing test/wsdl/interop3/import1/imported
cvs server: Diffing test/wsdl/interop3/import2
cvs server: Diffing test/wsdl/interop3/import2/imported
cvs server: Diffing test/wsdl/interop3/import3
cvs server: Diffing test/wsdl/interop3/import3/imported
cvs server: Diffing test/wsdl/interop3/rpcEnc
cvs server: Diffing test/wsdl/interop4
cvs server: Diffing test/wsdl/interop4/groupG
cvs server: Diffing test/wsdl/interop4/groupG/dime
cvs server: Diffing test/wsdl/interop4/groupG/dime/doc
cvs server: Diffing test/wsdl/interop4/groupG/dime/rpc
cvs server: Diffing test/wsdl/interop4/groupG/mime
cvs server: Diffing test/wsdl/interop4/groupG/mime/doc
cvs server: Diffing test/wsdl/interop4/groupG/mime/rpc
cvs server: Diffing test/wsdl/interop4/groupH
cvs server: Diffing test/wsdl/interop4/groupH/complexDocLit
cvs server: Diffing test/wsdl/interop4/groupH/complexRPCenc
cvs server: Diffing test/wsdl/interop4/groupH/simpleDocLit
cvs server: Diffing test/wsdl/interop4/groupH/simpleRPCenc
cvs server: Diffing test/wsdl/interop4/groupi
cvs server: Diffing test/wsdl/interop5
cvs server: Diffing test/wsdl/interop5/basetype
cvs server: Diffing test/wsdl/jaxrpchandler
cvs server: Diffing test/wsdl/literal
cvs server: Diffing test/wsdl/marrays
cvs server: Diffing test/wsdl/multibinding
cvs server: Diffing test/wsdl/multiref
cvs server: Diffing test/wsdl/multithread
cvs server: Diffing test/wsdl/names
cvs server: Diffing test/wsdl/nested
cvs server: Diffing test/wsdl/omit
cvs server: Diffing test/wsdl/oneway
cvs server: Diffing test/wsdl/opStyles
cvs server: Diffing test/wsdl/parameterOrder
cvs server: Diffing test/wsdl/polymorphism
cvs server: Diffing test/wsdl/qualify
cvs server: Diffing test/wsdl/qualify2
cvs server: Diffing test/wsdl/ram
cvs server: Diffing test/wsdl/refattr
cvs server: Diffing test/wsdl/roundtrip
cvs server: Diffing test/wsdl/roundtrip/holders
cvs server: Diffing test/wsdl/schemaImport
cvs server: Diffing test/wsdl/sequence
cvs server: Diffing test/wsdl/session
cvs server: Diffing test/wsdl/terra
cvs server: Diffing test/wsdl/types
cvs server: Diffing test/wsdl/wrapped
cvs server: Diffing test/wsdl/wrapped_holders
cvs server: Diffing test/wsdl/wrapped_inout
cvs server: Diffing tools
cvs server: Diffing tools/org
cvs server: Diffing tools/org/apache
cvs server: Diffing tools/org/apache/axis
cvs server: Diffing tools/org/apache/axis/tools
cvs server: Diffing tools/org/apache/axis/tools/ant
cvs server: Diffing tools/org/apache/axis/tools/ant/axis
cvs server: Diffing tools/org/apache/axis/tools/ant/foreach
cvs server: Diffing tools/org/apache/axis/tools/ant/wsdl
cvs server: Diffing webapps
cvs server: Diffing webapps/axis
cvs server: Diffing webapps/axis/WEB-INF
cvs server: Diffing wsdd
cvs server: Diffing wsdd/docs
cvs server: Diffing wsdd/examples
cvs server: Diffing wsdd/examples/chaining_examples
cvs server: Diffing wsdd/examples/from_SOAP_v2
cvs server: Diffing wsdd/examples/serviceConfiguration_examples
cvs server: Diffing wsdd/providers
cvs server: Diffing xmls
Index: xmls/properties.xml
===================================================================
RCS file: /home/cvspublic/xml-axis/java/xmls/properties.xml,v
retrieving revision 1.33
diff -u -w -r1.33 properties.xml
--- xmls/properties.xml 3 Dec 2002 15:42:54 -0000 1.33
+++ xmls/properties.xml 9 Dec 2002 16:58:40 -0000
@@ -43,7 +43,6 @@
<property name="commons-logging.jar" location="${lib.dir}/commons-logging.jar"/>
<property name="commons-discovery.jar" location="${lib.dir}/commons-discovery.jar"/>
<property name="commons-httpclient.jar" location="${lib.dir}/commons-httpclient.jar"/>
-<property name="log4j-core.jar" location="${lib.dir}/log4j-1.2.4.jar"/>
<property name="junit.jar" location="${lib.dir}/junit.jar"/>
<property name="jimi.jar" location="${lib.dir}/JimiProClasses.zip"/>
<property name="activation.jar" location="${lib.dir}/activation.jar"/>
Index: xmls/targets.xml
===================================================================
RCS file: /home/cvspublic/xml-axis/java/xmls/targets.xml,v
retrieving revision 1.50
diff -u -w -r1.50 targets.xml
--- xmls/targets.xml 6 Dec 2002 18:21:41 -0000 1.50
+++ xmls/targets.xml 9 Dec 2002 16:58:40 -0000
@@ -95,10 +95,6 @@
classname="org.apache.commons.httpclient.HttpConnection"
classpathref="classpath"/>
- <available property="log4j.present"
- classname="org.apache.log4j.Category"
- classpathref="classpath"/>
-
<available property="activation.present"
classname="javax.activation.DataHandler"
classpathref="classpath"/>
@@ -280,7 +276,6 @@
<echo message="wsdl4j.present=${wsdl4j.present}" />
<echo message="commons-logging.present=${commons-logging.present}" />
<echo message="commons-discovery.present=${commons-discovery.present}" />
- <echo message="log4j.present=${log4j.present}" />
<echo message="activation.present=${activation.present}" />
<echo message=""/>
<echo message="--- Optional Libraries ---" />
*****CVS exited normally with code 1*****
