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 di...@apache.org on 2005/12/23 18:17:24 UTC
svn commit: r358838 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/template/java/ core/src/org/apache/axis2/
core/src/org/apache/axis2/client/ core/src/org/apache/axis2/context/
core/src/org/apache/axis2/deployment/ core/...
Author: dims
Date: Fri Dec 23 09:17:09 2005
New Revision: 358838
URL: http://svn.apache.org/viewcvs?rev=358838&view=rev
Log:
- consolidate the AXIS2 home lookup to one location (static method getAxis2HomeDirectory in AxisConfiguration)
- don't use tmpdir use user.home, long running servers may get whacked by cron jobs that clean tmp directory
- change _SCOPE suffix to prefix.
- collapse buildClientConfigurationContext into buildConfigurationContext
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SessionUtils.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java
webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Fri Dec 23 09:17:09 2005
@@ -56,7 +56,7 @@
*/
public <xsl:value-of select="@name"/>(String axis2Home,String targetEndpoint) throws java.lang.Exception {
//creating the configuration
- _configurationContext = new org.apache.axis2.context.ConfigurationContextFactory().buildClientConfigurationContext(axis2Home);
+ _configurationContext = new org.apache.axis2.context.ConfigurationContextFactory().buildConfigurationContext(axis2Home);
_configurationContext.getAxisConfiguration().addService(_service);
_serviceContext =new org.apache.axis2.context.ServiceGroupContext(_configurationContext, _service.getParent()).getServiceContext(_service);
_clientOptions.setTo(new org.apache.axis2.addressing.EndpointReference(targetEndpoint));
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Fri Dec 23 09:17:09 2005
@@ -70,12 +70,13 @@
/**
* Field APPLICATION_SCOPE
*/
- public static final String APPLICATION_SCOPE = "application";
- public static final String SOAP_SESSION_SCOPE = "soapsession";
- public static final String TRANSPORT_SESSION_SCOPE = "transportsession";
- public static final String REQUEST_SCOPE = "request";
+ public static final String SCOPE_APPLICATION = "application";
+ public static final String SCOPES_SOAP_SESSION = "soapsession";
+ public static final String SCOPE_TRANSPORT_SESSION = "transportsession";
+ public static final String SCOPE_REQUEST = "request";
- public static final String AXIS2_HOME = "axis2home";
+ public static final String HOME_AXIS2 = "axis2.home";
+ public static final String HOME_USER = "user.home";
/**
* Field TRANSPORT_TCP
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/InOutMEPClient.java Fri Dec 23 09:17:09 2005
@@ -62,7 +62,7 @@
* <blockquote><pre>
* ConfigurationContextFactory efac = new ConfigurationContextFactory();
* // Replace the null with your client repository if any
- * ConfigurationContext sysContext = efac.buildClientConfigurationContext(null);
+ * ConfigurationContext sysContext = efac.buildConfigurationContext(null);
* // above line "null" may be a file name if you know the client repssitory
* <p/>
* //create new service
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MEPClient.java Fri Dec 23 09:17:09 2005
@@ -133,7 +133,7 @@
*/
protected void assumeServiceContext(String clientHome) throws AxisFault {
ConfigurationContext configurationContext =
- new ConfigurationContextFactory().buildClientConfigurationContext(clientHome);
+ new ConfigurationContextFactory().buildConfigurationContext(clientHome);
AxisService axisService =
configurationContext.getAxisConfiguration().getService(ANONYMOUS_SERVICE);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java Fri Dec 23 09:17:09 2005
@@ -120,7 +120,7 @@
private ConfigurationContext createDefaultConfigurationContext()
throws AxisFault {
return new ConfigurationContextFactory()
- .buildClientConfigurationContext(null);
+ .buildConfigurationContext(null);
}
/**
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/WSDLMEPClientBuilder.java Fri Dec 23 09:17:09 2005
@@ -54,7 +54,7 @@
public WSDLMEPClientBuilder(String clienthome) throws AxisFault {
try {
configurationContext =
- new ConfigurationContextFactory().buildClientConfigurationContext(clienthome);
+ new ConfigurationContextFactory().buildConfigurationContext(clienthome);
} catch (DeploymentException e) {
throw new AxisFault(e);
}
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=358838&r1=358837&r2=358838&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 Fri Dec 23 09:17:09 2005
@@ -116,10 +116,10 @@
* service group context
*/
String maxScope = SessionUtils.calculateMaxScopeForServiceGroup(serviceGroupContext.getDescription());
- if (Constants.APPLICATION_SCOPE.equals(maxScope)) {
+ if (Constants.SCOPE_APPLICATION.equals(maxScope)) {
//todo : needed to add to two tables
registerServiceGroupContext(serviceGroupContext);
- } else if (Constants.SOAP_SESSION_SCOPE.equals(maxScope)) {
+ } else if (Constants.SCOPES_SOAP_SESSION.equals(maxScope)) {
//todo : needed to add to two tables
registerServiceGroupContext(serviceGroupContext);
} else {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContextFactory.java Fri Dec 23 09:17:09 2005
@@ -43,24 +43,7 @@
}
/**
- * Builds the configuration for the client.
- *
- * @param axis2home the value can be null and resolves to the default axis2.xml file
- * @return Returns ConfigurationContext.
- * @throws DeploymentException
- */
- public ConfigurationContext buildClientConfigurationContext(String axis2home) throws AxisFault {
- if (axis2home == null) {
- // if user has set the axis2 home variable try to get that from System properties
- axis2home = System.getProperty(Constants.AXIS2_HOME);
- }
- AxisConfigurationCreator repoBasedConfigCreator =
- new FileSystemConfigurationCreator(axis2home, false);
- return getConfigurationContext(repoBasedConfigCreator);
- }
-
- /**
- * Builds the configuration for the Server.
+ * Builds the configuration
*
* @param repositoryName
* @return Returns the built ConfigurationContext.
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Fri Dec 23 09:17:09 2005
@@ -75,7 +75,7 @@
String PROPERTY_TEMP_DIR = "java.io.tmpdir";
String DIRECTORY_MODULES = "modules";
- String DIRECTORY_AXIS2_HOME = ".axis2home";
+ String DIRECTORY_AXIS2_HOME = ".axis2";
String RESOURCE_MODULES = "modules/";
String SUFFIX_MAR = ".mar";
String SUFFIX_JAR = ".jar";
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurationCreator.java Fri Dec 23 09:17:09 2005
@@ -37,6 +37,9 @@
* @param isServer
*/
public FileSystemConfigurationCreator(String repoLocation, boolean isServer) {
+ if (repoLocation == null) {
+ repoLocation = AxisConfiguration.getAxis2HomeDirectory();
+ }
this.repoLocation = repoLocation;
this.isServer = isServer;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Fri Dec 23 09:17:09 2005
@@ -91,7 +91,7 @@
this.operationsAliasesMap = new HashMap();
moduleConfigmap = new HashMap();
//by dafault service scop is TranportSession
- scope = Constants.TRANSPORT_SESSION_SCOPE;
+ scope = Constants.SCOPE_TRANSPORT_SESSION;
messageReceivers = new HashMap();
}
@@ -626,10 +626,10 @@
}
public void setScope(String scope) {
- if (Constants.APPLICATION_SCOPE.equals(scope) ||
- Constants.TRANSPORT_SESSION_SCOPE.equals(scope) ||
- Constants.SOAP_SESSION_SCOPE.equals(scope) ||
- Constants.REQUEST_SCOPE.equals(scope)) {
+ if (Constants.SCOPE_APPLICATION.equals(scope) ||
+ Constants.SCOPE_TRANSPORT_SESSION.equals(scope) ||
+ Constants.SCOPES_SOAP_SESSION.equals(scope) ||
+ Constants.SCOPE_REQUEST.equals(scope)) {
this.scope = scope;
}
}
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=358838&r1=358837&r2=358838&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 Fri Dec 23 09:17:09 2005
@@ -18,7 +18,9 @@
package org.apache.axis2.engine;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.deployment.DeploymentEngine;
+import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.description.*;
@@ -552,5 +554,17 @@
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.HOME_AXIS2);
+ if(axis2home == null) {
+ axis2home = System.getProperty(Constants.HOME_USER);
+ if(axis2home != null){
+ axis2home = axis2home + '/' + DeploymentConstants.DIRECTORY_AXIS2_HOME;
+ }
+ }
+ return axis2home;
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java Fri Dec 23 09:17:09 2005
@@ -108,7 +108,7 @@
}
String scope = service.getScope();
- if (Constants.TRANSPORT_SESSION_SCOPE.equals(scope)) {
+ if (Constants.SCOPE_TRANSPORT_SESSION.equals(scope)) {
ServiceContext sreviceContext = sessionContext.getServiceContext(service);
//found the serviceContext from session context , so adding that into msgContext
if (sreviceContext != null) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SessionUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SessionUtils.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SessionUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/SessionUtils.java Fri Dec 23 09:17:09 2005
@@ -50,13 +50,13 @@
* @return integer
*/
private static int getScopeIntValue(String scope) {
- if (Constants.REQUEST_SCOPE.equals(scope)) {
+ if (Constants.SCOPE_REQUEST.equals(scope)) {
return 1;
- } else if (Constants.TRANSPORT_SESSION_SCOPE.equals(scope)) {
+ } else if (Constants.SCOPE_TRANSPORT_SESSION.equals(scope)) {
return 2;
- } else if (Constants.SOAP_SESSION_SCOPE.equals(scope)) {
+ } else if (Constants.SCOPES_SOAP_SESSION.equals(scope)) {
return 3;
- } else if (Constants.APPLICATION_SCOPE.equals(scope)) {
+ } else if (Constants.SCOPE_APPLICATION.equals(scope)) {
return 4;
} else {
return 2;
@@ -72,19 +72,19 @@
private static String getScopeString(int scope) {
switch (scope) {
case 1 : {
- return Constants.REQUEST_SCOPE;
+ return Constants.SCOPE_REQUEST;
}
case 2 : {
- return Constants.TRANSPORT_SESSION_SCOPE;
+ return Constants.SCOPE_TRANSPORT_SESSION;
}
case 3 : {
- return Constants.SOAP_SESSION_SCOPE;
+ return Constants.SCOPES_SOAP_SESSION;
}
case 4 : {
- return Constants.APPLICATION_SCOPE;
+ return Constants.SCOPE_APPLICATION;
}
default : {
- return Constants.TRANSPORT_SESSION_SCOPE;
+ return Constants.SCOPE_TRANSPORT_SESSION;
}
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java Fri Dec 23 09:17:09 2005
@@ -87,7 +87,7 @@
// MessageSender sender = new MessageSender("target/test-resources/integrationRepo");
ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.buildClientConfigurationContext("target/test-resources/integrationRepo");
+ factory.buildConfigurationContext("target/test-resources/integrationRepo");
ServiceClient sender = new ServiceClient(configContext);
Options options = new Options();
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=358838&r1=358837&r2=358838&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 Fri Dec 23 09:17:09 2005
@@ -130,7 +130,7 @@
ConfigurationContextFactory efac = new ConfigurationContextFactory();
ConfigurationContext configContext = efac
- .buildClientConfigurationContext("target/test-resources/integrationRepo");
+ .buildConfigurationContext("target/test-resources/integrationRepo");
ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
configContext.getAxisConfiguration());
configContext.getAxisConfiguration().addModule(moduleDesc);
@@ -150,7 +150,7 @@
ConfigurationContextFactory efac = new ConfigurationContextFactory();
ConfigurationContext configContext = efac
- .buildClientConfigurationContext(clientHome);
+ .buildConfigurationContext(clientHome);
ModuleDescription moduleDesc = deploymentEngine.buildModule(file,
configContext.getAxisConfiguration());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java Fri Dec 23 09:17:09 2005
@@ -206,7 +206,7 @@
public void testEchoXMLSyncMC() throws Exception {
ConfigurationContextFactory confac = new ConfigurationContextFactory();
- ConfigurationContext configContext = confac.buildClientConfigurationContext(Constants.TESTING_REPOSITORY);
+ ConfigurationContext configContext = confac.buildConfigurationContext(Constants.TESTING_REPOSITORY);
AxisOperation opdesc = new OutInAxisOperation(new QName("echoOMElement"));
org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(Constants.TESTING_REPOSITORY);
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=358838&r1=358837&r2=358838&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 Fri Dec 23 09:17:09 2005
@@ -208,7 +208,7 @@
public void testEchoXMLSyncMC() throws Exception {
ConfigurationContextFactory confac = new ConfigurationContextFactory();
- ConfigurationContext configContext = confac.buildClientConfigurationContext(Constants.TESTING_REPOSITORY);
+ ConfigurationContext configContext = confac.buildConfigurationContext(Constants.TESTING_REPOSITORY);
AxisOperation opdesc = new OutInAxisOperation(new QName("echoOMElement"));
org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(Constants.TESTING_REPOSITORY);
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java Fri Dec 23 09:17:09 2005
@@ -118,7 +118,7 @@
ConfigurationContextFactory fac = new ConfigurationContextFactory();
ConfigurationContext configContext = null;
try {
- configContext = fac.buildClientConfigurationContext("Search");
+ configContext = fac.buildConfigurationContext("Search");
} catch (DeploymentException e) {
e.printStackTrace();
}
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java?rev=358838&r1=358837&r2=358838&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java Fri Dec 23 09:17:09 2005
@@ -117,7 +117,7 @@
getOMElement(omFactory, defNs, "oe", "xsd:string", "latin1"));
ConfigurationContextFactory fac = new ConfigurationContextFactory();
- ConfigurationContext configContext = fac.buildClientConfigurationContext(
+ ConfigurationContext configContext = fac.buildConfigurationContext(
"doGoogleSearch");
msgContext = new MessageContext(configContext);
msgContext.setEnvelope(envelope);