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/01/18 09:35:54 UTC
svn commit: r370078 [1/2] - in /webservices/axis2/trunk/java/modules:
addressing/test/org/apache/axis2/handlers/addressing/
codegen/src/org/apache/axis2/wsdl/template/java/
codegen/test/org/apache/axis2/rpc/ core/src/org/apache/axis2/client/
core/src/o...
Author: deepal
Date: Wed Jan 18 00:33:24 2006
New Revision: 370078
URL: http://svn.apache.org/viewcvs?rev=370078&view=rev
Log:
- convert ConfigurationContextFactory into real factory , so now no need to create an instance of the factory and call its method. Now all the methods are static.
-fixed some typos
-removed default_axis2.xml and added axis2_default.xml
Added:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml
Removed:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/default_axis2.xml
Modified:
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.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/ConfigurationContextFactory.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.wsdl
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java
webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/server/SimpleServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLMultipleTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/OneWayRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceCreateTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceDispatchingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/ServiceGroupContextTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
webservices/axis2/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java
webservices/axis2/trunk/java/modules/samples/src/sample/security/Client.java
webservices/axis2/trunk/java/modules/samples/src/userguide/clients/ClientSideModuleEngagement.java
webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingModuleTest.java Wed Jan 18 00:33:24 2006
@@ -35,8 +35,7 @@
}
public void testExtractAddressingInformationFromHeaders() throws AxisFault {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration er = builder.createConfigurationContextFromFileSystem("target", null)
+ AxisConfiguration er = ConfigurationContextFactory.createConfigurationContextFromFileSystem("target", null)
.getAxisConfiguration();
File file = new File("target/addressing.mar");
assertTrue(file.exists());
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=370078&r1=370077&r2=370078&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 Wed Jan 18 00:33:24 2006
@@ -91,7 +91,7 @@
* Constructor taking the traget endpoint
*/
public <xsl:value-of select="@name"/>(String targetEndpoint) throws java.lang.Exception {
- this(new org.apache.axis2.context.ConfigurationContextFactory().createConfigurationContextFromFileSystem(AXIS2_HOME,null),
+ this(org.apache.axis2.context.ConfigurationContextFactory.createConfigurationContextFromFileSystem(AXIS2_HOME,null),
targetEndpoint);
}
Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/rpc/SimpleTest.java Wed Jan 18 00:33:24 2006
@@ -168,7 +168,7 @@
public void testRPC() throws Exception {
// Call call = new Call("test-resources/xmls");
- ConfigurationContext configcontext = new ConfigurationContextFactory()
+ ConfigurationContext configcontext = ConfigurationContextFactory
.createConfigurationContextFromFileSystem("test-resources/xmls",
"test-resources/xmls/axis2.xml");
ServiceClient client = new ServiceClient(configcontext, null);
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=370078&r1=370077&r2=370078&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 Wed Jan 18 00:33:24 2006
@@ -129,7 +129,7 @@
*/
protected void assumeServiceContext(String clientHome) throws AxisFault {
ConfigurationContext configurationContext =
- new ConfigurationContextFactory().createConfigurationContextFromFileSystem(clientHome, null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(clientHome, null);
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=370078&r1=370077&r2=370078&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 Wed Jan 18 00:33:24 2006
@@ -75,8 +75,7 @@
AxisService axisService) throws AxisFault {
// create a config context if needed
this.configContext = (configContext != null) ? configContext
- : new ConfigurationContextFactory()
- .createConfigurationContextFromFileSystem(null, null);
+ : ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
// save the axisConfig and service
this.axisConfig = this.configContext.getAxisConfiguration();
@@ -114,8 +113,7 @@
QName wsdlServiceName, String portName) throws AxisFault {
// create a config context if needed
this.configContext = (configContext != null) ? configContext
- : new ConfigurationContextFactory()
- .createConfigurationContextFromFileSystem(null, null);
+ : ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, null);
try {
this.axisConfig = this.configContext.getAxisConfiguration();
axisService = ClientUtils.creatAxisService(wsdlURL, wsdlServiceName, portName, options);
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=370078&r1=370077&r2=370078&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 Wed Jan 18 00:33:24 2006
@@ -47,7 +47,7 @@
public WSDLMEPClientBuilder(String clienthome) throws AxisFault {
try {
configurationContext =
- new ConfigurationContextFactory().
+ ConfigurationContextFactory.
createConfigurationContextFromFileSystem(clienthome,null);
} catch (DeploymentException e) {
throw new AxisFault(e);
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=370078&r1=370077&r2=370078&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 Wed Jan 18 00:33:24 2006
@@ -13,7 +13,6 @@
import org.apache.axis2.phaseresolver.PhaseResolver;
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.TransportSender;
-import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.util.Collection;
@@ -22,8 +21,6 @@
public class ConfigurationContextFactory {
- private Log log = LogFactory.getLog(getClass());
-
/**
* Creates a AxisConfiguration depending on the user requirment.
* First creates an AxisConfigurator object with appropriate parameters.
@@ -34,7 +31,7 @@
* @return Returns ConfigurationContext.
* @throws AxisFault
*/
- public ConfigurationContext createConfigurationContext(
+ public static ConfigurationContext createConfigurationContext(
AxisConfigurator axisConfigurator) throws AxisFault {
AxisConfiguration axisConfig = axisConfigurator.getAxisConfiguration();
ConfigurationContext configContext = new ConfigurationContext(axisConfig);
@@ -50,8 +47,8 @@
* @return Returns the built ConfigurationContext.
* @throws DeploymentException
*/
- public ConfigurationContext createConfigurationContextFromFileSystem(String path,
- String axis2xml) throws AxisFault {
+ public static ConfigurationContext createConfigurationContextFromFileSystem(String path,
+ String axis2xml) throws AxisFault {
return createConfigurationContext(new FileSystemConfigurator(path, axis2xml));
}
@@ -59,7 +56,7 @@
* Initializes modules and creates Transports.
*/
- private void init(ConfigurationContext configContext) throws AxisFault {
+ private static void init(ConfigurationContext configContext) throws AxisFault {
try {
PhaseResolver phaseResolver = new PhaseResolver(configContext.getAxisConfiguration());
@@ -80,7 +77,7 @@
* @param context
* @throws DeploymentException
*/
- private void initModules(ConfigurationContext context) throws DeploymentException {
+ private static void initModules(ConfigurationContext context) throws DeploymentException {
try {
HashMap modules = context.getAxisConfiguration().getModules();
Collection col = modules.values();
@@ -103,7 +100,7 @@
*
* @param configContext
*/
- public void initTransports(ConfigurationContext configContext) {
+ public static void initTransports(ConfigurationContext configContext) {
AxisConfiguration axisConf = configContext.getAxisConfiguration();
// Initialize Transport Ins
@@ -118,8 +115,9 @@
try {
listener.init(configContext, transportIn);
} catch (AxisFault axisFault) {
- log.info("Transport-IN initialization error : "
- + transportIn.getName().getLocalPart());
+ LogFactory.getLog(ConfigurationContextFactory.class)
+ .info("Transport-IN initialization error : "
+ + transportIn.getName().getLocalPart());
}
}
}
@@ -137,8 +135,9 @@
try {
sender.init(configContext, transportOut);
} catch (AxisFault axisFault) {
- log.info("Transport-OUT initialization error : "
- + transportOut.getName().getLocalPart());
+ LogFactory.getLog(ConfigurationContextFactory.class)
+ .info("Transport-OUT initialization error : "
+ + transportOut.getName().getLocalPart());
}
}
}
@@ -149,7 +148,7 @@
*
* @return Returns ConfigurationContext.
*/
- public ConfigurationContext createEmptyConfigurationContext() {
+ public static ConfigurationContext createEmptyConfigurationContext() {
return new ConfigurationContext(new AxisConfiguration());
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java Wed Jan 18 00:33:24 2006
@@ -138,8 +138,7 @@
public AxisService getAxisService(Definition wsdlDefinition)
throws DeploymentException {
- logger
- .debug("Entering AxisServiceBuilder:getAxisService(javax.wsdl.Definition)");
+ logger.debug("Entering AxisServiceBuilder:getAxisService(javax.wsdl.Definition)");
AxisService axisService = new AxisService();
axisService.setWSDLDefinition(wsdlDefinition);
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=370078&r1=370077&r2=370078&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 Wed Jan 18 00:33:24 2006
@@ -87,7 +87,7 @@
* Resource that contains the configuration.
*/
String AXIS2_CONFIGURATION_RESOURCE =
- "org/apache/axis2/deployment/default_axis2.xml";
+ "org/apache/axis2/deployment/axis2_default.xml";
String AXIS2_REPO = "repository";
String AXIS2_CONFIGURATION_XML = "axis2.xml";
String DIRECTORY_SERVICES = "services";
Added: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml?rev=370078&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml (added)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2_default.xml Wed Jan 18 00:33:24 2006
@@ -0,0 +1,165 @@
+<axisconfig name="AxisJava2.0">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment" locked="false">true</parameter>
+ <parameter name="hotupdate" locked="false">false</parameter>
+ <parameter name="enableMTOM" locked="false">true</parameter>
+ <!-- Uncomment this to enable REST support -->
+ <!-- <parameter name="enableREST" locked="false">true</parameter>-->
+
+
+ <parameter name="userName" locked="false">admin</parameter>
+ <parameter name="password" locked="false">axis2</parameter>
+
+ <parameter name="seralizeLocation" locked="false">.</parameter>
+ <hostConfiguration>
+ <ip>127.0.0.1</ip>
+ <port>5555</port>
+ </hostConfiguration>
+
+
+ <!--if you want to extract the service archive file and work with that please uncomment this-->
+ <!--else , it wont extract archive file or does not take into consideration if someone drop-->
+ <!--exploded directory into /service directory-->
+ <!--<parameter name="extractServiceArchive" locked="false">true</parameter>-->
+
+
+ <!-- The way of adding listener to the system-->
+ <!-- <listener class="org.apache.axis2.ObserverIMPL">-->
+ <!-- <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+ <!-- </listener>-->
+
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
+ <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+ <!--any operation -->
+ <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+ class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+ class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </messageReceivers>
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="false">6060</parameter>
+ </transportReceiver>
+
+ <transportReceiver name="jms" class="org.apache.axis2.transport.jms.SimpleJMSListener">
+ <parameter name="transport.jms.Destination" locked="false">dynamicQueues/FOO</parameter>
+ <parameter name="java.naming.factory.initial" locked="false">
+ org.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="jms" class="org.apache.axis2.transport.jms.JMSSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ </transportSender>
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+ </transportSender>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ </transportSender>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
+ <!-- Comment this to disable Addressing -->
+ <!--<module ref="addressing"/>-->
+
+
+ <!--Configuring module , providing parameters for modules whether they refer or not-->
+ <!--<moduleConfig name="addressing">-->
+ <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+ <!--</moduleConfig>-->
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="inflow">
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="outflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+ <phaseOrder type="INfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="Outfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+</axisconfig>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Wed Jan 18 00:33:24 2006
@@ -207,8 +207,8 @@
try {
ServletContext context = config.getServletContext();
String repoDir = context.getRealPath("/WEB-INF");
- ConfigurationContextFactory erfac = new ConfigurationContextFactory();
- ConfigurationContext configContext = erfac.createConfigurationContextFromFileSystem(repoDir, null);
+ ConfigurationContext configContext =
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoDir, null);
configContext.setProperty(Constants.CONTAINER_MANAGED, Constants.VALUE_TRUE);
configContext.setRootDir(new File(context.getRealPath("/WEB-INF")));
return configContext;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Wed Jan 18 00:33:24 2006
@@ -121,9 +121,7 @@
public SimpleHTTPServer(String repoPath, String axis2xml, int port, ThreadFactory pool) throws AxisFault {
try {
this.port = port;
-
- ConfigurationContextFactory erfac = new ConfigurationContextFactory();
- this.configurationContext = erfac.createConfigurationContextFromFileSystem(repoPath,
+ this.configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,
axis2xml);
// If a thread pool is not passed the thread pool from the config context
@@ -253,7 +251,7 @@
* @see org.apache.axis2.transport.TransportListener#getReplyToEPR(String)
*/
public EndpointReference getReplyToEPR(String serviceName) throws AxisFault {
- String hostAddress = null;
+ String hostAddress ;
try {
hostAddress = SimpleHttpServerConnection.getIpAddress();
} catch (SocketException e) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/SimpleJMSListener.java Wed Jan 18 00:33:24 2006
@@ -68,12 +68,11 @@
String destination, String username, String password,
boolean doThreads)
throws Exception {
- ConfigurationContextFactory erfac = new ConfigurationContextFactory();
//TODO : modify this constructor to take locatiom of axis2.xml
File repo = new File(repositoryDirectory);
if (repo.exists()) {
File axis2xml = new File(repo, "axis2.xml");
- this.configurationContext = erfac.createConfigurationContextFromFileSystem(
+ this.configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(
repositoryDirectory, axis2xml.getName());
} else {
throw new Exception("repository not found");
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java Wed Jan 18 00:33:24 2006
@@ -84,12 +84,10 @@
this.password = password;
try {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
-
File repo = new File(dir);
if (repo.exists()) {
File axis2xml = new File(repo, "axis2.xml");
- this.configurationContext = builder.createConfigurationContextFromFileSystem(
+ this.configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(
dir, axis2xml.getName());
} else {
throw new Exception("repository not found");
@@ -149,12 +147,11 @@
log.info("java SimpleMailListener <repository>");
} else {
String dir = args[0];
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
ConfigurationContext configurationContext;
File repo = new File(dir);
if (repo.exists()) {
File axis2xml = new File(repo, "axis2.xml");
- configurationContext = builder.createConfigurationContextFromFileSystem(
+ configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(
dir, axis2xml.getName());
} else {
throw new AxisFault("repository not found");
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java Wed Jan 18 00:33:24 2006
@@ -47,9 +47,7 @@
public MailServer(String dir, int popPort, int smtpPort) throws AxisFault {
try {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
-
- configurationContext = builder.createConfigurationContextFromFileSystem(dir, null);
+ configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(dir, null);
} catch (Exception e) {
log.error(e);
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java Wed Jan 18 00:33:24 2006
@@ -59,9 +59,7 @@
public TCPServer(int port, String dir) throws AxisFault {
try {
- ConfigurationContextFactory erfac = new ConfigurationContextFactory();
-
- this.configContext = erfac.createConfigurationContextFromFileSystem(dir, null);
+ this.configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(dir, null);
Thread.sleep(3000);
serversocket = new ServerSocket(port);
} catch (DeploymentException e1) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Wed Jan 18 00:33:24 2006
@@ -228,9 +228,7 @@
public static ConfigurationContext getNewConfigurationContext(String repositry)
throws Exception {
- ConfigurationContextFactory erfac = new ConfigurationContextFactory();
File file = new File(repositry);
-
if (!file.exists()) {
throw new Exception("repository directory " + file.getAbsolutePath()
+ " does not exists");
@@ -240,7 +238,7 @@
if(axis2xml.exists()){
axis2xmlString = axis2xml.getName();
}
- return erfac.createConfigurationContextFromFileSystem(file.getAbsolutePath(),axis2xmlString);
+ return ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(),axis2xmlString);
}
public static String getParameterValue(Parameter param) {
Modified: webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.wsdl?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.wsdl (original)
+++ webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.wsdl Wed Jan 18 00:33:24 2006
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://services.axis.apache.org" xmlns:impl="http://services.axis.apache.org-impl" xmlns:intf="http://services.axis.apache.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions targetNamespace="http://services.axis.apache.org"
+ xmlns:impl="http://services.axis.apache.org-impl"
+ xmlns:intf="http://services.axis.apache.org"
+ xmlns:apachesoap="http://xml.apache.org/xml-soap"
+ xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<!--WSDL created by Apache Axis version: 1.2.1
Built on Jun 14, 2005 (09:15:57 EDT)-->
@@ -22,6 +28,7 @@
</wsdl:operation>
</wsdl:portType>
+
<wsdl:binding name="localhost:8080SoapBinding" type="intf:OutService">
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AddingObserverTest.java Wed Jan 18 00:33:24 2006
@@ -27,8 +27,7 @@
public void testAddingObservs() throws Exception {
try {
String filename = "./test-resources/deployment/ConfigWithObservers";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er = builder.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml").getAxisConfiguration();
+ er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml").getAxisConfiguration();
assertNotNull(er);
} catch (DeploymentException e) {
throw new DeploymentException(e);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/AxisMessageTest.java Wed Jan 18 00:33:24 2006
@@ -30,8 +30,7 @@
public void testAxisMessage() throws Exception {
String filename = "./test-resources/deployment/AxisMessageTestRepo";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration er = builder.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
+ AxisConfiguration er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, filename + "/axis2.xml")
.getAxisConfiguration();
assertNotNull(er);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BuildERWithDeploymentTest.java Wed Jan 18 00:33:24 2006
@@ -35,8 +35,7 @@
public void testDeployment() {
try {
String filename = "./target/test-resources/deployment";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration er = builder.createConfigurationContextFromFileSystem(filename,null)
+ AxisConfiguration er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename,null)
.getAxisConfiguration();
assertNotNull(er);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java Wed Jan 18 00:33:24 2006
@@ -32,9 +32,7 @@
AxisFault,
XMLStreamException {
String filename = "./target/test-resources/deployment";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er =
- builder.createConfigurationContextFromFileSystem(filename, null)
+ er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename, null)
.getAxisConfiguration();
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/HostCongigurationTest.java Wed Jan 18 00:33:24 2006
@@ -28,8 +28,7 @@
protected void setUp() throws Exception {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(null, xml).getAxisConfiguration();
+ ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, xml).getAxisConfiguration();
}
public void testHostConfig() throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/InvalidServiceTest.java Wed Jan 18 00:33:24 2006
@@ -31,8 +31,7 @@
public void testInvalidService() {
try {
String filename = "./target/test-resources/InvalidDeployment";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er =builder.createConfigurationContextFromFileSystem(filename,null)
+ er =ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename,null)
.getAxisConfiguration();
String msg = (String) er.getFaultyServices().get("invalidService");
if (msg == null || "".equals(msg)) {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModifiedConfigFileTest.java Wed Jan 18 00:33:24 2006
@@ -28,8 +28,7 @@
public void testPhaseOrderchage() {
try {
String filename = "./test-resources/deployment/BadConfigOrderChange/axis2.xml";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er = builder.createConfigurationContextFromFileSystem(null,filename).getAxisConfiguration();
+ er = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null,filename).getAxisConfiguration();
fail(
"this must failed gracefully with DeploymentException \"Invalid System predefined " +
"inphases , phase order does not\" +\n support\\n recheck axis2.xml\"");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ModuleversionTest.java Wed Jan 18 00:33:24 2006
@@ -31,8 +31,7 @@
public void testDefautModuleVersion() throws AxisFault {
String filename = "./test-resources/deployment/moduleVersion/Test1/axis2.xml";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration ac = builder.createConfigurationContextFromFileSystem(null,filename)
+ AxisConfiguration ac = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null,filename)
.getAxisConfiguration();
assertNotNull(ac);
assertEquals(ac.getDefaultModuleVersion("abc"), "1.23");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SameServiceAddingTest.java Wed Jan 18 00:33:24 2006
@@ -34,8 +34,7 @@
public void testServiceGroup() throws AxisFault {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(repo,null).getAxisConfiguration();
+ ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo,null).getAxisConfiguration();
AxisService servie = ar.getService("serevice1");
assertNotNull(servie);
servie = ar.getService("serevice4");
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/ServiceGroupTest.java Wed Jan 18 00:33:24 2006
@@ -29,8 +29,7 @@
protected void setUp() throws Exception {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(repo,null).getAxisConfiguration();
+ ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(repo,null).getAxisConfiguration();
}
public void testServiceGroup() throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/SystemPhasesremovedTest.java Wed Jan 18 00:33:24 2006
@@ -31,9 +31,7 @@
public void testPhaseOrderchage() {
try {
String filename = "./test-resources/deployment/SystemPhaseRemove";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er =
- builder.createConfigurationContextFromFileSystem(filename,filename + "/axis2.xml")
+ er =ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename,filename + "/axis2.xml")
.getAxisConfiguration();
fail(
"this must failed gracefully with DeploymentException \"Invalid System predefined " +
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java Wed Jan 18 00:33:24 2006
@@ -41,8 +41,7 @@
public void testModuleConfigAtAxisConfig() {
try {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(null, axis2xml).getAxisConfiguration();
+ ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, axis2xml).getAxisConfiguration();
ModuleConfiguration moduleConfiguration =
ar.getModuleConfig(new QName("testModule"));
assertNotNull(moduleConfiguration);
@@ -62,8 +61,7 @@
public void testModuleConfigAtService() {
try {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(null, axis2xml).getAxisConfiguration();
+ ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, axis2xml).getAxisConfiguration();
AxisService service = new AxisService();
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java Wed Jan 18 00:33:24 2006
@@ -36,9 +36,7 @@
AxisFault,
XMLStreamException {
String filename = "./target/test-resources/deployment";
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ac =
- builder.createConfigurationContextFromFileSystem(filename,null)
+ ac = ConfigurationContextFactory.createConfigurationContextFromFileSystem(filename,null)
.getAxisConfiguration();
ModuleDescription module = ac.getModule(new QName("module1"));
assertNotNull(module);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterLocked.java Wed Jan 18 00:33:24 2006
@@ -37,8 +37,7 @@
protected void setUp() throws Exception {
- ConfigurationContextFactory builder = new ConfigurationContextFactory();
- ar = builder.createConfigurationContextFromFileSystem(null, repo + "/axis2.xml").getAxisConfiguration();
+ ar = ConfigurationContextFactory.createConfigurationContextFromFileSystem(null, repo + "/axis2.xml").getAxisConfiguration();
}
public void testOveride_Non_locked_Para_Service() {
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java Wed Jan 18 00:33:24 2006
@@ -88,9 +88,8 @@
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestMultipleTest.java Wed Jan 18 00:33:24 2006
@@ -52,9 +52,8 @@
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext,null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/mtom/MTOMEchoTestSingleTest.java Wed Jan 18 00:33:24 2006
@@ -48,9 +48,8 @@
Constants.VALUE_TRUE);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java Wed Jan 18 00:33:24 2006
@@ -56,7 +56,7 @@
options.setSoapAction(soapAction);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
ConfigurationContext configContext =
- new ConfigurationContextFactory().createConfigurationContextFromFileSystem(clientHome,
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(clientHome,
null);
ServiceClient serviceClient = new ServiceClient(configContext, null);
SOAPEnvelope reqEnv = util.getEchoSoapEnvelope();
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java Wed Jan 18 00:33:24 2006
@@ -54,7 +54,7 @@
msgCtx.setEnvelope(requestEnvilope);
ConfigurationContext configContext =
- new ConfigurationContextFactory().createConfigurationContextFromFileSystem(
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(
"target/test-resources/integrationRepo",null);
ServiceClient serviceClient = new ServiceClient(configContext, null);
serviceClient.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round3/SunRound3Client.java Wed Jan 18 00:33:24 2006
@@ -55,7 +55,7 @@
msgCtx.setEnvelope(requestEnvilope);
ConfigurationContext configContext =
- new ConfigurationContextFactory().createConfigurationContextFromFileSystem(
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(
"target/test-resources/integrationRepo",null);
ServiceClient serviceClient = new ServiceClient(configContext, null);
serviceClient.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/complex/EchoBlockingClient.java Wed Jan 18 00:33:24 2006
@@ -43,9 +43,8 @@
//Blocking invocation
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext,null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round4/simple/EchoBlockingClient.java Wed Jan 18 00:33:24 2006
@@ -31,7 +31,7 @@
public OMElement sendMsg(WhitemesaR4ClientUtil util, String soapAction) throws AxisFault {
- OMElement firstchild = null;
+ OMElement firstchild ;
EndpointReference targetEPR = new EndpointReference("http://www.whitemesa.net:80/interop/r4/fault-rpc");
try {
@@ -42,9 +42,8 @@
options.setSoapAction(soapAction);
//Blocking invocation
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/server/SimpleServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/server/SimpleServer.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/server/SimpleServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/soap12testing/server/SimpleServer.java Wed Jan 18 00:33:24 2006
@@ -43,7 +43,7 @@
throw new AxisFault(file.getAbsolutePath() + " File does not exist");
}
SimpleHTTPServer receiver = new SimpleHTTPServer(file.getAbsolutePath(),
- file.getAbsolutePath() + "/axis2xml", port);
+ file.getAbsolutePath() + "/axis2.xml", port);
receiver.start();
} catch (Exception e) {
log.info(e.getMessage());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java Wed Jan 18 00:33:24 2006
@@ -72,9 +72,8 @@
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setTo(targetEPR);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CharactersetEncodingTest.java Wed Jan 18 00:33:24 2006
@@ -44,8 +44,6 @@
private AxisService service;
- private boolean finish = false;
-
public CharactersetEncodingTest(String arg0) {
super(arg0);
}
@@ -87,9 +85,8 @@
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
// OMElement resultElem = call.invokeBlocking(operationName.getLocalPart(), payload);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem(Constants.TESTING_PATH + "chunking-enabledRepository",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(Constants.TESTING_PATH + "chunking-enabledRepository",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java Wed Jan 18 00:33:24 2006
@@ -89,9 +89,8 @@
}
};
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem(Constants.TESTING_PATH + "commons-http-enabledRepository",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(Constants.TESTING_PATH + "commons-http-enabledRepository",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
@@ -113,15 +112,12 @@
}
public void testEchoXMLSync() throws Exception {
- SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
OMElement payload = TestingUtils.createDummyOMElement();
Options options = new Options();
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
-
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem(Constants.TESTING_PATH + "commons-http-enabledRepository",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(Constants.TESTING_PATH + "commons-http-enabledRepository",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java Wed Jan 18 00:33:24 2006
@@ -85,10 +85,8 @@
options.setProperty(HTTPConstants.PROXY, proxyproperties);
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
-
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem(
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(
"target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLChunkedTest.java Wed Jan 18 00:33:24 2006
@@ -104,9 +104,8 @@
Options clientOptions = new Options();
clientOptions.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem(CLIENT_HOME,null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(CLIENT_HOME,null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(clientOptions);
clientOptions.setTo(targetEPR);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java Wed Jan 18 00:33:24 2006
@@ -100,9 +100,8 @@
Options options = new Options();
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
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=370078&r1=370077&r2=370078&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 Wed Jan 18 00:33:24 2006
@@ -95,9 +95,8 @@
finish = true;
}
};
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
@@ -125,9 +124,8 @@
public void testEchoXMLMultipleDuelASync() throws Exception {
OMElement payload = TestingUtils.createDummyOMElement();
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
for (int i = 0; i < 5; i++) {
@@ -174,9 +172,8 @@
Options options = new Options();
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
@@ -196,9 +193,8 @@
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setUseSeparateListener(true);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java Wed Jan 18 00:33:24 2006
@@ -96,9 +96,8 @@
}
};
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
options.setTo(targetEPR);
@@ -123,9 +122,8 @@
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
@@ -142,9 +140,8 @@
options.setTo(targetEPR);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java Wed Jan 18 00:33:24 2006
@@ -160,9 +160,8 @@
Options options = new Options();
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setTo(targetEPR);
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
sender.setOptions(options);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=370078&r1=370077&r2=370078&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java Wed Jan 18 00:33:24 2006
@@ -96,9 +96,8 @@
public void testEchoXMLSync() throws Exception {
OMElement payload = createEnvelope();
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
Options options = new Options();
sender.setOptions(options);
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=370078&r1=370077&r2=370078&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 Wed Jan 18 00:33:24 2006
@@ -75,9 +75,8 @@
OMElement payload = TestingUtils.createDummyOMElement();
- ConfigurationContextFactory factory = new ConfigurationContextFactory();
ConfigurationContext configContext =
- factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
ServiceClient sender = new ServiceClient(configContext, null);
Options options = new Options();