You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by he...@apache.org on 2004/12/08 11:49:31 UTC
svn commit: r111245 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/client java/org/apache/axis/deployment java/org/apache/axis/deployment/metadata java/org/apache/axis/engine java/org/apache/axis/om samples/deployment/module1 samples/deployment/module2 samples/deployment/service1 samples/deployment/service2 test/org/apache/axis/deployment test/org/apache/axis/engine test/org/apache/axis/om test/org/apache/axis/om/builder/dummy test/org/apache/axis/registry
Author: hemapani
Date: Wed Dec 8 02:49:31 2004
New Revision: 111245
URL: http://svn.apache.org/viewcvs?view=rev&rev=111245
Log:
remove system.out and replace all with logging
Added:
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
Removed:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineUtils.java
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMNode.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/Handler3.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/Handler4.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoXML.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMEnvelopeTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/builder/dummy/DummyOutObject.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/EchoService.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler1.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingProvider.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/client/Call.java Wed Dec 8 02:49:31 2004
@@ -126,7 +126,7 @@
Runnable runnable = new Runnable() {
public void run() {
try {
- System.out.println("Starting new Thread ");
+ log.info("Starting new Thread ");
MessageContext reposne = createIncomingMessageContext(urlConnect.getInputStream(),engine);
reposne.setServerSide(false);
engine.recive(reposne);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java Wed Dec 8 02:49:31 2004
@@ -1,7 +1,25 @@
package org.apache.axis.deployment;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Vector;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.axis.context.MessageContext;
-import org.apache.axis.deployment.metadata.*;
+import org.apache.axis.deployment.metadata.FlowMetaData;
+import org.apache.axis.deployment.metadata.HandlerMetaData;
+import org.apache.axis.deployment.metadata.ModuleMetaData;
+import org.apache.axis.deployment.metadata.OperationMetaData;
+import org.apache.axis.deployment.metadata.ParameterMetaData;
+import org.apache.axis.deployment.metadata.ServerMetaData;
+import org.apache.axis.deployment.metadata.ServiceMetaData;
import org.apache.axis.deployment.metadata.phaserule.PhaseException;
import org.apache.axis.deployment.repository.utill.HDFileItem;
import org.apache.axis.deployment.repository.utill.UnZipJAR;
@@ -9,8 +27,16 @@
import org.apache.axis.deployment.scheduler.DeploymentIterator;
import org.apache.axis.deployment.scheduler.Scheduler;
import org.apache.axis.deployment.scheduler.SchedulerTask;
-import org.apache.axis.engine.*;
-import org.apache.axis.impl.engine.*;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Constants;
+import org.apache.axis.engine.ExecutionChain;
+import org.apache.axis.engine.Handler;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.impl.engine.GlobalImpl;
+import org.apache.axis.impl.engine.ModuleImpl;
+import org.apache.axis.impl.engine.OperationImpl;
+import org.apache.axis.impl.engine.ServiceImpl;
+import org.apache.axis.impl.engine.TransportImpl;
import org.apache.axis.impl.providers.SimpleJavaProvider;
import org.apache.axis.impl.registry.EngineRegistryImpl;
import org.apache.axis.impl.registry.FlowImpl;
@@ -23,17 +49,8 @@
import org.apache.axis.registry.Parameter;
import org.apache.axis.registry.Service;
import org.apache.axis.registry.Transport;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Vector;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
@@ -57,7 +74,7 @@
*
*/
public class DeploymentEngine implements DeploymentConstants {
-
+ private Log log = LogFactory.getLog(getClass());
private final Scheduler scheduler = new Scheduler();
/**
* This will store all the web Services to deploye
@@ -141,7 +158,7 @@
public void addService(ServiceMetaData serviceMetaData) throws PhaseException, AxisFault {
servicelist.add(serviceMetaData);
addnewService(serviceMetaData);
- System.out.println("Numbetr of service" + engineRegistry.getServiceCount());
+ log.info("Numbetr of service" + engineRegistry.getServiceCount());
}
public void addModule(ModuleMetaData module) throws AxisFault {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/HandlerMetaData.java Wed Dec 8 02:49:31 2004
@@ -2,6 +2,9 @@
import java.util.Vector;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Copyright 2001-2004 The Apache Software Foundation.
* <p/>
@@ -23,6 +26,7 @@
*
*/
public class HandlerMetaData {
+ private Log log = LogFactory.getLog(getClass());
/**
* Following constant values need to parse the <handler>..<handler> tag
*/
@@ -156,11 +160,11 @@
}
public void printMe() {
- System.out.println("===========================================");
- System.out.println("Name : " + getName());
- System.out.println("Ref : " + getRef());
- System.out.println("Class : " + getClassName());
- System.out.println("PhaseMetaData : " + getPhase());
- System.out.println("===========================================");
+ log.info("===========================================");
+ log.info("Name : " + getName());
+ log.info("Ref : " + getRef());
+ log.info("Class : " + getClassName());
+ log.info("PhaseMetaData : " + getPhase());
+ log.info("===========================================");
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/ServiceMetaData.java Wed Dec 8 02:49:31 2004
@@ -6,6 +6,8 @@
import org.apache.axis.deployment.metadata.phaserule.HandlerChainMetaData;
import org.apache.axis.deployment.metadata.phaserule.HandlerChainMetaDataImpl;
import org.apache.axis.deployment.metadata.phaserule.PhaseException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
//import com.thoughtworks.xstream.XStream;
@@ -35,7 +37,7 @@
* actual service class which is to deserilize ServiceMetaData.xml
*/
public class ServiceMetaData implements DeploymentConstants {
-
+ private Log log = LogFactory.getLog(getClass());
public static String PROVIDERNAME = "provider";
public static String STYLENAME = "style";
@@ -163,7 +165,7 @@
public void prinData() throws PhaseException {
HandlerMetaData[] handler = getHandlers();
for (int i = 0; i < handler.length; i++) {
- System.out.println("Hander No " + (i + 1));
+ log.info("Hander No " + (i + 1));
handler[i].printMe();
}
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineUtils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineUtils.java?view=auto&rev=111244
==============================================================================
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMNode.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMNode.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMNode.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMNode.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMNode.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMNode.java Wed Dec 8 02:49:31 2004
@@ -1,6 +1,5 @@
package org.apache.axis.om;
-import org.apache.axis.impl.llom.OMNodeImpl;
/**
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/Handler3.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/Handler3.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/Handler3.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/Handler3.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/Handler3.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/Handler3.java Wed Dec 8 02:49:31 2004
@@ -24,6 +24,7 @@
import org.apache.axis.impl.registry.AbstractEngineElement;
public class Handler3 extends AbstractEngineElement implements Handler {
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
public Handler3() {
@@ -34,11 +35,11 @@
}
public void invoke(MessageContext msgContext) throws AxisFault {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void revoke(MessageContext msgContext) {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void setName(QName name) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/Handler4.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/Handler4.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/Handler4.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/Handler4.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/Handler4.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/Handler4.java Wed Dec 8 02:49:31 2004
@@ -24,7 +24,7 @@
import org.apache.axis.impl.registry.AbstractEngineElement;
public class Handler4 extends AbstractEngineElement implements Handler {
- private String message;
+ private Log log = LogFactory.getLog(getClass());private String message;
private QName name;
public Handler4() {
this.message = "inside Module 2";
@@ -34,11 +34,11 @@
}
public void invoke(MessageContext msgContext) throws AxisFault {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void revoke(MessageContext msgContext) {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void setName(QName name) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/Handler1.java Wed Dec 8 02:49:31 2004
@@ -24,6 +24,7 @@
import org.apache.axis.impl.registry.AbstractEngineElement;
public class Handler1 extends AbstractEngineElement implements Handler {
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
public Handler1() {
@@ -34,11 +35,11 @@
}
public void invoke(MessageContext msgContext) throws AxisFault {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void revoke(MessageContext msgContext) {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void setName(QName name) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/Handler2.java Wed Dec 8 02:49:31 2004
@@ -24,6 +24,7 @@
import org.apache.axis.impl.registry.AbstractEngineElement;
public class Handler2 extends AbstractEngineElement implements Handler {
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
public Handler2() {
@@ -34,11 +35,11 @@
}
public void invoke(MessageContext msgContext) throws AxisFault {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void revoke(MessageContext msgContext) {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void setName(QName name) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java Wed Dec 8 02:49:31 2004
@@ -1,13 +1,12 @@
package org.apache.axis.deployment;
+import javax.xml.stream.XMLStreamException;
+
import junit.framework.TestCase;
-import org.apache.axis.deployment.DeploymentEngine;
-import org.apache.axis.deployment.DeploymentException;
+
import org.apache.axis.deployment.metadata.phaserule.PhaseException;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.registry.EngineRegistry;
-
-import javax.xml.stream.XMLStreamException;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java Wed Dec 8 02:49:31 2004
@@ -37,11 +37,14 @@
import org.apache.axis.registry.Operation;
import org.apache.axis.registry.Parameter;
import org.apache.axis.registry.Service;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @author Srinath Perera(hemapani@opensource.lk)
*/
public class EchoRawXMLTest extends AbstractTestCase{
+ private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("","EchoXMLService");
private QName operationName = new QName("http://localhost/my","echoOMElement");
private QName transportName = new QName("http://localhost/my","NullTransport");
@@ -145,13 +148,13 @@
}
public void reportError(Exception e) {
- System.out.println("reporting error from callback !");
+ log.info("reporting error from callback !");
e.printStackTrace();
}
};
call.asyncCall(method,url,callback);
- System.out.println("send the reqest");
+ log.info("send the reqest");
Thread.sleep(1000);
}catch(Exception e){
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java Wed Dec 8 02:49:31 2004
@@ -31,11 +31,14 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.impl.transport.http.SimpleAxisServer;
import org.apache.axis.registry.EngineRegistry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* @author Srinath Perera(hemapani@opensource.lk)
*/
public class EchoTest extends AbstractTestCase{
+ private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("","EchoService");
private QName operationName = new QName("http://ws.apache.org/axis2","echoVoid");
private QName transportName = new QName("","NullTransport");
@@ -82,7 +85,7 @@
Reader rReader = new InputStreamReader(respose);
char[] charBuf = new char[1024];
while((index = rReader.read(charBuf)) > 0){
- System.out.println(new String(charBuf));
+ log.info(new String(charBuf));
}
in.close();
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoXML.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoXML.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoXML.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoXML.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoXML.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoXML.java Wed Dec 8 02:49:31 2004
@@ -24,7 +24,6 @@
public class EchoXML{
public EchoXML(){}
public OMElement echoOMElement(OMElement omEle){
- System.out.println(omEle);
omEle.setLocalName(omEle.getLocalName()+"Response");
return omEle;
}
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java?view=auto&rev=111245
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java Wed Dec 8 02:49:31 2004
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2003,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis.engine;
+
+import org.apache.axis.registry.Flow;
+
+/**
+ * @author Srinath Perera (hemapani@opensource.lk)
+ */
+public class EngineUtils {
+ public static void addHandlers(Flow flow,ExecutionChain exeChain,String phaseName) throws AxisFault{
+ if(flow != null){
+ int handlerCount = flow.getHandlerCount();
+ for(int i = 0;i<handlerCount;i++){
+ exeChain.addHandler(phaseName,flow.getHandler(i));
+ }
+ }
+ }
+}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMEnvelopeTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMEnvelopeTest.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMEnvelopeTest.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMEnvelopeTest.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMEnvelopeTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/OMEnvelopeTest.java Wed Dec 8 02:49:31 2004
@@ -19,11 +19,6 @@
*/
package org.apache.axis.om;
-import java.io.FileReader;
-
-import org.apache.axis.impl.llom.wrapper.OMXPPWrapper;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserFactory;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/builder/dummy/DummyOutObject.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/builder/dummy/DummyOutObject.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/builder/dummy/DummyOutObject.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/builder/dummy/DummyOutObject.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/builder/dummy/DummyOutObject.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/builder/dummy/DummyOutObject.java Wed Dec 8 02:49:31 2004
@@ -1,15 +1,15 @@
package org.apache.axis.om.builder.dummy;
+import java.io.FileReader;
+import java.io.IOException;
+
+import javax.xml.parsers.SAXParserFactory;
+
import org.apache.axis.om.OutObject;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-import javax.xml.parsers.SAXParserFactory;
-import java.io.FileReader;
-import java.io.IOException;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/EchoService.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/EchoService.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/EchoService.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/EchoService.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/EchoService.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/EchoService.java Wed Dec 8 02:49:31 2004
@@ -1,4 +1,8 @@
package org.apache.axis.registry;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/*
* Copyright 2003,2004 The Apache Software Foundation.
*
@@ -18,7 +22,8 @@
* @author Srinath Perera(hemapani@opensource.lk)
*/
public class EchoService {
+ private Log log = LogFactory.getLog(getClass());
public void echoVoid(){
- System.out.println("echo Service Called");
+ log.info("echo Service Called");
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler.java Wed Dec 8 02:49:31 2004
@@ -22,8 +22,11 @@
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Handler;
import org.apache.axis.impl.registry.AbstractEngineElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class SpeakingHandler extends AbstractEngineElement implements Handler {
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
public SpeakingHandler() {
@@ -34,11 +37,11 @@
}
public void invoke(MessageContext msgContext) throws AxisFault {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void revoke(MessageContext msgContext) {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void setName(QName name) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler1.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler1.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler1.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler1.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler1.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingHandler1.java Wed Dec 8 02:49:31 2004
@@ -22,8 +22,11 @@
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Handler;
import org.apache.axis.impl.registry.AbstractEngineElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class SpeakingHandler1 extends AbstractEngineElement implements Handler {
+ private Log log = LogFactory.getLog(getClass());
private String message;
private QName name;
public SpeakingHandler1(String message) {
@@ -34,11 +37,11 @@
}
public void invoke(MessageContext msgContext) throws AxisFault {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void revoke(MessageContext msgContext) {
- System.out.println("I am " + message + " Handler Running :)");
+ log.info("I am " + message + " Handler Running :)");
}
public void setName(QName name) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingProvider.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingProvider.java?view=diff&rev=111245&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingProvider.java&r1=111244&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingProvider.java&r2=111245
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/registry/SpeakingProvider.java Wed Dec 8 02:49:31 2004
@@ -22,19 +22,22 @@
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Provider;
import org.apache.axis.impl.providers.AbstractProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class SpeakingProvider extends AbstractProvider implements Provider {
+ private Log log = LogFactory.getLog(getClass());
private String message;
public SpeakingProvider(){}
public MessageContext invoke(MessageContext msgContext) throws AxisFault {
- System.out.println("I am Speaking Provider Running :)");
+ log.info("I am Speaking Provider Running :)");
return msgContext;
}
public void revoke(MessageContext msgContext) {
- System.out.println("I am Speaking Provider revoking :)");
+ log.info("I am Speaking Provider revoking :)");
}
/* (non-Javadoc)
* @see org.apache.axis.engine.AbstractProvider#deserializeParameters(org.apache.axis.engine.MessageContext, java.lang.reflect.Method)