rsitze 2002/07/03 11:47:09
Modified: java/test/functional TestMessageSample.java
TestBidBuySample.java TestProxySample.java
TestJAXRPCSamples.java TestElementSample.java
TestTCPTransportSample.java TestEchoSample.java
TestJAXMSamples.java TestStockSample.java
TestAttachmentsSample.java TestTransportSample.java
TestMiscSample.java
java/samples/addr AddressBookTestCase.java
java/samples/echo echoHeaderStringHandler.java
echoHeaderStructHandler.java
java/test/encoding TestSer.java TestAttributes.java
java/test/wsdl/multithread MultithreadTestCase.java
java/samples/transport/tcp TCPListener.java
TCPTransport.java TCPSender.java
java/test/concurrency TestApplicationScope.java
java/test/wsdl/multiref MultiRefTestCase.java
java/samples/security LogHandler.java
ClientSigningHandler.java
java/test build_functional_tests.xml
java/test/wsdl/addrNoImplSEI AddressBookTestCase.java
Log:
Updates for component reorg.
Revision Changes Path
1.8 +5 -2 xml-axis/java/test/functional/TestMessageSample.java
Index: TestMessageSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestMessageSample.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestMessageSample.java 2 Jul 2002 18:07:35 -0000 1.7
+++ TestMessageSample.java 3 Jul 2002 18:47:07 -0000 1.8
@@ -57,16 +57,19 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.message.TestMsg;
+
/** Test the message sample code.
*/
public class TestMessageSample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestMessageSample.class.getName());
+ LogFactory.getLog(TestMessageSample.class.getName());
public TestMessageSample(String name) {
super(name);
1.15 +5 -2 xml-axis/java/test/functional/TestBidBuySample.java
Index: TestBidBuySample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestBidBuySample.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TestBidBuySample.java 2 Jul 2002 18:07:35 -0000 1.14
+++ TestBidBuySample.java 3 Jul 2002 18:47:07 -0000 1.15
@@ -58,16 +58,19 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.bidbuy.TestClient;
+
/** Test the stock sample code.
*/
public class TestBidBuySample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestBidBuySample.class.getName());
+ LogFactory.getLog(TestBidBuySample.class.getName());
public TestBidBuySample(String name) {
super(name);
1.14 +5 -2 xml-axis/java/test/functional/TestProxySample.java
Index: TestProxySample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestProxySample.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestProxySample.java 2 Jul 2002 18:07:35 -0000 1.13
+++ TestProxySample.java 3 Jul 2002 18:47:07 -0000 1.14
@@ -57,16 +57,19 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.misc.TestClient;
+
/** Test the proxy sample code.
*/
public class TestProxySample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestProxySample.class.getName());
+ LogFactory.getLog(TestProxySample.class.getName());
public TestProxySample(String name) {
super(name);
1.8 +3 -2 xml-axis/java/test/functional/TestJAXRPCSamples.java
Index: TestJAXRPCSamples.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestJAXRPCSamples.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestJAXRPCSamples.java 2 Jul 2002 18:07:35 -0000 1.7
+++ TestJAXRPCSamples.java 3 Jul 2002 18:47:07 -0000 1.8
@@ -58,19 +58,20 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
import samples.jaxrpc.GetInfo;
import samples.jaxrpc.GetQuote1;
+
/**
* Test the JAX-RPC compliance samples.
*/
public class TestJAXRPCSamples extends TestCase {
- static Log log = AxisInternalServices.getLog(TestJAXRPCSamples.class.getName());
+ static Log log = LogFactory.getLog(TestJAXRPCSamples.class.getName());
public TestJAXRPCSamples(String name) {
super(name);
1.10 +5 -2 xml-axis/java/test/functional/TestElementSample.java
Index: TestElementSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestElementSample.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestElementSample.java 2 Jul 2002 18:07:35 -0000 1.9
+++ TestElementSample.java 3 Jul 2002 18:47:07 -0000 1.10
@@ -57,16 +57,19 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.encoding.TestElem;
+
/** Test the ElementService sample code.
*/
public class TestElementSample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestElementSample.class.getName());
+ LogFactory.getLog(TestElementSample.class.getName());
public TestElementSample(String name) {
super(name);
1.30 +4 -2 xml-axis/java/test/functional/TestTCPTransportSample.java
Index: TestTCPTransportSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestTCPTransportSample.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TestTCPTransportSample.java 2 Jul 2002 18:07:35 -0000 1.29
+++ TestTCPTransportSample.java 3 Jul 2002 18:47:07 -0000 1.30
@@ -58,7 +58,6 @@
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.SimpleTargetedChain;
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
@@ -66,7 +65,10 @@
import org.apache.axis.EngineConfiguration;
import org.apache.axis.configuration.DefaultEngineConfigurationFactory;
import org.apache.axis.configuration.SimpleProvider;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.transport.tcp.AdminClient;
import samples.transport.tcp.GetQuote;
import samples.transport.tcp.TCPSender;
@@ -80,7 +82,7 @@
*/
public class TestTCPTransportSample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestTCPTransportSample.class.getName());
+ LogFactory.getLog(TestTCPTransportSample.class.getName());
public TestTCPTransportSample(String name) {
super(name);
1.17 +4 -2 xml-axis/java/test/functional/TestEchoSample.java
Index: TestEchoSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestEchoSample.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TestEchoSample.java 2 Jul 2002 18:07:35 -0000 1.16
+++ TestEchoSample.java 3 Jul 2002 18:47:07 -0000 1.17
@@ -57,16 +57,18 @@
import junit.framework.TestCase;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.echo.TestClient;
/** Test the stock sample code.
*/
public class TestEchoSample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestEchoSample.class.getName());
+ LogFactory.getLog(TestEchoSample.class.getName());
public TestEchoSample(String name) {
super(name);
1.10 +4 -2 xml-axis/java/test/functional/TestJAXMSamples.java
Index: TestJAXMSamples.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestJAXMSamples.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestJAXMSamples.java 2 Jul 2002 18:07:35 -0000 1.9
+++ TestJAXMSamples.java 3 Jul 2002 18:47:07 -0000 1.10
@@ -58,8 +58,10 @@
import samples.jaxm.DelayedStockQuote;
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.jaxm.UddiPing;
import samples.jaxm.SOAPFaultTest;
@@ -69,7 +71,7 @@
* Test the JAX-RPC compliance samples.
*/
public class TestJAXMSamples extends TestCase {
- static Log log = AxisInternalServices.getLog(TestJAXMSamples.class.getName());
+ static Log log = LogFactory.getLog(TestJAXMSamples.class.getName());
public TestJAXMSamples(String name) {
super(name);
1.21 +5 -2 xml-axis/java/test/functional/TestStockSample.java
Index: TestStockSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestStockSample.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TestStockSample.java 2 Jul 2002 18:07:35 -0000 1.20
+++ TestStockSample.java 3 Jul 2002 18:47:07 -0000 1.21
@@ -57,16 +57,19 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.stock.GetQuote;
+
/** Test the stock sample code.
*/
public class TestStockSample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestStockSample.class.getName());
+ LogFactory.getLog(TestStockSample.class.getName());
public TestStockSample(String name) {
super(name);
1.8 +5 -2 xml-axis/java/test/functional/TestAttachmentsSample.java
Index: TestAttachmentsSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestAttachmentsSample.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestAttachmentsSample.java 2 Jul 2002 18:07:35 -0000 1.7
+++ TestAttachmentsSample.java 3 Jul 2002 18:47:08 -0000 1.8
@@ -58,17 +58,20 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
import org.apache.axis.utils.Options;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.attachments.EchoAttachment;
+
/** Test the attachments sample code.
*/
public class TestAttachmentsSample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestAttachmentsSample.class.getName());
+ LogFactory.getLog(TestAttachmentsSample.class.getName());
public TestAttachmentsSample(String name) {
super(name);
1.24 +5 -2 xml-axis/java/test/functional/TestTransportSample.java
Index: TestTransportSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestTransportSample.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TestTransportSample.java 2 Jul 2002 18:07:35 -0000 1.23
+++ TestTransportSample.java 3 Jul 2002 18:47:08 -0000 1.24
@@ -57,16 +57,19 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.client.AdminClient;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.transport.FileTest;
+
/** Test the stock sample code.
*/
public class TestTransportSample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestTransportSample.class.getName());
+ LogFactory.getLog(TestTransportSample.class.getName());
public TestTransportSample(String name) {
super(name);
1.16 +5 -2 xml-axis/java/test/functional/TestMiscSample.java
Index: TestMiscSample.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/functional/TestMiscSample.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TestMiscSample.java 2 Jul 2002 18:07:35 -0000 1.15
+++ TestMiscSample.java 3 Jul 2002 18:47:08 -0000 1.16
@@ -57,20 +57,23 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.utils.Options;
import org.apache.axis.deployment.wsdd.WSDDConstants;
import org.apache.axis.client.AdminClient;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.misc.TestClient;
import java.io.ByteArrayInputStream;
+
/** Test the stock sample code.
*/
public class TestMiscSample extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestMiscSample.class.getName());
+ LogFactory.getLog(TestMiscSample.class.getName());
static final String deployDoc =
"<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\"; " +
1.10 +4 -2 xml-axis/java/samples/addr/AddressBookTestCase.java
Index: AddressBookTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/addr/AddressBookTestCase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AddressBookTestCase.java 2 Jul 2002 18:07:25 -0000 1.9
+++ AddressBookTestCase.java 3 Jul 2002 18:47:08 -0000 1.10
@@ -57,14 +57,16 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
/** Test the address book sample code.
*/
public class AddressBookTestCase extends TestCase {
static Log log =
- AxisInternalServices.getLog(AddressBookTestCase.class.getName());
+ LogFactory.getLog(AddressBookTestCase.class.getName());
public AddressBookTestCase(String name) {
super(name);
1.9 +4 -2 xml-axis/java/samples/echo/echoHeaderStringHandler.java
Index: echoHeaderStringHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/echo/echoHeaderStringHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- echoHeaderStringHandler.java 2 Jul 2002 18:07:26 -0000 1.8
+++ echoHeaderStringHandler.java 3 Jul 2002 18:47:08 -0000 1.9
@@ -55,7 +55,6 @@
package samples.echo;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.AxisFault;
import org.apache.axis.Constants;
import org.apache.axis.handlers.BasicHandler;
@@ -64,8 +63,11 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPHeaderElement;
import org.apache.axis.utils.JavaUtils;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
/** This handler processes the SOAP header "echoMeString" defined in the
* SOAPBuilder Round2C interop tests.
*
@@ -77,7 +79,7 @@
public class echoHeaderStringHandler extends BasicHandler
{
static Log log =
- AxisInternalServices.getLog(echoHeaderStringHandler.class.getName());
+ LogFactory.getLog(echoHeaderStringHandler.class.getName());
public static final String ECHOHEADER_STRING_ID = "echoHeaderStringHandler.id";
public static final String HEADER_NS = "http://soapinterop.org/echoheader/";;
1.10 +5 -2 xml-axis/java/samples/echo/echoHeaderStructHandler.java
Index: echoHeaderStructHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/echo/echoHeaderStructHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- echoHeaderStructHandler.java 2 Jul 2002 18:07:26 -0000 1.9
+++ echoHeaderStructHandler.java 3 Jul 2002 18:47:08 -0000 1.10
@@ -55,7 +55,6 @@
package samples.echo;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.AxisFault;
import org.apache.axis.Constants;
import org.apache.axis.handlers.BasicHandler;
@@ -64,9 +63,13 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPHeaderElement;
import org.apache.axis.utils.JavaUtils;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
import javax.xml.namespace.QName;
+
+
/** This handler processes the SOAP header "echoMeStruct" defined in the
* SOAPBuilder Round2C interop tests.
*
@@ -78,7 +81,7 @@
public class echoHeaderStructHandler extends BasicHandler
{
static Log log =
- AxisInternalServices.getLog(echoHeaderStringHandler.class.getName());
+ LogFactory.getLog(echoHeaderStringHandler.class.getName());
public static final String ECHOHEADER_STRUCT_ID = "echoHeaderStructHandler.id";
public static final String HEADER_NS = "http://soapinterop.org/echoheader/";;
1.32 +4 -2 xml-axis/java/test/encoding/TestSer.java
Index: TestSer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestSer.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TestSer.java 2 Jul 2002 18:07:35 -0000 1.31
+++ TestSer.java 3 Jul 2002 18:47:08 -0000 1.32
@@ -2,7 +2,6 @@
import junit.framework.TestCase;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.MessageContext;
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.DeserializationContextImpl;
@@ -15,7 +14,10 @@
import org.apache.axis.message.RPCParam;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.server.AxisServer;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import org.xml.sax.InputSource;
import javax.xml.namespace.QName;
@@ -27,7 +29,7 @@
*/
public class TestSer extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestSer.class.getName());
+ LogFactory.getLog(TestSer.class.getName());
public static final String myNS = "urn:myNS";
1.15 +3 -2 xml-axis/java/test/encoding/TestAttributes.java
Index: TestAttributes.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestAttributes.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TestAttributes.java 2 Jul 2002 18:07:35 -0000 1.14
+++ TestAttributes.java 3 Jul 2002 18:47:08 -0000 1.15
@@ -1,7 +1,6 @@
package test.encoding;
import junit.framework.TestCase;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.Constants;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
@@ -18,6 +17,8 @@
import org.apache.axis.message.RPCParam;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.server.AxisServer;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
import javax.xml.namespace.QName;
@@ -34,7 +35,7 @@
*/
public class TestAttributes extends TestCase {
static Log log =
- AxisInternalServices.getLog(TestAttributes.class.getName());
+ LogFactory.getLog(TestAttributes.class.getName());
public static final String myNS = "urn:myNS";
1.12 +4 -2 xml-axis/java/test/wsdl/multithread/MultithreadTestCase.java
Index: MultithreadTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/multithread/MultithreadTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MultithreadTestCase.java 2 Jul 2002 18:07:36 -0000 1.11
+++ MultithreadTestCase.java 3 Jul 2002 18:47:08 -0000 1.12
@@ -3,8 +3,10 @@
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import samples.addr.Address;
import samples.addr.AddressBook;
import samples.addr.AddressBookSOAPBindingStub;
@@ -25,7 +27,7 @@
public class MultithreadTestCase extends TestCase {
private static Log log =
- AxisInternalServices.getLog(MultithreadTestCase.class.getName());
+ LogFactory.getLog(MultithreadTestCase.class.getName());
private AddressBook binding;
private static int successCount = 0;
1.25 +3 -2 xml-axis/java/samples/transport/tcp/TCPListener.java
Index: TCPListener.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/tcp/TCPListener.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TCPListener.java 2 Jul 2002 18:07:26 -0000 1.24
+++ TCPListener.java 3 Jul 2002 18:47:09 -0000 1.25
@@ -57,7 +57,6 @@
import org.apache.axis.AxisEngine;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.SimpleTargetedChain;
@@ -69,6 +68,8 @@
import org.apache.axis.configuration.XMLStringProvider;
import org.apache.axis.server.AxisServer;
import org.apache.axis.utils.Options;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
import javax.xml.namespace.QName;
@@ -91,7 +92,7 @@
*/
public class TCPListener implements Runnable {
static Log log =
- AxisInternalServices.getLog(TCPSender.class.getName());
+ LogFactory.getLog(TCPSender.class.getName());
// These have default values.
private String transportName = "TCPTransport";
1.17 +3 -2 xml-axis/java/samples/transport/tcp/TCPTransport.java
Index: TCPTransport.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/tcp/TCPTransport.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TCPTransport.java 2 Jul 2002 18:07:26 -0000 1.16
+++ TCPTransport.java 3 Jul 2002 18:47:09 -0000 1.17
@@ -56,10 +56,11 @@
package samples.transport.tcp;
import org.apache.axis.AxisEngine;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.MessageContext;
import org.apache.axis.client.Call;
import org.apache.axis.client.Transport;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
import java.net.URL;
@@ -73,7 +74,7 @@
public class TCPTransport extends Transport
{
static Log log =
- AxisInternalServices.getLog(TCPTransport.class.getName());
+ LogFactory.getLog(TCPTransport.class.getName());
private String host;
private String port;
1.20 +3 -2 xml-axis/java/samples/transport/tcp/TCPSender.java
Index: TCPSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/tcp/TCPSender.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TCPSender.java 2 Jul 2002 18:07:26 -0000 1.19
+++ TCPSender.java 3 Jul 2002 18:47:09 -0000 1.20
@@ -56,10 +56,11 @@
package samples.transport.tcp;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.handlers.BasicHandler;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
import java.io.BufferedInputStream;
@@ -74,7 +75,7 @@
*/
public class TCPSender extends BasicHandler {
static Log log =
- AxisInternalServices.getLog(TCPSender.class.getName());
+ LogFactory.getLog(TCPSender.class.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
log.info( "Enter: TCPSender::invoke" );
1.8 +4 -2 xml-axis/java/test/concurrency/TestApplicationScope.java
Index: TestApplicationScope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/concurrency/TestApplicationScope.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestApplicationScope.java 2 Jul 2002 18:07:35 -0000 1.7
+++ TestApplicationScope.java 3 Jul 2002 18:47:09 -0000 1.8
@@ -57,7 +57,6 @@
import junit.framework.TestCase;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.configuration.BasicServerConfig;
import org.apache.axis.server.AxisServer;
import org.apache.axis.providers.java.RPCProvider;
@@ -67,8 +66,11 @@
import org.apache.axis.client.Service;
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
/**
* Test the "application" scope option - lots of threads call the same service
* multiple times, and we confirm that only a single instance of the service
@@ -78,7 +80,7 @@
*/
public class TestApplicationScope extends TestCase {
protected static Log log =
- AxisInternalServices.getLog(TestApplicationScope.class.getName());
+ LogFactory.getLog(TestApplicationScope.class.getName());
private BasicServerConfig config;
private AxisServer server;
1.8 +4 -2 xml-axis/java/test/wsdl/multiref/MultiRefTestCase.java
Index: MultiRefTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/multiref/MultiRefTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiRefTestCase.java 2 Jul 2002 18:07:36 -0000 1.7
+++ MultiRefTestCase.java 3 Jul 2002 18:47:09 -0000 1.8
@@ -57,8 +57,10 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import test.wsdl.multiref.holders.NodeHolder;
@@ -66,7 +68,7 @@
*/
public class MultiRefTestCase extends TestCase {
static Log log =
- AxisInternalServices.getLog(MultiRefTestCase.class.getName());
+ LogFactory.getLog(MultiRefTestCase.class.getName());
public MultiRefTestCase(String name) {
super(name);
1.12 +4 -2 xml-axis/java/samples/security/LogHandler.java
Index: LogHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/security/LogHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LogHandler.java 2 Jul 2002 18:07:26 -0000 1.11
+++ LogHandler.java 3 Jul 2002 18:47:09 -0000 1.12
@@ -56,13 +56,15 @@
package samples.security;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.Handler;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.handlers.BasicHandler;
import org.apache.axis.utils.JavaUtils;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.utils.Constants;
import org.apache.xpath.CachedXPathAPI;
@@ -74,7 +76,7 @@
public class LogHandler extends BasicHandler {
static Log log =
- AxisInternalServices.getLog(LogHandler.class.getName());
+ LogFactory.getLog(LogHandler.class.getName());
static {
org.apache.xml.security.Init.init();
1.10 +3 -2 xml-axis/java/samples/security/ClientSigningHandler.java
Index: ClientSigningHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/security/ClientSigningHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ClientSigningHandler.java 2 Jul 2002 18:07:26 -0000 1.9
+++ ClientSigningHandler.java 3 Jul 2002 18:47:09 -0000 1.10
@@ -56,18 +56,19 @@
package samples.security;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
import org.apache.axis.Handler;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.handlers.BasicHandler;
import org.apache.axis.message.SOAPEnvelope;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
public class ClientSigningHandler extends BasicHandler {
static Log log =
- AxisInternalServices.getLog(ClientSigningHandler.class.getName());
+ LogFactory.getLog(ClientSigningHandler.class.getName());
static {
org.apache.xml.security.Init.init();
1.49 +1 -1 xml-axis/java/test/build_functional_tests.xml
Index: build_functional_tests.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/build_functional_tests.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build_functional_tests.xml 21 Jun 2002 16:35:16 -0000 1.48
+++ build_functional_tests.xml 3 Jul 2002 18:47:09 -0000 1.49
@@ -62,7 +62,7 @@
<echo message="Starting test http server."/>
<java classname="org.apache.axis.transport.http.SimpleAxisServer" fork="yes"
dir="./build">
<!-- Uncomment this to use Jikes instead of Javac for compiling JWS Files
- <jvmarg value="-Daxis.Compiler=org.apache.axis.utils.compiler.Jikes"/>
+ <jvmarg value="-Daxis.Compiler=org.apache.axis.components.compiler.Jikes"/>
-->
<jvmarg
value="-Daxis.wsdlgen.intfnamespace=http://localhost:${test.functional.ServicePort}"/>
<jvmarg
value="-Daxis.wsdlgen.serv.loc.url=http://localhost:${test.functional.ServicePort}"/>
1.6 +4 -2 xml-axis/java/test/wsdl/addrNoImplSEI/AddressBookTestCase.java
Index: AddressBookTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/addrNoImplSEI/AddressBookTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AddressBookTestCase.java 2 Jul 2002 18:07:36 -0000 1.5
+++ AddressBookTestCase.java 3 Jul 2002 18:47:09 -0000 1.6
@@ -57,14 +57,16 @@
import junit.framework.TestCase;
import org.apache.axis.AxisFault;
-import org.apache.axis.AxisInternalServices;
+
+import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+
/** Test the address book sample code.
*/
public class AddressBookTestCase extends TestCase {
static Log log =
- AxisInternalServices.getLog(AddressBookTestCase.class.getName());
+ LogFactory.getLog(AddressBookTestCase.class.getName());
public AddressBookTestCase(String name) {
super(name);
