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 de...@apache.org on 2006/04/06 10:42:46 UTC
svn commit: r391936 [3/3] - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/rpc/receivers/
codegen/src/org/apache/axis2/wsdl/template/java/ core/src/org/apache/axis2/
core/src/org/apache/axis2/context/ core/src/org/apache/axis2/d...
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Thu Apr 6 01:42:42 2006
@@ -18,8 +18,6 @@
package org.apache.axis2.engine;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.description.*;
import org.apache.axis2.i18n.Messages;
@@ -29,8 +27,8 @@
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
+import java.net.URL;
import java.util.*;
-import java.net.URI;
/**
* Class AxisConfigurationImpl
@@ -55,7 +53,7 @@
// to store AxisObserver Objects
private ArrayList observersList = null;
- private URI axis2Repository = null;
+ private URL axis2Repository = null;
private HashMap allservices = new HashMap();
/**
@@ -126,6 +124,7 @@
/**
* To remove a given module from the system
+ *
* @param module
*/
public void removeModule(QName module) {
@@ -442,7 +441,7 @@
return phasesinfo;
}
- public URI getRepository() {
+ public URL getRepository() {
return axis2Repository;
}
@@ -570,7 +569,7 @@
this.phasesinfo = phasesInfo;
}
- public void setRepository(URI axis2Repository) {
+ public void setRepository(URL axis2Repository) {
this.axis2Repository = axis2Repository;
}
@@ -580,18 +579,6 @@
public void setSystemClassLoader(ClassLoader classLoader) {
this.systemClassLoader = classLoader;
- }
-
- public static String getAxis2HomeDirectory() {
- // if user has set the axis2 home variable try to get that from System properties
- String axis2home = System.getProperty(Constants.AXIS2_HOME);
- if (axis2home == null) {
- axis2home = System.getProperty(Constants.USER_HOME);
- if (axis2home != null) {
- axis2home = axis2home + '/' + DeploymentConstants.DIRECTORY_AXIS2_HOME;
- }
- }
- return axis2home;
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Thu Apr 6 01:42:42 2006
@@ -424,9 +424,7 @@
* @see Phase
* @see Handler
*/
- public void receive
- (MessageContext
- msgContext) throws AxisFault {
+ public void receive(MessageContext msgContext) throws AxisFault {
ConfigurationContext confContext = msgContext.getConfigurationContext();
ArrayList preCalculatedPhases =
confContext.getAxisConfiguration().getGlobalInFlow();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java Thu Apr 6 01:42:42 2006
@@ -18,7 +18,8 @@
package org.apache.axis2.engine;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -28,10 +29,12 @@
* the DependencyManager calls the init method with appropriate parameters.
*/
public class DependencyManager {
- private final static String MESSAGE_CONTEXT_INJECTION_METHOD = "init";
+ private final static String MESSAGE_CONTEXT_INJECTION_METHOD = "setOperationContext";
+ private final static String SERVICE_INIT_METHOD = "init";
+ private final static String SERVICE_DESTROY_METHOD = "destroy";
- public static void configureBusinessLogicProvider(Object obj, MessageContext requestMsgCtx,
- MessageContext responseMsgCtx)
+ public static void configureBusinessLogicProvider(Object obj,
+ OperationContext opCtx)
throws AxisFault {
try {
Class classToLoad = obj.getClass();
@@ -40,13 +43,9 @@
for (int i = 0; i < methods.length; i++) {
if (MESSAGE_CONTEXT_INJECTION_METHOD.equals(methods[i].getName())
&& (methods[i].getParameterTypes().length == 1)
- && (methods[i].getParameterTypes()[0] == MessageContext.class)) {
- methods[i].invoke(obj, new Object[]{requestMsgCtx});
- } else if (MESSAGE_CONTEXT_INJECTION_METHOD.equals(methods[i].getName())
- && (methods[i].getParameterTypes().length == 2)
- && (methods[i].getParameterTypes()[0] == MessageContext.class)
- && (methods[i].getParameterTypes()[1] == MessageContext.class)) {
- methods[i].invoke(obj, new Object[]{requestMsgCtx, responseMsgCtx});
+ && (methods[i].getParameterTypes()[0] == OperationContext.class)) {
+ methods[i].invoke(obj, new Object[]{opCtx});
+ break;
}
}
} catch (SecurityException e) {
@@ -60,18 +59,19 @@
}
}
- public static void configureBusinessLogicProvider(Object obj, MessageContext requestMsgCtx )
- throws AxisFault {
+ public static void initServiceClass(Object obj,
+ ServiceContext serviceContext) throws AxisFault {
try {
Class classToLoad = obj.getClass();
Method[] methods = classToLoad.getMethods();
for (int i = 0; i < methods.length; i++) {
- if (MESSAGE_CONTEXT_INJECTION_METHOD.equals(methods[i].getName())
+ if (SERVICE_INIT_METHOD.equals(methods[i].getName())
&& (methods[i].getParameterTypes().length == 1)
- && (methods[i].getParameterTypes()[0] == MessageContext.class)) {
- methods[i].invoke(obj, new Object[]{requestMsgCtx});
- }
+ && (methods[i].getParameterTypes()[0] == ServiceContext.class)) {
+ methods[i].invoke(obj, new Object[]{serviceContext});
+ break;
+ }
}
} catch (SecurityException e) {
throw new AxisFault(e);
@@ -83,4 +83,33 @@
throw new AxisFault(e);
}
}
+
+ public static void destroyServiceClass(ServiceContext serviceContext) throws AxisFault {
+ try {
+ Object obj = serviceContext.getProperty(ServiceContext.SERVICE_CLASS);
+ if (obj != null) {
+ Class classToLoad = obj.getClass();
+ Method[] methods = classToLoad.getMethods();
+
+ for (int i = 0; i < methods.length; i++) {
+ if (SERVICE_DESTROY_METHOD.equals(methods[i].getName())
+ && (methods[i].getParameterTypes().length == 1)
+ && (methods[i].getParameterTypes()[0] == ServiceContext.class)) {
+ methods[i].invoke(obj, new Object[]{serviceContext});
+ break;
+ }
+ }
+ }
+ } catch (SecurityException e) {
+ throw new AxisFault(e);
+ } catch (IllegalArgumentException e) {
+ throw new AxisFault(e);
+ } catch (IllegalAccessException e) {
+ throw new AxisFault(e);
+ } catch (InvocationTargetException e) {
+ throw new AxisFault(e);
+ }
+
+ }
+
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/AbstractMessageReceiver.java Thu Apr 6 01:42:42 2006
@@ -26,6 +26,7 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
@@ -87,6 +88,9 @@
} else {
// create a new service impl class for that service
serviceimpl = makeNewServiceObject(msgContext);
+ //Service initialization
+ DependencyManager.initServiceClass(serviceimpl,
+ msgContext.getServiceContext());
serviceContext.setProperty(ServiceContext.SERVICE_CLASS, serviceimpl);
return serviceimpl;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java Thu Apr 6 01:42:42 2006
@@ -68,7 +68,8 @@
// find the WebService method
Class ImplClass = obj.getClass();
- DependencyManager.configureBusinessLogicProvider(obj, msgContext, null);
+ DependencyManager.configureBusinessLogicProvider(obj,
+ msgContext.getOperationContext());
AxisOperation op = msgContext.getOperationContext().getAxisOperation();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Thu Apr 6 01:42:42 2006
@@ -76,7 +76,8 @@
Class ImplClass = obj.getClass();
// Inject the Message Context if it is asked for
- DependencyManager.configureBusinessLogicProvider(obj, msgContext, newmsgContext);
+ DependencyManager.configureBusinessLogicProvider(obj,
+ msgContext.getOperationContext());
AxisOperation opDesc = msgContext.getOperationContext().getAxisOperation();
Method method = findOperation(opDesc, ImplClass);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java Thu Apr 6 01:42:42 2006
@@ -19,15 +19,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.SessionContext;
+import org.apache.axis2.context.*;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEngine;
+import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.http.server.HttpRequestHandler;
import org.apache.axis2.transport.http.server.SimpleHttpServerConnection;
@@ -45,11 +43,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.SocketException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
public class HTTPWorker implements HttpRequestHandler {
@@ -408,7 +402,26 @@
if ((currentTime - sessionContext.getLastTouchedTime()) >
sessionContext.sessionContextTimeoutInterval) {
sgCtxtMapKeyIter.remove();
+ Iterator serviceGroupContext = sessionContext.getServiceGroupContext();
+ if (serviceGroupContext != null) {
+ while (serviceGroupContext.hasNext()) {
+ ServiceGroupContext groupContext = (ServiceGroupContext) serviceGroupContext.next();
+ cleanupServiceContextes(groupContext);
+ }
+ }
}
+ }
+ }
+ }
+
+ private void cleanupServiceContextes(ServiceGroupContext serviceGroupContext) {
+ Iterator serviceContecxtes = serviceGroupContext.getServiceContexts();
+ while (serviceContecxtes.hasNext()) {
+ ServiceContext serviceContext = (ServiceContext) serviceContecxtes.next();
+ try {
+ DependencyManager.destroyServiceClass(serviceContext);
+ } catch (AxisFault axisFault) {
+ log.info(axisFault.getMessage());
}
}
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java Thu Apr 6 01:42:42 2006
@@ -43,10 +43,8 @@
File repo = new File(repositoryName);
String xmlFile = testResourceDir + "/deployment/server-transport.xml";
File xml = new File(xmlFile);
- DeploymentEngine engine = new DeploymentEngine(
- repo.toURI(), xml.toURI());
- engine.load();
- AxisConfiguration er = engine.getAxisConfig();
+ FileSystemConfigurator fsc = new FileSystemConfigurator(repo.getAbsolutePath(), xml.getAbsolutePath());
+ AxisConfiguration er = fsc.getAxisConfiguration();
TransportInDescription transport = er.getTransportIn(new QName("http"));
assertNotNull(transport);
TransportOutDescription transport1 = er.getTransportOut(
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Thu Apr 6 01:42:42 2006
@@ -618,6 +618,22 @@
tofile="target/Repository/modules/addressing-${addressing_version}.mar"/>
<copy file="../core/conf/axis2.xml"
tofile="target/Repository/conf/axis2.xml"/>
+
+ <mkdir dir="target/perf2/build/repo/conf"/>
+ <mkdir dir="target/perf/build/repo/conf"/>
+
+ <copy file="../core/conf/axis2.xml"
+ tofile="target/perf2/build/repo/conf/axis2.xml"/>
+<copy file="../core/conf/axis2.xml"
+ tofile="target/perf/build/repo/conf/axis2.xml"/>
+
+<mkdir dir="target/perf2/build/repo/modules"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/perf2/build/repo/modules/addressing-${addressing_version}.mar"/>
+
+<mkdir dir="target/perf/build/repo/modules"/>
+ <copy file="../addressing/target/addressing-${addressing_version}.mar"
+ tofile="target/perf/build/repo/modules/addressing-${addressing_version}.mar"/>
<j:jelly xmlns="jelly:ant">
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/async/AsyncMessageReceiver.java Thu Apr 6 01:42:42 2006
@@ -46,7 +46,8 @@
Class ImplClass = obj.getClass();
// Inject the Message Context if it is asked for
- DependencyManager.configureBusinessLogicProvider(obj, msgContext, newmsgContext);
+ DependencyManager.configureBusinessLogicProvider(obj,
+ msgContext.getOperationContext());
AxisOperation opDesc = msgContext.getOperationContext().getAxisOperation();
Method method = findOperation(opDesc, ImplClass);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java Thu Apr 6 01:42:42 2006
@@ -80,7 +80,8 @@
Options options = new Options();
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
ConfigurationContext configContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",
+ "target/test-resources/integrationRepo/conf/axis2.xml");
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
@@ -118,7 +119,8 @@
OMElement payload = TestingUtils.createDummyOMElement();
ConfigurationContext configContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",
+ "target/test-resources/integrationRepo/conf/axis2.xml");
ServiceClient sender = new ServiceClient(configContext, null);
for (int i = 0; i < 5; i++) {
Options options = new Options();
@@ -185,7 +187,8 @@
options.setUseSeparateListener(true);
ConfigurationContext configContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",
+ "target/test-resources/integrationRepo/conf/axis2.xml");
ServiceClient sender = new ServiceClient(configContext, null);
options.setAction(Constants.AXIS2_NAMESPACE_URI+"/"+operationName.getLocalPart());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Thu Apr 6 01:42:42 2006
@@ -90,6 +90,30 @@
count++;
}
+ public static synchronized void start(String repository , String axis2xml) throws Exception {
+ if (count == 0) {
+ ConfigurationContext er = getNewConfigurationContext(repository,axis2xml);
+
+ receiver = new SimpleHTTPServer(er, Constants.TESTING_PORT);
+
+ try {
+ receiver.start();
+ System.out.print("Server started on port "
+ + Constants.TESTING_PORT + ".....");
+ } finally {
+
+ }
+
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e1) {
+ throw new AxisFault("Thread interuptted", e1);
+ }
+
+ }
+ count++;
+ }
+
public static ConfigurationContext getNewConfigurationContext(
String repository) throws Exception {
File file = new File(repository);
@@ -97,7 +121,19 @@
throw new Exception("repository directory "
+ file.getAbsolutePath() + " does not exists");
}
- return ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(), null);
+ return ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(),
+ file.getAbsolutePath() + "/conf/axis2.xml");
+ }
+
+ public static ConfigurationContext getNewConfigurationContext(
+ String repository , String axis2xml) throws Exception {
+ File file = new File(repository);
+ if (!file.exists()) {
+ throw new Exception("repository directory "
+ + file.getAbsolutePath() + " does not exists");
+ }
+ return ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(),
+ axis2xml);
}
public static synchronized void stop() throws AxisFault {
@@ -165,7 +201,8 @@
DeploymentEngine deploymentEngine = new DeploymentEngine();
ConfigurationContext configContext = ConfigurationContextFactory .createConfigurationContextFromFileSystem(
- "target/test-resources/integrationRepo", null);
+ "target/test-resources/integrationRepo",
+ "target/test-resources/integrationRepo/conf/axis2.xml");
AxisModule axisModule = deploymentEngine.buildModule(file,
configContext.getAxisConfiguration());
configContext.getAxisConfiguration().addModule(axisModule);
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=391936&r1=391935&r2=391936&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 Thu Apr 6 01:42:42 2006
@@ -67,7 +67,8 @@
}
ConfigurationContext er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(file
- .getAbsolutePath(), null);
+ .getAbsolutePath(), file
+ .getAbsolutePath() + "/conf/axis2.xml");
try {
Thread.sleep(2000);
} catch (InterruptedException e1) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Thu Apr 6 01:42:42 2006
@@ -26,11 +26,7 @@
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.axis2.swa.EchoRawSwATest;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpMethodRetryHandler;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.NoHttpResponseException;
+import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
@@ -50,8 +46,6 @@
private QName operationName = new QName("mtomSample");
- private AxisService service;
-
public EchoRawMTOMFaultReportTest() {
super(EchoRawSwATest.class.getName());
}
@@ -62,7 +56,7 @@
protected void setUp() throws Exception {
UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
- service = new AxisService(serviceName.getLocalPart());
+ AxisService service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.addParameter(new Parameter(AbstractMessageReceiver.SERVICE_CLASS,
EchoService.class.getName()));
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/rahas/TestClient.java Thu Apr 6 01:42:42 2006
@@ -56,7 +56,7 @@
}
protected void setUp() throws Exception {
- UtilServer.start(Constants.TESTING_PATH + getServiceRepo());
+ UtilServer.start(Constants.TESTING_PATH + getServiceRepo() ,null);
}
protected void tearDown() throws Exception {
@@ -73,7 +73,8 @@
String repo = Constants.TESTING_PATH + "rahas_client_repo";
OMElement payload = getEchoElement();
- ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo, null);
+ ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo,
+ null);
ServiceClient serviceClient = new ServiceClient(configContext, null);
Options options = new Options();
options.setTo(new EndpointReference("http://127.0.0.1:" + port + "/axis2/services/Service"));
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java Thu Apr 6 01:42:42 2006
@@ -22,7 +22,10 @@
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.impl.MTOMConstants;
import org.apache.axiom.om.impl.llom.OMTextImpl;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.wsdl.WSDLConstants;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -33,19 +36,19 @@
public class EchoSwA {
private MessageContext msgcts;
+
public EchoSwA() {
}
- public void init(MessageContext msgcts) {
- this.msgcts = msgcts;
-
+ public void setOperationContext(OperationContext oc) throws AxisFault {
+ msgcts = oc.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
}
public OMElement echoAttachment(OMElement omEle) {
- OMElement child = (OMElement)omEle.getFirstOMChild();
+ OMElement child = (OMElement) omEle.getFirstOMChild();
OMAttribute attr = child.getAttribute(new QName("href"));
String contentID = attr.getAttributeValue();
- MIMEHelper attachment = (MIMEHelper)msgcts.getProperty(MTOMConstants.ATTACHMENTS);
+ MIMEHelper attachment = (MIMEHelper) msgcts.getProperty(MTOMConstants.ATTACHMENTS);
contentID = contentID.trim();
if (contentID.substring(0, 3).equalsIgnoreCase("cid")) {
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=391936&r1=391935&r2=391936&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 Thu Apr 6 01:42:42 2006
@@ -189,9 +189,8 @@
}
public void testEchoXMLSyncMC() throws Exception {
- //TODO : Fix Me deepal , I am not complete
ConfigurationContext configContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem(Constants.TESTING_REPOSITORY, null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(Constants.TESTING_REPOSITORY, Constants.TESTING_REPOSITORY + "/conf/axis2.xml");
AxisOperation opdesc = new OutInAxisOperation(new QName("echoOMElement"));
Options options = new Options();
Modified: webservices/axis2/trunk/java/modules/samples/script/SGCCalculator/run.bat
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/SGCCalculator/run.bat?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/SGCCalculator/run.bat (original)
+++ webservices/axis2/trunk/java/modules/samples/script/SGCCalculator/run.bat Thu Apr 6 01:42:42 2006
@@ -35,6 +35,6 @@
set AXIS2_CLASS_PATH=%AXIS2_CLASS_PATH%;"%CURRENT_DIR%\SGCCalculator.jar"
-java -cp %AXIS2_CLASS_PATH% -Daxis2.home=%AXIS2_HOME% sample.sgccalculator.CalcClient
+java -cp %AXIS2_CLASS_PATH% -Daxis2.repo=%AXIS2_HOME% sample.sgccalculator.CalcClient
endlocal
:end
Modified: webservices/axis2/trunk/java/modules/samples/script/SGCCalculator/run.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/SGCCalculator/run.sh?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/SGCCalculator/run.sh (original)
+++ webservices/axis2/trunk/java/modules/samples/script/SGCCalculator/run.sh Thu Apr 6 01:42:42 2006
@@ -9,4 +9,4 @@
export AXIS2_CLASSPATH
echo classpath: $AXIS2_CLASSPATH
-java -classpath $AXIS2_CLASSPATH -Daxis2.home=$AXIS2_HOME sample.sgccalculator.CalcClient
+java -classpath $AXIS2_CLASSPATH -Daxis2.repo=$AXIS2_HOME sample.sgccalculator.CalcClient
Modified: webservices/axis2/trunk/java/modules/samples/script/amazonQS/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/amazonQS/build.xml?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/amazonQS/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/script/amazonQS/build.xml Thu Apr 6 01:42:42 2006
@@ -9,13 +9,13 @@
<target name="cq">
<java classname="sample.amazon.amazonSimpleQueueService.RunGUICQ"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="rq">
<java classname="sample.amazon.amazonSimpleQueueService.RunGUIRQ"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="all" depends="cq,rq"/>
Modified: webservices/axis2/trunk/java/modules/samples/script/amazonQS/run.bat
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/amazonQS/run.bat?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/amazonQS/run.bat (original)
+++ webservices/axis2/trunk/java/modules/samples/script/amazonQS/run.bat Thu Apr 6 01:42:42 2006
@@ -33,8 +33,8 @@
FOR %%c in (%AXIS2_HOME%\lib\*.jar) DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
set AXIS2_CLASS_PATH=%AXIS2_CLASS_PATH%;%CURRENT_DIR%\amazonQS.jar
-start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.home=%AXIS2_HOME% sample.amazon.amazonSimpleQueueService.RunGUICQ
-start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.home=%AXIS2_HOME% sample.amazon.amazonSimpleQueueService.RunGUIRQ
+start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.repo=%AXIS2_HOME% sample.amazon.amazonSimpleQueueService.RunGUICQ
+start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.repo=%AXIS2_HOME% sample.amazon.amazonSimpleQueueService.RunGUIRQ
endlocal
:end
Modified: webservices/axis2/trunk/java/modules/samples/script/amazonQS/run.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/amazonQS/run.sh?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/amazonQS/run.sh (original)
+++ webservices/axis2/trunk/java/modules/samples/script/amazonQS/run.sh Thu Apr 6 01:42:42 2006
@@ -8,7 +8,7 @@
done
export AXIS2_CLASSPATH
echo classpath: $AXIS2_CLASSPATH
-java -classpath $AXIS2_CLASSPATH -Daxis2.home=$AXIS2_HOME sample.amazon.amazonSimpleQueueService.RunGUICQ &
-java -classpath $AXIS2_CLASSPATH -Daxis2.home=$AXIS2_HOME sample.amazon.amazonSimpleQueueService.RunGUIRQ &
+java -classpath $AXIS2_CLASSPATH -Daxis2.repo=$AXIS2_HOME sample.amazon.amazonSimpleQueueService.RunGUICQ &
+java -classpath $AXIS2_CLASSPATH -Daxis2.repo=$AXIS2_HOME sample.amazon.amazonSimpleQueueService.RunGUIRQ &
Modified: webservices/axis2/trunk/java/modules/samples/script/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/build.xml?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/script/build.xml Thu Apr 6 01:42:42 2006
@@ -17,38 +17,38 @@
<target name="testEchoBlockingClient">
<java classname="userguide.clients.EchoBlockingClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testEchoBlockingDualClient">
<java classname="userguide.clients.EchoBlockingDualClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testEchoNonBlockingDualClient">
<java classname="userguide.clients.EchoNonBlockingDualClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testPingClient">
<java classname="userguide.clients.PingClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testWebServiceWithModuleClient">
<java classname="userguide.clients.ClientForWebServiceWithModule"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testEchoNonBlockingClient">
<java classname="userguide.clients.EchoNonBlockingClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
</project>
Modified: webservices/axis2/trunk/java/modules/samples/script/googleSearch/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/googleSearch/build.xml?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/googleSearch/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/script/googleSearch/build.xml Thu Apr 6 01:42:42 2006
@@ -9,7 +9,7 @@
<target name="run">
<java classname="sample.google.search.AsynchronousClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
</project>
Modified: webservices/axis2/trunk/java/modules/samples/script/googleSearch/run.bat
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/googleSearch/run.bat?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/googleSearch/run.bat (original)
+++ webservices/axis2/trunk/java/modules/samples/script/googleSearch/run.bat Thu Apr 6 01:42:42 2006
@@ -34,7 +34,7 @@
FOR %%c in (%AXIS2_HOME%\lib\*.jar) DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
set AXIS2_CLASS_PATH=%AXIS2_CLASS_PATH%;"%CURRENT_DIR%\googleSearch.jar"
-start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.home=%AXIS2_HOME% sample.google.search.AsynchronousClient
+start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.repo=%AXIS2_HOME% sample.google.search.AsynchronousClient
endlocal
Modified: webservices/axis2/trunk/java/modules/samples/script/googleSearch/run.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/googleSearch/run.sh?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/googleSearch/run.sh (original)
+++ webservices/axis2/trunk/java/modules/samples/script/googleSearch/run.sh Thu Apr 6 01:42:42 2006
@@ -9,6 +9,6 @@
export AXIS2_CLASSPATH
echo classpath: $AXIS2_CLASSPATH
-java -classpath $AXIS2_CLASSPATH -Daxis2.home=$AXIS2_HOME sample.google.search.AsynchronousClient
+java -classpath $AXIS2_CLASSPATH -Daxis2.repo=$AXIS2_HOME sample.google.search.AsynchronousClient
Modified: webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/build.xml?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/build.xml Thu Apr 6 01:42:42 2006
@@ -9,7 +9,7 @@
<target name="run">
<java classname="sample.google.spellcheck.SuggestionForm"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
</project>
Modified: webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/run.bat
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/run.bat?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/run.bat (original)
+++ webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/run.bat Thu Apr 6 01:42:42 2006
@@ -35,6 +35,6 @@
set AXIS2_CLASS_PATH=%AXIS2_CLASS_PATH%;"%CURRENT_DIR%\googleSpellcheck.jar"
-start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.home=%AXIS2_HOME% sample.google.spellcheck.SuggestionForm
+start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.repo=%AXIS2_HOME% sample.google.spellcheck.SuggestionForm
endlocal
:end
Modified: webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/run.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/run.sh?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/run.sh (original)
+++ webservices/axis2/trunk/java/modules/samples/script/googleSpellcheck/run.sh Thu Apr 6 01:42:42 2006
@@ -9,4 +9,4 @@
export AXIS2_CLASSPATH
echo classpath: $AXIS2_CLASSPATH
-java -classpath $AXIS2_CLASSPATH -Daxis2.home=$AXIS2_HOME sample.google.spellcheck.SuggestionForm
+java -classpath $AXIS2_CLASSPATH -Daxis2.repo=$AXIS2_HOME sample.google.spellcheck.SuggestionForm
Modified: webservices/axis2/trunk/java/modules/samples/script/mtomSample/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/mtomSample/build.xml?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/mtomSample/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/script/mtomSample/build.xml Thu Apr 6 01:42:42 2006
@@ -15,7 +15,7 @@
<target name="mtomSample">
<java classname="sample.mtom.imagetransfer.client.MTOMClient"
classpathref="sample.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
</project>
Modified: webservices/axis2/trunk/java/modules/samples/script/mtomSample/run.bat
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/mtomSample/run.bat?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/mtomSample/run.bat (original)
+++ webservices/axis2/trunk/java/modules/samples/script/mtomSample/run.bat Thu Apr 6 01:42:42 2006
@@ -28,6 +28,6 @@
FOR %%c in (%AXIS2_HOME%\lib\*.jar) DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
set AXIS2_CLASS_PATH=%AXIS2_CLASS_PATH%;"%CURRENT_DIR%\mtomClient.jar"
-start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.home=%AXIS2_HOME% sample.mtom.imagetransfer.client.MTOMClient
+start javaw -cp %AXIS2_CLASS_PATH% -Daxis2.repo=%AXIS2_HOME% sample.mtom.imagetransfer.client.MTOMClient
endlocal
:end
Modified: webservices/axis2/trunk/java/modules/samples/script/mtomSample/run.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/mtomSample/run.sh?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/mtomSample/run.sh (original)
+++ webservices/axis2/trunk/java/modules/samples/script/mtomSample/run.sh Thu Apr 6 01:42:42 2006
@@ -9,5 +9,5 @@
export AXIS2_CLASSPATH
echo classpath: $AXIS2_CLASSPATH
-java -classpath $AXIS2_CLASSPATH -Daxis2.home=$AXIS2_HOME sample.mtom.imagetransfer.client.MTOMClient &
+java -classpath $AXIS2_CLASSPATH -Daxis2.repo=$AXIS2_HOME sample.mtom.imagetransfer.client.MTOMClient &
Modified: webservices/axis2/trunk/java/modules/samples/script/userguide/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/script/userguide/build.xml?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/script/userguide/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/script/userguide/build.xml Thu Apr 6 01:42:42 2006
@@ -17,38 +17,38 @@
<target name="testEchoBlockingClient">
<java classname="userguide.clients.EchoBlockingClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testEchoBlockingDualClient">
<java classname="userguide.clients.EchoBlockingDualClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testEchoNonBlockingDualClient">
<java classname="userguide.clients.EchoNonBlockingDualClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testPingClient">
<java classname="userguide.clients.PingClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testWebServiceWithModuleClient">
<java classname="userguide.clients.ClientForWebServiceWithModule"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
<target name="testEchoNonBlockingClient">
<java classname="userguide.clients.EchoNonBlockingClient"
classpathref="axis.classpath" fork="true">
- <jvmarg value="-Daxis2.home=${mainDir}"/>
+ <jvmarg value="-Daxis2.repo=${mainDir}"/>
</java>
</target>
</project>
Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java Thu Apr 6 01:42:42 2006
@@ -1,10 +1,13 @@
package org.apache.axis2.oasis.ping;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.AxisFault;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
+import org.apache.wsdl.WSDLConstants;
import org.xmlsoap.ping.PingDocument;
import org.xmlsoap.ping.PingResponse;
import org.xmlsoap.ping.PingResponseDocument;
@@ -18,8 +21,8 @@
private MessageContext mc;
- public void init(MessageContext mc) {
- this.mc = mc;
+ public void setOperationContext(OperationContext oc) throws AxisFault {
+ mc = oc.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
}
/**
Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java?rev=391936&r1=391935&r2=391936&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java Thu Apr 6 01:42:42 2006
@@ -53,7 +53,7 @@
PingPortStub stub = new PingPortStub(
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- clientRepo, null), url);
+ clientRepo, clientRepo +"/conf/axis2.xml"), url);
//Enable MTOM to those scenarios where they are configured using:
//<optimizeParts>xpathExpression</optimizeParts>
@@ -83,7 +83,7 @@
pingDoc.setPing(ping);
PingPortStub stub = new PingPortStub(
- ConfigurationContextFactory.createConfigurationContextFromFileSystem(clientRepo, null), url);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(clientRepo, clientRepo +"/conf/axis2.xml"), url);
//Enable MTOM to those scenarios where they are configured using:
//<optimizeParts>xpathExpression</optimizeParts>