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/20 05:46:50 UTC
svn commit: r171040 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/context/ core/src/org/apache/axis/deployment/
core/src/org/apache/axis/engine/ core/src/org/apache/axis/phaseresolver/
core/test/org/apache/axis/deployment/
core/test/org/apache/axis/description/ core/test/org/apache/axis/engine/
core/test/org/apache/axis/phaserule/ samples/test/org/apache/axis/engine/
Author: hemapani
Date: Thu May 19 20:46:49 2005
New Revision: 171040
URL: http://svn.apache.org/viewcvs?rev=171040&view=rev
Log:
refactorring SystemImpl to AxisConfigurationImpl
Added:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java
- copied, changed from r171030, webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java
Removed:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ExecutionChain.java
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.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/EchoRawXMLTest.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java Thu May 19 20:46:49 2005
@@ -1,23 +1,23 @@
package org.apache.axis.context;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.deployment.DeploymentException;
import org.apache.axis.description.ModuleDescription;
-import org.apache.axis.description.OperationDescription;
import org.apache.axis.description.ServiceDescription;
import org.apache.axis.engine.AxisConfiguration;
+import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystemImpl;
import org.apache.axis.modules.Module;
import org.apache.axis.phaseresolver.PhaseException;
import org.apache.axis.phaseresolver.PhaseResolver;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
/**
* Created by IntelliJ IDEA.
* Author : Deepal Jayasinghe
@@ -68,7 +68,7 @@
private void initModules(ConfigurationContext context) throws DeploymentException {
try {
- HashMap modules = ((AxisSystemImpl) context.getEngineConfig()).getModules();
+ HashMap modules = ((AxisConfigurationImpl) context.getEngineConfig()).getModules();
Collection col = modules.values();
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
ModuleDescription axismodule = (ModuleDescription) iterator.next();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Thu May 19 20:46:49 2005
@@ -28,7 +28,7 @@
import org.apache.axis.description.*;
import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.Handler;
import org.apache.axis.modules.Module;
import org.apache.axis.phaseresolver.PhaseException;
@@ -166,8 +166,8 @@
*/
private void setDeploymentFeatures() {
String value;
- Parameter parahotdeployment = ((AxisSystemImpl) axisConfig).getParameter(HOTDEPLOYMENT);
- Parameter parahotupdate = ((AxisSystemImpl) axisConfig).getParameter(HOTUPDATE);
+ Parameter parahotdeployment = ((AxisConfigurationImpl) axisConfig).getParameter(HOTDEPLOYMENT);
+ Parameter parahotupdate = ((AxisConfigurationImpl) axisConfig).getParameter(HOTUPDATE);
if (parahotdeployment != null) {
value = (String) parahotdeployment.getValue();
if ("false".equals(value))
@@ -190,7 +190,7 @@
InputStream in = new FileInputStream(tempfile);
axisConfig = createEngineConfig();
DeploymentParser parser = new DeploymentParser(in, this);
- parser.processGlobalConfig(((AxisSystemImpl) axisConfig), SERVERST);
+ parser.processGlobalConfig(((AxisConfigurationImpl) axisConfig), SERVERST);
} catch (FileNotFoundException e) {
throw new DeploymentException("Exception at deployment", e);
} catch (XMLStreamException e) {
@@ -230,7 +230,7 @@
try {
axisConfig = createEngineConfig();
DeploymentParser parser = new DeploymentParser(in, this);
- parser.processGlobalConfig(((AxisSystemImpl) axisConfig), CLIENTST);
+ parser.processGlobalConfig(((AxisConfigurationImpl) axisConfig), CLIENTST);
} catch (XMLStreamException e) {
throw new DeploymentException(e.getMessage());
}
@@ -297,11 +297,11 @@
PhaseResolver resolver = new PhaseResolver(axisConfig);
for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
QName name = (QName) iterator.next();
- ModuleDescription modeuldesc = ((AxisSystemImpl) axisConfig).getModule(name);
+ ModuleDescription modeuldesc = ((AxisConfigurationImpl) axisConfig).getModule(name);
if (modeuldesc != null) {
resolver.engageModuleGlobally(modeuldesc);
} else {
- throw new AxisFault(((AxisSystemImpl) axisConfig) + " Refer to invalid module " + name + " has not bean deployed yet !");
+ throw new AxisFault(((AxisConfigurationImpl) axisConfig) + " Refer to invalid module " + name + " has not bean deployed yet !");
}
}
@@ -331,7 +331,7 @@
}
// ArrayList outPhaes = tempdata.getOUTPhases();
//TODO do the validation code here
- //ArrayList systemDefaultPhases =((AxisSystemImpl)axisConfig).getInPhasesUptoAndIncludingPostDispatch();
+ //ArrayList systemDefaultPhases =((AxisConfigurationImpl)axisConfig).getInPhasesUptoAndIncludingPostDispatch();
}
public ModuleDescription getModule(QName moduleName) throws AxisFault {
@@ -349,7 +349,7 @@
}
private AxisConfiguration createEngineConfig() {
- AxisConfiguration newEngineConfig = new AxisSystemImpl();
+ AxisConfiguration newEngineConfig = new AxisConfigurationImpl();
return newEngineConfig;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java Thu May 19 20:46:49 2005
@@ -20,7 +20,7 @@
import org.apache.axis.description.*;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.transport.TransportReceiver;
import org.apache.axis.transport.TransportSender;
@@ -91,7 +91,7 @@
/**
* To process server.xml
*/
- public void processGlobalConfig(AxisSystemImpl axisGlobal , String starttag) throws DeploymentException {
+ public void processGlobalConfig(AxisConfigurationImpl axisGlobal , String starttag) throws DeploymentException {
String START_TAG = starttag;
try {
boolean END_DOCUMENT = false;
Copied: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java (from r171030, webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java)
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java?p2=webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java&p1=webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java&r1=171030&r2=171040&rev=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisSystemImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java Thu May 19 20:46:49 2005
@@ -25,7 +25,7 @@
/**
* Class EngineRegistryImpl
*/
-public class AxisSystemImpl implements AxisConfiguration {
+public class AxisConfigurationImpl implements AxisConfiguration {
/**
* To store Erroness services
*/
@@ -79,7 +79,7 @@
/**
* Constructor EngineRegistryImpl
*/
- public AxisSystemImpl() {
+ public AxisConfigurationImpl() {
paramInclude = new ParameterIncludeImpl();
engagedModules = new ArrayList();
messagRecievers = new HashMap();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java Thu May 19 20:46:49 2005
@@ -18,7 +18,7 @@
import org.apache.axis.description.*;
import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.Phase;
import org.apache.axis.phaseresolver.util.PhaseValidator;
@@ -146,7 +146,7 @@
Flow flow = null;
///////////////////////////////////////////////////////////////////////////////////////////
////////////////////////// Handlers from server.xml from modules/////////////////////////
- ArrayList modulqnames = (ArrayList) ((AxisSystemImpl) axisConfig).getEngadgedModules();
+ ArrayList modulqnames = (ArrayList) ((AxisConfigurationImpl) axisConfig).getEngadgedModules();
for (int i = 0; i < modulqnames.size(); i++) {
QName modulename = (QName) modulqnames.get(i);
module = axisConfig.getModule(modulename);
@@ -460,22 +460,22 @@
switch (type) {
case PhaseMetadata.IN_FLOW:
{
- phaseHolder = new PhaseHolder(((AxisSystemImpl) axisConfig).getInPhasesUptoAndIncludingPostDispatch());
+ phaseHolder = new PhaseHolder(((AxisConfigurationImpl) axisConfig).getInPhasesUptoAndIncludingPostDispatch());
break;
}
case PhaseMetadata.OUT_FLOW:
{
- phaseHolder = new PhaseHolder(((AxisSystemImpl) axisConfig).getOutFlow());
+ phaseHolder = new PhaseHolder(((AxisConfigurationImpl) axisConfig).getOutFlow());
break;
}
case PhaseMetadata.FAULT_IN_FLOW:
{
- phaseHolder = new PhaseHolder(((AxisSystemImpl) axisConfig).getInFaultFlow());
+ phaseHolder = new PhaseHolder(((AxisConfigurationImpl) axisConfig).getInFaultFlow());
break;
}
case PhaseMetadata.FAULT_OUT_FLOW:
{
- phaseHolder = new PhaseHolder(((AxisSystemImpl) axisConfig).getOutFaultFlow());
+ phaseHolder = new PhaseHolder(((AxisConfigurationImpl) axisConfig).getOutFaultFlow());
break;
}
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadModuleTest.java Thu May 19 20:46:49 2005
@@ -17,7 +17,7 @@
package org.apache.axis.deployment;
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.AxisConfigurationImpl;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -35,7 +35,7 @@
try {
InputStream in = new FileInputStream(getTestResourceFile("deployment/Badmodule.xml"));
DeploymentParser parser = new DeploymentParser(in, null);
- AxisSystemImpl glabl = new AxisSystemImpl();
+ AxisConfigurationImpl glabl = new AxisConfigurationImpl();
parser.processGlobalConfig(glabl,DeploymentConstants.SERVERST);
fail("this must failed gracefully with DeploymentException or FileNotFoundException");
} catch (FileNotFoundException e) {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/BadServerXMLTest.java Thu May 19 20:46:49 2005
@@ -17,7 +17,7 @@
package org.apache.axis.deployment;
import org.apache.axis.AbstractTestCase;
-import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.AxisConfigurationImpl;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -35,7 +35,7 @@
try {
InputStream in = new FileInputStream(getTestResourceFile("deployment/BadServer.xml"));
DeploymentParser parser = new DeploymentParser(in, null);
- AxisSystemImpl glabl = new AxisSystemImpl();
+ AxisConfigurationImpl glabl = new AxisConfigurationImpl();
parser.processGlobalConfig(glabl,DeploymentConstants.SERVERST);
fail("this must failed gracefully with DeploymentException or FileNotFoundException");
} catch (FileNotFoundException e) {
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/description/RegistryTest.java Thu May 19 20:46:49 2005
@@ -20,7 +20,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisConfiguration;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisSystemImpl;
+
import org.apache.axis.engine.Handler;
import org.apache.axis.handlers.AbstractHandler;
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=171040&r1=171039&r2=171040&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 Thu May 19 20:46:49 2005
@@ -51,7 +51,7 @@
public EnginePausingTest(String arg0) throws AxisFault {
super(arg0);
executedHandlers = new ArrayList();
- AxisConfiguration engineRegistry = new AxisSystemImpl();
+ AxisConfiguration engineRegistry = new AxisConfigurationImpl();
engineContext = new ConfigurationContext(engineRegistry);
transportOut = new TransportOutDescription(new QName("null"));
transportOut.setSender(new HTTPTransportSender());
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java Thu May 19 20:46:49 2005
@@ -55,7 +55,7 @@
protected void setUp() throws Exception {
- engineRegistry = new AxisSystemImpl();
+ engineRegistry = new AxisConfigurationImpl();
engineContext = new ConfigurationContext(engineRegistry);
TransportOutDescription transport = new TransportOutDescription(new QName("null"));
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java Thu May 19 20:46:49 2005
@@ -29,7 +29,7 @@
}
public void testMesssageContext() throws AxisFault {
- AxisConfiguration er = new AxisSystemImpl();
+ AxisConfiguration er = new AxisConfigurationImpl();
ServiceDescription servicesDesc = new ServiceDescription();
er.addService(servicesDesc);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java Thu May 19 20:46:49 2005
@@ -4,7 +4,7 @@
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
import org.apache.axis.engine.AxisConfiguration;
-import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.Handler;
import org.apache.axis.phaseresolver.PhaseHolder;
@@ -47,7 +47,7 @@
try {
super.setUp();
phaserul = new InvalidPhaseRuleTest("");
- axisSytem = new AxisSystemImpl();
+ axisSytem = new AxisConfigurationImpl();
ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
Handler han = null;
@@ -101,14 +101,14 @@
super.setUp();
//TODO Fix me
phaserul = new InvalidPhaseRuleTest("");
- axisSytem = new AxisSystemImpl();
+ axisSytem = new AxisConfigurationImpl();
ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
inPhase.add("global");
- ((AxisSystemImpl) axisSytem).setInPhases(inPhase);
- ((AxisSystemImpl) axisSytem).setInFaultPhases(inPhase);
- ((AxisSystemImpl) axisSytem).setOutFaultPhases(inPhase);
- ((AxisSystemImpl) axisSytem).setOutPhases(inPhase);
+ ((AxisConfigurationImpl) axisSytem).setInPhases(inPhase);
+ ((AxisConfigurationImpl) axisSytem).setInFaultPhases(inPhase);
+ ((AxisConfigurationImpl) axisSytem).setOutFaultPhases(inPhase);
+ ((AxisConfigurationImpl) axisSytem).setOutPhases(inPhase);
Handler han = null;
PhaseHolder ph = new PhaseHolder(inPhase);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PhaseRuleTest.java Thu May 19 20:46:49 2005
@@ -5,7 +5,7 @@
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
import org.apache.axis.engine.AxisConfiguration;
-import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.Handler;
import javax.xml.namespace.QName;
@@ -30,7 +30,7 @@
super.setUp();
//TODO fix me
phaserul = new PhaseRuleTest("");
- axisSytem = new AxisSystemImpl();
+ axisSytem = new AxisConfigurationImpl();
ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
Handler han = null;//(Handler)Class.forName("org.apache.axis.handlers.AbstractHandler").newInstance();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java Thu May 19 20:46:49 2005
@@ -5,7 +5,7 @@
import org.apache.axis.description.HandlerDescription;
import org.apache.axis.description.PhaseRule;
import org.apache.axis.engine.AxisConfiguration;
-import org.apache.axis.engine.AxisSystemImpl;
+import org.apache.axis.engine.AxisConfigurationImpl;
import org.apache.axis.engine.Handler;
import javax.xml.namespace.QName;
@@ -46,7 +46,7 @@
public void testPhaseRule() throws Exception {
//TODO Fix me
phaserul = new PreDispatchPhaseRuleTest("");
- axisSytem = new AxisSystemImpl();
+ axisSytem = new AxisConfigurationImpl();
ArrayList inPhase = axisSytem.getInPhasesUptoAndIncludingPostDispatch();
Handler han = null;
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=171040&r1=171039&r2=171040&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 Thu May 19 20:46:49 2005
@@ -122,7 +122,7 @@
EngineContextFactory efac = new EngineContextFactory();
ConfigurationContext sysContext = efac.buildClientEngineContext(null);
- new ConfigurationContext(new AxisSystemImpl());
+ new ConfigurationContext(new AxisConfigurationImpl());
sysContext.getEngineConfig().addMdoule(moduleDesc);
sysContext.getEngineConfig().engageModule(moduleDesc.getName());
ServiceDescription service =
@@ -170,8 +170,13 @@
};
call.invokeNonBlocking(operationName.getLocalPart(), method, callback);
+ int index = 0;
while (!finish) {
Thread.sleep(1000);
+ index++;
+ if(index > 10 ){
+ throw new AxisFault("Server is shutdown as the Async response take too longs time");
+ }
}
log.info("send the reqest");
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java?rev=171040&r1=171039&r2=171040&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java Thu May 19 20:46:49 2005
@@ -125,9 +125,15 @@
};
call.invokeNonBlocking(operationName.getLocalPart(), payload, callback);
+ int index = 0;
while (!finish) {
Thread.sleep(1000);
+ index++;
+ if(index > 10 ){
+ throw new AxisFault("Server is shutdown as the Async response take too longs time");
+ }
}
+
log.info("send the reqest");
}