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 ch...@apache.org on 2005/09/14 21:50:12 UTC
svn commit: r280930 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/ core/src/org/apache/axis2/context/
integration/test/org/apache/axis2/engine/
integration/test/org/apache/axis2/integration/
integration/test/org/apache/axis2/tcp/
Author: chinthaka
Date: Wed Sep 14 12:49:57 2005
New Revision: 280930
URL: http://svn.apache.org/viewcvs?rev=280930&view=rev
Log: (empty)
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java?rev=280930&r1=280929&r2=280930&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/InstanceDispatcher.java Wed Sep 14 12:49:57 2005
@@ -39,9 +39,9 @@
*/
public void invoke(MessageContext msgContext) throws AxisFault {
- if(msgContext.getOperationContext() != null && msgContext.getServiceContext() != null){
- return;
- }
+// if(msgContext.getOperationContext() != null && msgContext.getServiceContext() != null){
+// return;
+// }
OperationDescription operationDesc = msgContext.getOperationDescription();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=280930&r1=280929&r2=280930&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Wed Sep 14 12:49:57 2005
@@ -51,7 +51,7 @@
* Map containing <code>MessageID</code> to
* <code>OperationContext</code> mapping.
*/
- private static final Map operationContextMap = new HashMap();
+ private final Map operationContextMap = new HashMap();
private final Map serviceContextMap = new HashMap ();
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=280930&r1=280929&r2=280930&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Wed Sep 14 12:49:57 2005
@@ -109,6 +109,7 @@
Constants.TRANSPORT_HTTP,
true);
call.setWsaAction(operationName.getLocalPart());
+// call.setTimeOutInMilliSeconds(60*10000);
OMElement result = call.invokeBlocking(
operationName.getLocalPart(), method);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?rev=280930&r1=280929&r2=280930&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java Wed Sep 14 12:49:57 2005
@@ -19,8 +19,10 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.context.ServiceGroupContext;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.transport.tcp.TCPServer;
+import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,6 +41,11 @@
public static synchronized void deployService(ServiceDescription service)
throws AxisFault {
configurationContext.getAxisConfiguration().addService(service);
+
+ Utils.resolvePhases(configurationContext.getAxisConfiguration(),
+ service);
+ ServiceGroupContext serviceGroupContext = service.getParent().getServiceGroupContext(configurationContext);
+ serviceGroupContext.fillServiceContexts();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=280930&r1=280929&r2=280930&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Wed Sep 14 12:49:57 2005
@@ -79,10 +79,6 @@
operationName);
UtilsTCPServer.deployService(service);
- ServiceDescription service =
- Utils.createSimpleService(serviceName,
- org.apache.axis2.engine.Echo.class.getName(),
- operationName);
serviceContext = UtilServer.createAdressedEnabledClientSide(service);
}