You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by he...@apache.org on 2005/05/12 14:32:58 UTC
svn commit: r169807 [3/3] - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/
core/src/org/apache/axis/deployment/
core/src/org/apache/axis/deployment/repository/utill/
core/src/org/apache/axis/description/ core/src/org/apache/axis/engine/
core/src/org/apache/axis/handlers/ core/src/org/apache/axis/modules/
core/src/org/apache/axis/phaseresolver/ core/src/org/apache/axis/receivers/
core/src/org/apache/axis/transport/ core/src/org/apache/axis/transport/http/
core/src/org/apache/axis/transport/mail/ core/src/org/apache/axis/util/
core/test/org/apache/axis/context/ core/test/org/apache/axis/deployment/
core/test/org/apache/axis/description/ core/test/org/apache/axis/engine/
core/test/org/apache/axis/phaserule/ samples/src/encoding/sample1/
samples/src/encoding/sample2/benchMark/ samples/src/interop/doclit/
samples/src/org/apache/axis/testUtils/
samples/test/org/apache/axis/clientapi/ samples/test/org/apache/axis/engine/
samples/test/org/apache/axis/integration/
wsdl/src/org/apache/axis/wsdl/codegen/emitter/
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java Thu May 12 05:32:55 2005
@@ -106,9 +106,9 @@
// TODO fix this
throw new UnsupportedOperationException();
-// AxisService service = msgContext.getOperationContext().getServiceContext().getServiceConfig();
+// ServiceDescription service = msgContext.getOperationContext().getServiceContext().getServiceConfig();
// if (operationName != null) {
-// AxisOperation op = service.getOperation(operationName);
+// OperationDescription op = service.getOperation(operationName);
// if (op != null) {
//
//
@@ -127,7 +127,7 @@
//
// //find the WebService method
// Class ImplClass = obj.getClass();
-// AxisOperation op = msgContext.getOperationContext().getAxisOperation();
+// OperationDescription op = msgContext.getOperationContext().getAxisOperation();
// methodName = op.getName().getLocalPart();
//
// Method[] methods = ImplClass.getMethods();
Modified: webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java Thu May 12 05:32:55 2005
@@ -83,7 +83,7 @@
//
// //find the WebService method
// Class ImplClass = obj.getClass();
-// AxisOperation op = msgContext.getOperationContext().getAxisOperation();
+// OperationDescription op = msgContext.getOperationContext().getAxisOperation();
// String methodName = op.getName().getLocalPart();
// Method[] methods = ImplClass.getMethods();
// for (int i = 0; i < methods.length; i++) {
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java Thu May 12 05:32:55 2005
@@ -27,7 +27,7 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.ServiceDescription;
import org.apache.axis.integration.UtilServer;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
@@ -50,7 +50,7 @@
private MessageContext mc;
private Thread thisThread;
- private AxisService service;
+ private ServiceDescription service;
private SimpleHTTPServer sas;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java Thu May 12 05:32:55 2005
@@ -29,7 +29,7 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.ServiceDescription;
import org.apache.axis.integration.UtilServer;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
@@ -63,7 +63,7 @@
private boolean finish = false;
- private AxisService service;
+ private ServiceDescription service;
private ClassLoader cl;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java Thu May 12 05:32:55 2005
@@ -43,7 +43,7 @@
private QName serviceName = new QName("", "EchoXMLService");
private QName operationName = new QName("http://localhost/my", "echoOMElement");
- private AxisSystem engineRegistry;
+ private AxisConfiguration engineRegistry;
private MessageContext mc;
private Thread thisThread;
private SimpleHTTPServer sas;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java Thu May 12 05:32:55 2005
@@ -30,7 +30,7 @@
import org.apache.axis.clientapi.AsyncResult;
import org.apache.axis.clientapi.Callback;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.ServiceDescription;
import org.apache.axis.integration.UtilServer;
import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.OMElement;
@@ -54,7 +54,7 @@
private QName operationName = new QName("echoOMElement");
private QName transportName = new QName("http://localhost/my", "NullTransport");
- private AxisSystem engineRegistry;
+ private AxisConfiguration engineRegistry;
private MessageContext mc;
private Thread thisThread;
private SimpleHTTPServer sas;
@@ -71,7 +71,7 @@
protected void setUp() throws Exception {
UtilServer.start();
- AxisService service =
+ ServiceDescription service =
Utils.createSimpleService(
serviceName,
org.apache.axis.engine.Echo.class.getName(),
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java Thu May 12 05:32:55 2005
@@ -26,8 +26,8 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
import org.apache.axis.description.Flow;
import org.apache.axis.description.FlowImpl;
import org.apache.axis.handlers.AbstractHandler;
@@ -85,7 +85,7 @@
Utils.addHandler(flow, culprit);
Utils.addHandler(flow, new SpeakingHandler());
- AxisService service = Utils.createSimpleService(serviceName,org.apache.axis.engine.Echo.class.getName(),operationName);
+ ServiceDescription service = Utils.createSimpleService(serviceName,org.apache.axis.engine.Echo.class.getName(),operationName);
service.setInFlow(flow);
UtilServer.start();
@@ -99,7 +99,7 @@
}
public void testFailureAtServerResponseFlow() throws Exception {
- AxisService service = Utils.createSimpleService(serviceName,org.apache.axis.engine.Echo.class.getName(),operationName);
+ ServiceDescription service = Utils.createSimpleService(serviceName,org.apache.axis.engine.Echo.class.getName(),operationName);
Flow flow = new FlowImpl();
@@ -120,7 +120,7 @@
Utils.addHandler(flow, new SpeakingHandler());
service.setInFlow(flow);
- AxisOperation operation = new AxisOperation(operationName);
+ OperationDescription operation = new OperationDescription(operationName);
service.addOperation(operation);
UtilServer.start();
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java Thu May 12 05:32:55 2005
@@ -29,9 +29,9 @@
import junit.framework.TestCase;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
import org.apache.axis.integration.UtilServer;
import org.apache.axis.transport.http.SimpleHTTPServer;
import org.apache.axis.util.Utils;
@@ -45,7 +45,7 @@
new QName("http://ws.apache.org/axis2", "echoVoid");
private QName transportName = new QName("", "NullTransport");
- private AxisSystem engineRegistry;
+ private AxisConfiguration engineRegistry;
private MessageContext mc;
private Thread thisThread;
private SimpleHTTPServer sas;
@@ -58,19 +58,19 @@
protected void setUp() throws Exception {
UtilServer.start();
- AxisService service = Utils.createSimpleService(serviceName,org.apache.axis.engine.Echo.class.getName(),operationName);
+ ServiceDescription service = Utils.createSimpleService(serviceName,org.apache.axis.engine.Echo.class.getName(),operationName);
service.setInFlow(new MockFlow("service inflow", 4));
service.setOutFlow(new MockFlow("service outflow", 5));
service.setFaultInFlow(new MockFlow("service faultflow", 1));
- AxisModule m1 = new AxisModule(new QName("", "A Mdoule 1"));
+ ModuleDescription m1 = new ModuleDescription(new QName("", "A Mdoule 1"));
m1.setInFlow(new MockFlow("service module inflow", 4));
m1.setFaultInFlow(new MockFlow("service module faultflow", 1));
service.addModule(m1.getName());
- AxisOperation operation = new AxisOperation(operationName);
+ OperationDescription operation = new OperationDescription(operationName);
service.addOperation(operation);
UtilServer.deployService(Utils.createServiceContext(service,null));
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java Thu May 12 05:32:55 2005
@@ -23,7 +23,7 @@
import org.apache.axis.context.EngineContextFactory;
import org.apache.axis.context.ServiceContext;
-import org.apache.axis.context.SystemContext;
+import org.apache.axis.context.ConfigurationContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.transport.http.SimpleHTTPServer;
@@ -53,7 +53,7 @@
File file = new File("target/test-resources/samples");
System.out.println(new File(file,"server.xml").exists());
- SystemContext er = erfac.buildEngineContext(file.getAbsolutePath());
+ ConfigurationContext er = erfac.buildEngineContext(file.getAbsolutePath());
try {
Thread.sleep(2000);
} catch (InterruptedException e1) {
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClassWriterConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClassWriterConstants.java?rev=169807&r1=169806&r2=169807&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClassWriterConstants.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClassWriterConstants.java Thu May 12 05:32:55 2005
@@ -35,7 +35,7 @@
public static final String ABSTRACT_STUB = "org.apache.axis.clientapi.Stub";
- public static final String AXIS_OPERATION = "org.apache.axis.description.AxisOperation";
+ public static final String AXIS_OPERATION = "org.apache.axis.description.OperationDescription";
public static final String INDENDATION_TAB = "\t";