dims 2003/06/26 19:15:44
Modified: java/test/wsdl/extensibility ExtensibilityQueryTestCase.java
java/xmls properties.xml
Log:
Fix for Bug 10479 - should not include log4j.properties in axis.jar
Notes:
- Set the default value for exclude.log4j.configuration to true
- clean up the test\wsdl\extensibility\ test case to not refer to log4j directly.
- cleanup imports of the test case as well.
Revision Changes Path
1.17 +6 -14
xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java
Index: ExtensibilityQueryTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ExtensibilityQueryTestCase.java 18 Jun 2003 23:01:52 -0000 1.16
+++ ExtensibilityQueryTestCase.java 27 Jun 2003 02:15:44 -0000 1.17
@@ -7,33 +7,28 @@
package test.wsdl.extensibility;
-import org.apache.axis.AxisEngine;
-import org.apache.axis.EngineConfiguration;
import org.apache.axis.client.AdminClient;
-import org.apache.axis.encoding.TypeMappingRegistry;
-import org.apache.axis.encoding.ser.BeanDeserializerFactory;
-import org.apache.axis.encoding.ser.BeanSerializerFactory;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.message.MessageElement;
import org.apache.axis.utils.Options;
-import org.apache.log4j.Level;
+import org.apache.commons.logging.Log;
import org.apache.log4j.Logger;
import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.TypeMapping;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.Calendar;
public class ExtensibilityQueryTestCase extends junit.framework.TestCase {
+ protected static Log log =
+ LogFactory.getLog(ExtensibilityQueryTestCase.class.getName());
+
public ExtensibilityQueryTestCase(String name) {
super(name);
}
public void testQuery() {
ExtensibilityQueryPortType binding;
- Logger root = Logger.getRootLogger();
- Level origLevel = root.getEffectiveLevel();
- root.setLevel(Level.FATAL);
try {
ExtensibilityQueryLocator locator = new ExtensibilityQueryLocator();
binding = locator.getExtensibilityQueryPort();
@@ -45,9 +40,6 @@
catch (Exception e) {
throw new junit.framework.AssertionFailedError("Binding initialization
Exception caught: " + e);
}
- finally {
- root.setLevel(origLevel);
- }
assertTrue("binding is null", binding != null);
try {
@@ -63,7 +55,7 @@
MessageElement [] anyContent = any.get_any();
assertEquals(1, anyContent.length);
ResultListType result =
(ResultListType)anyContent[0].getObjectValue(ResultListType.class);
- root.debug("Message " + result + ": " + anyContent[0].toString());
+ log.debug("Message " + result + ": " + anyContent[0].toString());
assertNotNull("ResultListType back from getResultList() is null",
result);
QueryResultType[] queryResult = result.getResult();
assertTrue(queryResult.length == 2);
1.42 +1 -1 xml-axis/java/xmls/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/xmls/properties.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- properties.xml 15 Apr 2003 16:48:21 -0000 1.41
+++ properties.xml 27 Jun 2003 02:15:44 -0000 1.42
@@ -122,4 +122,4 @@
<property name="iis.hostname" value="127.0.0.1"/>
<property name="iis.port" value="80"/>
-
+<property name="exclude.log4j.configuration" value="false"/>
