You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by he...@apache.org on 2005/05/25 08:37:27 UTC
svn commit: r178390 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/
core/src/org/apache/axis/engine/ core/src/org/apache/axis/transport/http/
core/src/org/apache/axis/transport/mail/
core/src/org/apache/axis/transport/tcp/
core/test/org/apache/axis/deployment/ core/test/org/apache/axis/engine/
samples/test/org/apache/axis/engine/
samples/test/org/apache/axis/integration/
Author: hemapani
Date: Tue May 24 23:37:26 2005
New Revision: 178390
URL: http://svn.apache.org/viewcvs?rev=178390&view=rev
Log:
refactoring the XXEngineXX -> XXCOnfigurationXX
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContextFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java Tue May 24 23:37:26 2005
@@ -112,7 +112,7 @@
//create new service
QName assumedServiceName = new QName("AnonnoymousService");
ServiceDescription axisService = new ServiceDescription(assumedServiceName);
- sysContext.getEngineConfig().addService(axisService);
+ sysContext.getAxisConfiguration().addService(axisService);
ServiceContext service = sysContext.createServiceContext(assumedServiceName);
return service;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOnlyMEPClient.java Tue May 24 23:37:26 2005
@@ -54,11 +54,11 @@
}
TransportInDescription transportIn =
- syscontext.getEngineConfig().getTransportIn(new QName(senderTransport));
+ syscontext.getAxisConfiguration().getTransportIn(new QName(senderTransport));
msgctx.setTransportIn(transportIn);
ConfigurationContext sysContext = serviceContext.getEngineContext();
- AxisConfiguration registry = sysContext.getEngineConfig();
+ AxisConfiguration registry = sysContext.getAxisConfiguration();
AxisEngine engine = new AxisEngine(sysContext);
msgctx.setOperationContext(axisop.findOperationContext(msgctx,serviceContext,false));
@@ -137,7 +137,7 @@
}
public void engageModule(QName name) throws AxisFault{
- serviceContext.getEngineContext().getEngineConfig().engageModule(name);
+ serviceContext.getEngineContext().getAxisConfiguration().engageModule(name);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java Tue May 24 23:37:26 2005
@@ -149,7 +149,7 @@
checkTransport(msgctx);
ConfigurationContext sysContext = serviceContext.getEngineContext();
- AxisConfiguration registry = sysContext.getEngineConfig();
+ AxisConfiguration registry = sysContext.getAxisConfiguration();
msgctx.setOperationContext(
OperationContextFactory.createMEPContext(
@@ -362,7 +362,7 @@
if (msgctx.getTransportIn() == null) {
final TransportInDescription transportIn =
- serviceContext.getEngineContext().getEngineConfig().getTransportIn(
+ serviceContext.getEngineContext().getAxisConfiguration().getTransportIn(
new QName(senderTransport));
if (transportIn != null) {
msgctx.setTransportIn(transportIn);
@@ -373,7 +373,7 @@
}
if (msgctx.getTransportOut() == null) {
final TransportOutDescription transportOut =
- serviceContext.getEngineContext().getEngineConfig().getTransportOut(
+ serviceContext.getEngineContext().getAxisConfiguration().getTransportOut(
new QName(listenerTransport));
if (transportOut != null) {
msgctx.setTransportOut(transportOut);
@@ -400,7 +400,7 @@
}
public void engageModule(QName moduleName) throws AxisFault {
- serviceContext.getEngineContext().getEngineConfig().engageModule(moduleName);
+ serviceContext.getEngineContext().getAxisConfiguration().engageModule(moduleName);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContext.java Tue May 24 23:37:26 2005
@@ -30,7 +30,7 @@
public class ConfigurationContext extends AbstractContext{
- private AxisConfiguration engineConfig;
+ private AxisConfiguration axisConfiguration;
private AxisStorage storage;
private Map sessionContextMap;
@@ -46,7 +46,7 @@
public ConfigurationContext(AxisConfiguration registry) {
super(null);
- this.engineConfig = registry;
+ this.axisConfiguration = registry;
serviceContextMap = new HashMap();
moduleContextMap = new HashMap();
sessionContextMap = new HashMap();
@@ -70,15 +70,15 @@
/**
* @return
*/
- public AxisConfiguration getEngineConfig() {
- return engineConfig;
+ public AxisConfiguration getAxisConfiguration() {
+ return axisConfiguration;
}
/**
* @param configuration
*/
- public void setEngineConfig(AxisConfiguration configuration) {
- engineConfig = configuration;
+ public void setAxisConfiguration(AxisConfiguration configuration) {
+ axisConfiguration = configuration;
}
public void registerOperationContext(String messageID, OperationContext mepContext) {
@@ -110,7 +110,7 @@
}
public ServiceContext createServiceContext(QName serviceName) throws AxisFault {
- ServiceDescription service = engineConfig.getService(serviceName);
+ ServiceDescription service = axisConfiguration.getService(serviceName);
if(service != null){
ServiceContext serviceContext = new ServiceContext(service, this);
return serviceContext;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContextFactory.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/ConfigurationContextFactory.java Tue May 24 23:37:26 2005
@@ -68,13 +68,13 @@
private void initModules(ConfigurationContext context) throws DeploymentException {
try {
- HashMap modules = ((AxisConfigurationImpl) context.getEngineConfig()).getModules();
+ HashMap modules = ((AxisConfigurationImpl) context.getAxisConfiguration()).getModules();
Collection col = modules.values();
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
ModuleDescription axismodule = (ModuleDescription) iterator.next();
Module module = axismodule.getModule();
if (module != null) {
- module.init(context.getEngineConfig());
+ module.init(context.getAxisConfiguration());
}
}
} catch (AxisFault e) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MessageContext.java Tue May 24 23:37:26 2005
@@ -65,7 +65,7 @@
private OperationContext operationContext;
private ServiceContext serviceContext;
- private ConfigurationContext engineContext;
+ private ConfigurationContext configurationContext;
private TransportInDescription transportIn;
@@ -117,7 +117,7 @@
private String serviceInstanceID;
/**
- * @param engineContext
+ * @param configurationContext
* @param sessionContext
* @param transportIn
* @param transportOut
@@ -130,12 +130,12 @@
throws AxisFault {
super(null);
this.messageInformationHeaders = addressingHeaders;
- this.engineContext = engineContext;
+ this.configurationContext = engineContext;
sessionContext = null;
}
/**
- * @param engineContext
+ * @param configurationContext
* @param sessionContext
* @param transportIn
* @param transportOut
@@ -158,7 +158,7 @@
* @param sessionContext
* @param transportIn
* @param transportOut
- * @param engineContext
+ * @param configurationContext
* @throws AxisFault
*/
@@ -178,7 +178,7 @@
messageInformationHeaders = new MessageInformationHeadersCollection();
this.transportIn = transportIn;
this.transportOut = transportOut;
- this.engineContext = engineContext;
+ this.configurationContext = engineContext;
}
@@ -472,7 +472,7 @@
}
public ConfigurationContext getSystemContext() {
- return engineContext;
+ return configurationContext;
}
/**
@@ -485,8 +485,8 @@
/**
* @param context
*/
- public void setEngineContext(ConfigurationContext context) {
- engineContext = context;
+ public void setConfigurationContext(ConfigurationContext context) {
+ configurationContext = context;
}
/**
@@ -520,7 +520,7 @@
obj = serviceContext.getProperty(key, persistent);
}
if (obj == null && operationContext == null) {
- obj = engineContext.getProperty(key, persistent);
+ obj = configurationContext.getProperty(key, persistent);
}
//Search the configurations
Parameter param = null;
@@ -532,8 +532,8 @@
ServiceDescription serviceDesc = serviceContext.getServiceConfig();
param = serviceDesc.getParameter(key);
}
- if (param == null && engineContext != null) {
- AxisConfiguration baseConfig = engineContext.getEngineConfig();
+ if (param == null && configurationContext != null) {
+ AxisConfiguration baseConfig = configurationContext.getAxisConfiguration();
param = baseConfig.getParameter(key);
}
if (param != null) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java Tue May 24 23:37:26 2005
@@ -65,7 +65,7 @@
ServiceDescription service = null;
if(toEPR != null){
QName serviceName = new QName(toEPR.getAddress());
- service = messageContext.getSystemContext().getEngineConfig().getService(serviceName);
+ service = messageContext.getSystemContext().getAxisConfiguration().getService(serviceName);
}
if (service != null) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Tue May 24 23:37:26 2005
@@ -94,7 +94,7 @@
public void receive(MessageContext context) throws AxisFault {
try {
ConfigurationContext sysCtx = context.getSystemContext();
- ArrayList phases = sysCtx.getEngineConfig().getInPhasesUptoAndIncludingPostDispatch();
+ ArrayList phases = sysCtx.getAxisConfiguration().getInPhasesUptoAndIncludingPostDispatch();
invokePhases(phases, context);
OperationContext operationContext = context.getOperationContext();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java Tue May 24 23:37:26 2005
@@ -85,7 +85,7 @@
}
AxisConfiguration registry =
- messageContext.getSystemContext().getEngineConfig();
+ messageContext.getSystemContext().getAxisConfiguration();
return registry.getService(serviceName);
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java Tue May 24 23:37:26 2005
@@ -157,9 +157,9 @@
MessageContext msgContext =
new MessageContext(
(SessionContext) sessionContext,
- engineContext.getEngineConfig().getTransportIn(
+ engineContext.getAxisConfiguration().getTransportIn(
new QName(Constants.TRANSPORT_HTTP)),
- engineContext.getEngineConfig().getTransportOut(
+ engineContext.getAxisConfiguration().getTransportOut(
new QName(Constants.TRANSPORT_HTTP)),
engineContext);
msgContext.setServerSide(true);
@@ -216,11 +216,11 @@
*/
private void listServices(HttpServletRequest req, HttpServletResponse res)
throws IOException {
- HashMap services = engineContext.getEngineConfig().getServices();
+ HashMap services = engineContext.getAxisConfiguration().getServices();
req.getSession().setAttribute(Constants.SERVICE_MAP, services);
req.getSession().setAttribute(
Constants.ERROR_SERVICE_MAP,
- engineContext.getEngineConfig().getFaulytServices());
+ engineContext.getAxisConfiguration().getFaulytServices());
res.sendRedirect(LIST_MULTIPLE_SERVICE_JSP_NAME);
}
@@ -241,7 +241,7 @@
filePart.substring(
filePart.lastIndexOf("/") + 1,
filePart.length());
- HashMap services = engineContext.getEngineConfig().getServices();
+ HashMap services = engineContext.getAxisConfiguration().getServices();
if ((services != null) && !services.isEmpty()) {
Object serviceObj = services.get(new QName(serviceName));
if (serviceObj != null) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java Tue May 24 23:37:26 2005
@@ -136,12 +136,12 @@
Writer out = new OutputStreamWriter(socket.getOutputStream());
Reader in = new InputStreamReader(socket.getInputStream());
TransportOutDescription transportOut =
- configurationContext.getEngineConfig().getTransportOut(
+ configurationContext.getAxisConfiguration().getTransportOut(
new QName(Constants.TRANSPORT_HTTP));
MessageContext msgContext =
new MessageContext(
null,
- configurationContext.getEngineConfig().getTransportIn(
+ configurationContext.getAxisConfiguration().getTransportIn(
new QName(Constants.TRANSPORT_HTTP)),
transportOut,
configurationContext);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java Tue May 24 23:37:26 2005
@@ -77,8 +77,8 @@
msgContext =
new MessageContext(
null,
- reg.getEngineConfig().getTransportIn(new QName(Constants.TRANSPORT_MAIL)),
- reg.getEngineConfig().getTransportOut(new QName(Constants.TRANSPORT_MAIL)),
+ reg.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_MAIL)),
+ reg.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_MAIL)),
reg);
msgContext.setServerSide(true);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/tcp/TCPServer.java Tue May 24 23:37:26 2005
@@ -94,12 +94,12 @@
Writer out = new OutputStreamWriter(socket.getOutputStream());
Reader in = new InputStreamReader(socket.getInputStream());
TransportOutDescription transportOut =
- configContext.getEngineConfig().getTransportOut(
+ configContext.getAxisConfiguration().getTransportOut(
new QName(Constants.TRANSPORT_TCP));
MessageContext msgContext =
new MessageContext(
null,
- configContext.getEngineConfig().getTransportIn(
+ configContext.getAxisConfiguration().getTransportIn(
new QName(Constants.TRANSPORT_TCP)),
transportOut,
configContext);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java Tue May 24 23:37:26 2005
@@ -36,7 +36,7 @@
public void testDeployment() throws Exception {
String filename = "./target/test-resources/deployment";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- AxisConfiguration er = builder.buildEngineContext(filename).getEngineConfig();
+ AxisConfiguration er = builder.buildEngineContext(filename).getAxisConfiguration();
assertNotNull(er);
ServiceDescription service = er.getService(new QName("service2"));
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/DeploymentotalTest.java Tue May 24 23:37:26 2005
@@ -31,7 +31,7 @@
String filename = "./target/test-resources/deployment";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er = builder.buildEngineContext(filename).getEngineConfig();
+ er = builder.buildEngineContext(filename).getAxisConfiguration();
}
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/InvalidServiceTest.java Tue May 24 23:37:26 2005
@@ -38,7 +38,7 @@
try {
String filename = "./target/test-resources/InvalidDeployment";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er = builder.buildEngineContext(filename).getEngineConfig();
+ er = builder.buildEngineContext(filename).getAxisConfiguration();
String msg = (String) er.getFaulytServices().get("invalidService");
if (msg == null || msg.equals("")) {
fail("this must failed gracefully with AxisFault ervice specifi module can not" +
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/ModifiedConfigFileTest.java Tue May 24 23:37:26 2005
@@ -39,7 +39,7 @@
try {
String filename = "./test-resources/deployment/BadConfigOrderChange";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er = builder.buildEngineContext(filename).getEngineConfig();
+ er = builder.buildEngineContext(filename).getAxisConfiguration();
fail("this must failed gracefully with DeploymentException \"Invalid System predefined " +
"inphases , phase order dose not\" +\n support\\n recheck server.xml\"");
} catch (DeploymentException e) {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/SystemPhasesremovedTest.java Tue May 24 23:37:26 2005
@@ -35,7 +35,7 @@
try {
String filename = "./test-resources/deployment/SystemPhaseRemove";
ConfigurationContextFactory builder = new ConfigurationContextFactory();
- er = builder.buildEngineContext(filename).getEngineConfig();
+ er = builder.buildEngineContext(filename).getAxisConfiguration();
fail("this must failed gracefully with DeploymentException \"Invalid System predefined " +
"inphases , phase order dose not\" +\n support\\n recheck server.xml\"");
} catch (DeploymentException e) {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java Tue May 24 23:37:26 2005
@@ -63,7 +63,7 @@
ServiceDescription service = new ServiceDescription(serviceName);
service.setStyle(WSDLService.STYLE_DOC);
- engineContext.getEngineConfig().addService(service);
+ engineContext.getAxisConfiguration().addService(service);
OperationDescription axisOp = new OperationDescription(operationName);
axisOp.setMessageReciever(new MessageReceiver() {
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java Tue May 24 23:37:26 2005
@@ -69,7 +69,7 @@
protected void setUp() throws Exception {
UtilServer.start();
- UtilServer.getConfigurationContext().getEngineConfig().engageModule(
+ UtilServer.getConfigurationContext().getAxisConfiguration().engageModule(
new QName("addressing"));
ServiceDescription service =
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java Tue May 24 23:37:26 2005
@@ -72,7 +72,7 @@
protected void setUp() throws Exception {
UtilServer.start();
- UtilServer.getConfigurationContext().getEngineConfig().engageModule(
+ UtilServer.getConfigurationContext().getAxisConfiguration().engageModule(
new QName("addressing"));
ServiceDescription service =
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java Tue May 24 23:37:26 2005
@@ -72,7 +72,7 @@
protected void setUp() throws Exception {
UtilServer.start();
Parameter parameter = new ParameterImpl(Constants.DO_REST,"true");
- ((AxisConfigurationImpl)UtilServer.getConfigurationContext().getEngineConfig()).addParameter(parameter);
+ ((AxisConfigurationImpl)UtilServer.getConfigurationContext().getAxisConfiguration()).addParameter(parameter);
service =
Utils.createSimpleService(serviceName,
org.apache.axis.engine.Echo.class.getName(),
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java Tue May 24 23:37:26 2005
@@ -43,12 +43,12 @@
//public static final String TESTING_REPOSITORY = "modules/samples/target/test-resources/samples";
public static synchronized void deployService(ServiceDescription service) throws AxisFault {
- reciver.getSystemContext().getEngineConfig().addService(service);
- Utils.resolvePhases(reciver.getSystemContext().getEngineConfig(), service);
+ reciver.getSystemContext().getAxisConfiguration().addService(service);
+ Utils.resolvePhases(reciver.getSystemContext().getAxisConfiguration(), service);
}
public static synchronized void unDeployService(QName service) throws AxisFault {
- reciver.getSystemContext().getEngineConfig().removeService(service);
+ reciver.getSystemContext().getAxisConfiguration().removeService(service);
}
public static synchronized void start() throws Exception {
@@ -105,10 +105,10 @@
ConfigurationContextFactory efac = new ConfigurationContextFactory();
ConfigurationContext sysContext = efac.buildClientEngineContext(null);
- sysContext.getEngineConfig().addMdoule(moduleDesc);
- sysContext.getEngineConfig().engageModule(moduleDesc.getName());
+ sysContext.getAxisConfiguration().addMdoule(moduleDesc);
+ sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());
- sysContext.getEngineConfig().addService(service);
+ sysContext.getAxisConfiguration().addService(service);
//Utils.resolvePhases(sysContext.getEngineConfig(), service);
ServiceContext serviceContext = sysContext.createServiceContext(service.getName());
return serviceContext;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java?rev=178390&r1=178389&r2=178390&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java Tue May 24 23:37:26 2005
@@ -36,13 +36,13 @@
public static synchronized void deployService(ServiceDescription service)
throws AxisFault {
- configurationContext.getEngineConfig().addService(service);
+ configurationContext.getAxisConfiguration().addService(service);
}
public static synchronized void unDeployService(QName service)
throws AxisFault {
- configurationContext.getEngineConfig().removeService(service);
+ configurationContext.getAxisConfiguration().removeService(service);
}
public static synchronized void start() throws Exception {
@@ -65,7 +65,7 @@
} catch (InterruptedException e1) {
throw new AxisFault("Thread interuptted", e1);
}
- configurationContext.getEngineConfig().engageModule(
+ configurationContext.getAxisConfiguration().engageModule(
new QName("addressing"));
reciver =
new TCPServer(UtilServer.TESTING_PORT, configurationContext);