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/04/11 12:20:12 UTC
svn commit: r160854 [2/2] - in webservices/axis/trunk/java/modules:
core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/
core/src/org/apache/axis/deployment/ core/src/org/apache/axis/description/
core/src/org/apache/axis/engine/ core/src/org/apache/axis/modules/
core/src/org/apache/axis/phaseresolver/ core/src/org/apache/axis/receivers/
core/src/org/apache/axis/transport/http/
core/src/org/apache/axis/transport/mail/ core/src/org/apache/axis/util/
core/test/org/apache/axis/deployment/
core/test/org/apache/axis/description/ core/test/org/apache/axis/engine/
samples/test/org/apache/axis/clientapi/ samples/test/org/apache/axis/engine/
samples/test/org/apache/axis/integration/
Added: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SimplePhase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SimplePhase.java?view=auto&rev=160854
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SimplePhase.java (added)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SimplePhase.java Mon Apr 11 03:19:59 2005
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis.engine;
+
+import java.util.ArrayList;
+import java.util.Stack;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis.context.MessageContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * <p>This is Phase, a orderd collection of Handlers.
+ * seems this is Handler Chain with order.</p>
+ * Should this exttends Hanlders?
+ */
+public class SimplePhase implements Phase {
+ /**
+ * Field DISPATCH_PHASE
+ */
+ public static final String DISPATCH_PHASE = "DispatchPhase";
+
+ /**
+ * Field SERVICE_INVOCATION
+ */
+ public static final String SERVICE_INVOCATION = "ServiceInvocationPhase";
+
+ /**
+ * Field SENDING_PHASE
+ */
+ public static final String SENDING_PHASE = "SendPhase";
+
+ /**
+ * Field NAME
+ */
+ public static final QName NAME = new QName("http://axis.ws.apache.org",
+ "Phase");
+
+ /**
+ * Field phaseName
+ */
+ private String phaseName;
+
+ /**
+ * Field handlers
+ */
+ private ArrayList handlers;
+
+ /**
+ * Field log
+ */
+ private Log log = LogFactory.getLog(getClass());
+
+ private int indexOfHandlerToExecute = 0;
+
+ /**
+ * Constructor Phase
+ *
+ * @param phaseName
+ */
+ public SimplePhase(String phaseName) {
+ handlers = new ArrayList();
+ this.phaseName = phaseName;
+
+ }
+
+ /**
+ * Method addHandler
+ *
+ * @param handler
+ * @param index
+ */
+ public void addHandler(Handler handler, int index) {
+ log.info("Handler " + handler.getName() + "Added to place " + 1
+ + " At the Phase " + phaseName);
+ handlers.add(index, handler);
+ }
+
+ /**
+ * add to next empty handler
+ *
+ * @param handler
+ */
+ public void addHandler(Handler handler) {
+ log.info("Handler " + handler.getName() + " Added to the Phase "
+ + phaseName);
+ handlers.add(handler);
+ }
+
+ /**
+ * If need to see how this works look at the stack!
+ *
+ * @param msgctx
+ * @throws AxisFault
+ */
+ public void invoke(MessageContext msgctx) throws AxisFault {
+ Stack executionStack = new Stack();
+ try {
+ while (indexOfHandlerToExecute < handlers.size() ) {
+ if(msgctx.isPaused()){
+ break;
+ }else{
+ Handler handler = (Handler) handlers.get(indexOfHandlerToExecute);
+ if (handler != null) {
+ log.info("Invoke the Handler " + handler.getName()
+ + "with in the Phase " + phaseName);
+ handler.invoke(msgctx);
+ //This line should be after the invoke as if the invocation failed this handlers is takn care of and
+ //no need to revoke agien
+ executionStack.push(handler);
+ indexOfHandlerToExecute++;
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.info("Phase " + phaseName + " failed with the "
+ + e.getMessage());
+ while (!executionStack.isEmpty()) {
+ Handler handler = (Handler) executionStack.pop();
+ log.info("revoke the Handler " + handler.getName()
+ + " with in the Phase " + phaseName);
+ handler.revoke(msgctx);
+ }
+ throw AxisFault.makeFault(e);
+ }
+ }
+
+ /**
+ * Method revoke
+ *
+ * @param msgctx
+ */
+ public void revoke(MessageContext msgctx) {
+ for (int i = handlers.size() - 1; i > -1; i--) {
+ Handler handler = (Handler) handlers.get(i);
+ log.info("revoke the Handler " + handler.getName()
+ + " with in the Phase " + phaseName);
+ if (handler != null) {
+ handler.revoke(msgctx);
+ }
+ }
+ }
+
+ /**
+ * @return Returns the name.
+ */
+ public String getPhaseName() {
+ return phaseName;
+ }
+
+ /**
+ * @param phaseName The name to set.
+ */
+ public void setName(String phaseName) {
+ this.phaseName = phaseName;
+ }
+// public void postCondition(MessageContext msgCtx) throws AxisFault {
+//
+//
+// }
+//
+// /* (non-Javadoc)
+// * @see org.apache.axis.engine.Phase#preCondition(org.apache.axis.context.MessageContext)
+// */
+// public void preCondition(MessageContext msgCtx) throws AxisFault {
+// // TODO Auto-generated method stub
+//
+// }
+
+}
Added: webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java?view=auto&rev=160854
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java (added)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/modules/Module.java Mon Apr 11 03:19:59 2005
@@ -0,0 +1,29 @@
+
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Runtime state of the engine
+ */
+package org.apache.axis.modules;
+
+import org.apache.axis.context.ModuleContext;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.ExecutionChain;
+
+public interface Module {
+ public void init(ModuleContext moduleContext) throws AxisFault;
+ public void engage(ExecutionChain exeChain)throws AxisFault;
+ public void shutDown()throws AxisFault;
+}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java Mon Apr 11 03:19:59 2005
@@ -20,9 +20,9 @@
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.description.PhasesInclude;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.Handler;
-import org.apache.axis.engine.Phase;
+import org.apache.axis.engine.SimplePhase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,7 +45,7 @@
/**
* Referance to ServerMetaData inorder to get information about phases.
*/
- private final EngineRegistry registry; // = new ServerMetaData();
+ private final EngineConfiguration registry; // = new ServerMetaData();
/**
* Field service
@@ -64,7 +64,7 @@
* @param registry
* @param serviceIN
*/
- public PhaseHolder(EngineRegistry registry, AxisService serviceIN) {
+ public PhaseHolder(EngineConfiguration registry, AxisService serviceIN) {
this.registry = registry;
this.service = serviceIN;
fillFlowPhases();
@@ -228,14 +228,14 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
axisPhase.addHandler(handlers[j].getHandler());
}
inChain.add(axisPhase);
}
- service.setPhases(inChain, EngineRegistry.INFLOW);
+ service.setPhases(inChain, EngineConfiguration.INFLOW);
break;
}
case PhaseMetadata.OUT_FLOW:
@@ -244,14 +244,14 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
axisPhase.addHandler(handlers[j].getHandler());
}
outChain.add(axisPhase);
}
- service.setPhases(outChain, EngineRegistry.OUTFLOW);
+ service.setPhases(outChain, EngineConfiguration.OUTFLOW);
break;
}
case PhaseMetadata.FAULT_FLOW:
@@ -260,14 +260,14 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
axisPhase.addHandler(handlers[j].getHandler());
}
faultChain.add(axisPhase);
}
- service.setPhases(faultChain, EngineRegistry.FAULTFLOW);
+ service.setPhases(faultChain, EngineConfiguration.FAULTFLOW);
break;
}
}
@@ -292,7 +292,7 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
try {
@@ -313,7 +313,7 @@
}
inChain.add(axisPhase);
}
- trnsport.setPhases(inChain, EngineRegistry.INFLOW);
+ trnsport.setPhases(inChain, EngineConfiguration.INFLOW);
break;
}
case PhaseMetadata.OUT_FLOW:
@@ -322,7 +322,7 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
try {
@@ -343,7 +343,7 @@
}
outChain.add(axisPhase);
}
- trnsport.setPhases(outChain, EngineRegistry.OUTFLOW);
+ trnsport.setPhases(outChain, EngineConfiguration.OUTFLOW);
break;
}
case PhaseMetadata.FAULT_FLOW:
@@ -352,7 +352,7 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
try {
@@ -373,7 +373,7 @@
}
faultChain.add(axisPhase);
}
- trnsport.setPhases(faultChain, EngineRegistry.FAULTFLOW);
+ trnsport.setPhases(faultChain, EngineConfiguration.FAULTFLOW);
break;
}
}
@@ -402,14 +402,14 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
axisPhase.addHandler(handlers[j].getHandler());
}
inChain.add(axisPhase);
}
- axisGlobal.setPhases(inChain, EngineRegistry.INFLOW);
+ axisGlobal.setPhases(inChain, EngineConfiguration.INFLOW);
break;
}
case PhaseMetadata.OUT_FLOW:
@@ -418,14 +418,14 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
axisPhase.addHandler(handlers[j].getHandler());
}
outChain.add(axisPhase);
}
- axisGlobal.setPhases(outChain, EngineRegistry.OUTFLOW);
+ axisGlobal.setPhases(outChain, EngineConfiguration.OUTFLOW);
break;
}
case PhaseMetadata.FAULT_FLOW:
@@ -434,14 +434,14 @@
for (int i = 0; i < phaseholder.size(); i++) {
PhaseMetadata phase =
(PhaseMetadata) phaseholder.get(i);
- Phase axisPhase = new Phase(phase.getName());
+ SimplePhase axisPhase = new SimplePhase(phase.getName());
handlers = phase.getOrderedHandlers();
for (int j = 0; j < handlers.length; j++) {
axisPhase.addHandler(handlers[j].getHandler());
}
faultChain.add(axisPhase);
}
- axisGlobal.setPhases(faultChain, EngineRegistry.FAULTFLOW);
+ axisGlobal.setPhases(faultChain, EngineConfiguration.FAULTFLOW);
break;
}
}
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -17,7 +17,7 @@
import org.apache.axis.description.*;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import javax.xml.namespace.QName;
import java.util.*;
@@ -29,7 +29,7 @@
/**
* Field engineRegistry
*/
- private final EngineRegistry engineRegistry;
+ private final EngineConfiguration engineRegistry;
/**
* Field axisService
@@ -46,7 +46,7 @@
*
* @param engineRegistry
*/
- public PhaseResolver(EngineRegistry engineRegistry) {
+ public PhaseResolver(EngineConfiguration engineRegistry) {
this.engineRegistry = engineRegistry;
}
@@ -56,7 +56,7 @@
* @param engineRegistry
* @param axisService
*/
- public PhaseResolver(EngineRegistry engineRegistry,
+ public PhaseResolver(EngineConfiguration engineRegistry,
AxisService axisService) {
this.engineRegistry = engineRegistry;
this.axisService = axisService;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/InOutSyncReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/InOutSyncReceiver.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/InOutSyncReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/InOutSyncReceiver.java Mon Apr 11 03:19:59 2005
@@ -19,8 +19,8 @@
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Provider;
-import org.apache.axis.engine.Receiver;
-import org.apache.axis.engine.Sender;
+import org.apache.axis.engine.MessageReceiver;
+import org.apache.axis.engine.MessageSender;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,7 +30,7 @@
/**
* This is takes care of the IN-OUT Async MEP in the server side
*/
-public class InOutSyncReceiver extends AbstractHandler implements Receiver {
+public class InOutSyncReceiver extends AbstractHandler implements MessageReceiver {
/**
* Field log
*/
@@ -87,7 +87,7 @@
MessageContext outMsgContext = provider.invoke(msgContext);
log.info("Invoked the Web Servivces impl");
- Sender sender = new Sender();
+ MessageSender sender = new MessageSender();
sender.send(outMsgContext);
}
}
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -41,7 +41,7 @@
import org.apache.axis.context.SimpleSessionContext;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.EngineRegistryFactory;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPEnvelope;
@@ -55,7 +55,7 @@
/**
* Field engineRegistry
*/
- private EngineRegistry engineRegistry;
+ private EngineConfiguration engineRegistry;
/**
* Field LIST_MULTIPLE_SERVICE_JSP_NAME
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -29,7 +29,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.EngineRegistryFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -52,7 +52,7 @@
/**
* Field engineReg
*/
- protected EngineRegistry engineReg;
+ protected EngineConfiguration engineReg;
/**
* Field serverSocket
@@ -75,7 +75,7 @@
*
* @param reg
*/
- public SimpleHTTPServer(EngineRegistry reg) {
+ public SimpleHTTPServer(EngineConfiguration reg) {
this.engineReg = reg;
}
@@ -243,7 +243,7 @@
*
* @return
*/
- public EngineRegistry getEngineReg() {
+ public EngineConfiguration getEngineReg() {
return engineReg;
}
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -34,7 +34,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
@@ -54,7 +54,7 @@
private SMTPClient client = null;
- private EngineRegistry reg = null;
+ private EngineConfiguration reg = null;
// Current message
private MimeMessage mimeMessage;
@@ -76,7 +76,7 @@
* @param mimeMessage
*/
public MailWorker(SimpleMailListner server, MimeMessage mimeMessage,
- EngineRegistry reg) {
+ EngineConfiguration reg) {
this.server = server;
this.mimeMessage = mimeMessage;
this.reg = reg;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/SimpleMailListner.java Mon Apr 11 03:19:59 2005
@@ -18,7 +18,7 @@
import org.apache.axis.deployment.DeploymentEngine;
import org.apache.axis.engine.AxisEngine;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.pop3.POP3Client;
@@ -64,7 +64,7 @@
private String password;
- private static EngineRegistry er = null;
+ private static EngineConfiguration er = null;
public SimpleMailListner(String host, int port, String userid, String password,
String dir) {
@@ -108,7 +108,7 @@
//This is needed to create the AxisEngine. Have to find out how to get this
// wrking in the class -- CT 07-Feb-2005.
- private static EngineRegistry reg = null;
+ private static EngineConfiguration reg = null;
protected static synchronized AxisEngine getAxisEngine() {
if (myAxisEngine == null) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java Mon Apr 11 03:19:59 2005
@@ -22,9 +22,9 @@
import org.apache.axis.description.Flow;
import org.apache.axis.description.HandlerMetadata;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.Handler;
-import org.apache.axis.engine.Phase;
+import org.apache.axis.engine.SimplePhase;
public class Utils {
@@ -40,7 +40,7 @@
int flowtype)
throws AxisFault {
ArrayList faultchain = new ArrayList();
- Phase p = new Phase(Constants.PHASE_SERVICE);
+ SimplePhase p = new SimplePhase(Constants.PHASE_SERVICE);
faultchain.add(p);
addHandlers(flow, p);
service.setPhases(faultchain, flowtype);
@@ -50,19 +50,19 @@
service,
Constants.PHASE_SERVICE,
service.getInFlow(),
- EngineRegistry.INFLOW);
+ EngineConfiguration.INFLOW);
addPhasesToServiceFromFlow(
service,
Constants.PHASE_SERVICE,
service.getOutFlow(),
- EngineRegistry.OUTFLOW);
+ EngineConfiguration.OUTFLOW);
addPhasesToServiceFromFlow(
service,
Constants.PHASE_SERVICE,
service.getFaultFlow(),
- EngineRegistry.FAULTFLOW);
+ EngineConfiguration.FAULTFLOW);
}
- public static void addHandlers(Flow flow, Phase phase) throws AxisFault {
+ public static void addHandlers(Flow flow, SimplePhase phase) throws AxisFault {
if (flow != null) {
int handlerCount = flow.getHandlerCount();
for (int i = 0; i < handlerCount; i++) {
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -22,7 +22,7 @@
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
import org.apache.axis.description.Flow;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.Provider;
import org.apache.axis.providers.RawXMLProvider;
@@ -37,7 +37,7 @@
public void testDeployment() throws Exception {
String filename = "./target/test-resources/deployment";
DeploymentEngine deploymentEngine = new DeploymentEngine(filename);
- EngineRegistry er = deploymentEngine.start();
+ EngineConfiguration er = deploymentEngine.start();
assertNotNull(er);
assertNotNull(er.getGlobal());
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -21,11 +21,11 @@
import junit.framework.TestCase;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.phaseresolver.PhaseException;
public class DeploymentotalTest extends TestCase {
- EngineRegistry er;
+ EngineConfiguration er;
public void testparseService1() throws PhaseException, DeploymentException, AxisFault, XMLStreamException {
String filename = "./target/test-resources/deployment";
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/deployment/TransportDeploymentTest.java Mon Apr 11 03:19:59 2005
@@ -23,7 +23,7 @@
import org.apache.axis.description.AxisTransportIn;
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.phaseresolver.PhaseException;
public class TransportDeploymentTest extends AbstractTestCase {
@@ -37,7 +37,7 @@
public void testTransports() throws AxisFault, PhaseException, DeploymentException, XMLStreamException {
DeploymentEngine engine = new DeploymentEngine(testResourceDir + "/deployment", "server-transport.xml");
engine.start();
- EngineRegistry er = engine.getEngineRegistry();
+ EngineConfiguration er = engine.getEngineRegistry();
AxisTransportIn transport = er.getTransportIn(new QName("http"));
assertNotNull(transport);
assertNotNull(transport.getInFlow());
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -21,14 +21,14 @@
import org.apache.axis.AbstractTestCase;
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.EngineRegistryImpl;
import org.apache.axis.engine.Handler;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.axis.providers.RawXMLProvider;
public class RegistryTest extends AbstractTestCase {
- private EngineRegistry reg;
+ private EngineConfiguration reg;
public RegistryTest(String testName) {
super(testName);
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -40,7 +40,7 @@
public class EnginePausingTest extends TestCase {
private MessageContext mc;
private ArrayList executedHandlers = new ArrayList();
- private EngineRegistry engineRegistry;
+ private EngineConfiguration engineRegistry;
private QName serviceName = new QName("NullService");
public EnginePausingTest() {
@@ -65,10 +65,10 @@
OMFactory omFac = OMFactory.newInstance();
mc.setEnvelope(omFac.getDefaultEnvelope());
AxisService service = new AxisService(serviceName);
- service.setProvider(new NullProvider());
+ service.setMessageReceiver(new NullProvider());
ArrayList phases = new ArrayList();
- Phase phase = new Phase("1");
+ SimplePhase phase = new SimplePhase("1");
phase.addHandler(new TempHandler(1));
phase.addHandler(new TempHandler(2));
phase.addHandler(new TempHandler(3));
@@ -80,7 +80,7 @@
phase.addHandler(new TempHandler(9));
phases.add(phase);
- phase = new Phase("2");
+ phase = new SimplePhase("2");
phase.addHandler(new TempHandler(10));
phase.addHandler(new TempHandler(11));
phase.addHandler(new TempHandler(12));
@@ -92,7 +92,7 @@
phase.addHandler(new TempHandler(18));
phases.add(phase);
- Phase phase1 = new Phase("3");
+ SimplePhase phase1 = new SimplePhase("3");
phase1.addHandler(new TempHandler(19));
phase1.addHandler(new TempHandler(20));
phase1.addHandler(new TempHandler(21));
@@ -103,7 +103,7 @@
phase1.addHandler(new TempHandler(26));
phase1.addHandler(new TempHandler(27));
phases.add(phase1);
- service.setPhases(phases, EngineRegistry.INFLOW);
+ service.setPhases(phases, EngineConfiguration.INFLOW);
engineRegistry.addService(service);
service.setStyle(WSDLService.STYLE_DOC);
mc.setTo(
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineTest.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineTest.java Mon Apr 11 03:19:59 2005
@@ -40,7 +40,7 @@
public class EngineTest extends TestCase {
private MessageContext mc;
private ArrayList executedHandlers = new ArrayList();
- private EngineRegistry engineRegistry;
+ private EngineConfiguration engineRegistry;
private QName serviceName = new QName("NullService");
public EngineTest() {
@@ -63,7 +63,7 @@
OMFactory omFac = OMFactory.newInstance();
mc.setEnvelope(omFac.getDefaultEnvelope());
AxisService service = new AxisService(serviceName);
- service.setProvider(new NullProvider());
+ service.setMessageReceiver(new NullProvider());
engineRegistry.addService(service);
service.setStyle(WSDLService.STYLE_DOC);
mc.setTo(
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -27,7 +27,7 @@
}
public void testMesssageContext() throws AxisFault {
- EngineRegistry er = new EngineRegistryImpl(new AxisGlobal());
+ EngineConfiguration er = new EngineRegistryImpl(new AxisGlobal());
MessageContext msgctx = new MessageContext(er, null,null,null,null);
msgctx.setEnvelope(OMFactory.newInstance().getDefaultEnvelope());
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceive.java Mon Apr 11 03:19:59 2005
@@ -71,7 +71,7 @@
service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.setServiceClass(Echo.class);
- service.setProvider(new RawXMLProvider());
+ service.setMessageReceiver(new RawXMLProvider());
AxisOperation operation = new AxisOperation(operationName);
service.addOperation(operation);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/clientapi/TestSendReceiveAsync.java Mon Apr 11 03:19:59 2005
@@ -80,7 +80,7 @@
AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.setServiceClass(Echo.class);
- service.setProvider(new RawXMLProvider());
+ service.setMessageReceiver(new RawXMLProvider());
AxisOperation operation = new AxisOperation(operationName);
service.addOperation(operation);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java Mon Apr 11 03:19:59 2005
@@ -42,7 +42,7 @@
private QName operationName = new QName("http://localhost/my", "echoOMElement");
private QName transportName = new QName("http://localhost/my", "NullTransport");
- private EngineRegistry engineRegistry;
+ private EngineConfiguration engineRegistry;
private MessageContext mc;
private Thread thisThread;
private SimpleHTTPServer sas;
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -49,7 +49,7 @@
private QName operationName = new QName("http://localhost/my", "echoOMElement");
private QName transportName = new QName("http://localhost/my", "NullTransport");
- private EngineRegistry engineRegistry;
+ private EngineConfiguration engineRegistry;
private MessageContext mc;
private Thread thisThread;
private SimpleHTTPServer sas;
@@ -69,7 +69,7 @@
AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.setServiceClass(Echo.class);
- service.setProvider(new RawXMLProvider());
+ service.setMessageReceiver(new RawXMLProvider());
AxisOperation operation = new AxisOperation(operationName);
service.addOperation(operation);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java Mon Apr 11 03:19:59 2005
@@ -82,7 +82,7 @@
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className", Echo.class.getName());
service.addParameter(classParam);
- service.setProvider(new RawXMLProvider());
+ service.setMessageReceiver(new RawXMLProvider());
AxisOperation operation = new AxisOperation(operationName);
service.addOperation(operation);
@@ -123,7 +123,7 @@
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className", Echo.class.getName());
service.addParameter(classParam);
- service.setProvider(new RawXMLProvider());
+ service.setMessageReceiver(new RawXMLProvider());
AxisOperation operation = new AxisOperation(operationName);
service.addOperation(operation);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java?view=diff&r1=160853&r2=160854
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java Mon Apr 11 03:19:59 2005
@@ -44,7 +44,7 @@
private QName operationName = new QName("http://ws.apache.org/axis2", "echoVoid");
private QName transportName = new QName("", "NullTransport");
- private EngineRegistry engineRegistry;
+ private EngineConfiguration engineRegistry;
private MessageContext mc;
private Thread thisThread;
private SimpleHTTPServer sas;
@@ -64,7 +64,7 @@
service.setClassLoader(Thread.currentThread().getContextClassLoader());
service.setServiceClass(Echo.class);
- service.setProvider(new SimpleJavaProvider());
+ service.setMessageReceiver(new SimpleJavaProvider());
AxisModule m1 = new AxisModule(new QName("", "A Mdoule 1"));
m1.setInFlow(new MockFlow("service module inflow", 4));
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?view=diff&r1=160853&r2=160854
==============================================================================
--- 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 Mon Apr 11 03:19:59 2005
@@ -18,7 +18,7 @@
import org.apache.axis.description.AxisService;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.engine.EngineConfiguration;
import org.apache.axis.engine.EngineRegistryFactory;
import org.apache.axis.transport.http.SimpleHTTPServer;
@@ -47,7 +47,7 @@
if (count == 0) {
Class erClass = Class.forName("org.apache.axis.deployment.EngineRegistryFactoryImpl");
EngineRegistryFactory erfac = (EngineRegistryFactory)erClass.newInstance();
- EngineRegistry er =
+ EngineConfiguration er =
erfac.createEngineRegistry("target/test-resources/samples/");
try {
Thread.sleep(2000);