You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/07/25 11:45:44 UTC
svn commit: r224705 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/description/
core/src/org/apache/axis2/phaseresolver/
core/src/org/apache/axis2/transport/http/ samples/test/org/apache/axis2...
Author: deepal
Date: Mon Jul 25 02:44:06 2005
New Revision: 224705
URL: http://svn.apache.org/viewcvs?rev=224705&view=rev
Log:
fix some problems in adding operation by module
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=224705&r1=224704&r2=224705&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Mon Jul 25 02:44:06 2005
@@ -402,7 +402,7 @@
ModuleDescription module = axisConfig.getModule(
(QName) list.get(i));
if (module != null) {
- serviceMetaData.engageModule(module);
+ serviceMetaData.engageModule(module,axisConfig);
} else {
throw new DeploymentException(
"Service " +
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java?rev=224705&r1=224704&r2=224705&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ServiceDescription.java Mon Jul 25 02:44:06 2005
@@ -20,6 +20,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.phaseresolver.PhaseResolver;
import org.apache.wsdl.WSDLBindingOperation;
import org.apache.wsdl.WSDLEndpoint;
@@ -96,7 +97,7 @@
* @param moduleref
* @throws AxisFault
*/
- public void engageModule(ModuleDescription moduleref) throws AxisFault {
+ public void engageModule(ModuleDescription moduleref , AxisConfiguration axisConfig) throws AxisFault {
if (moduleref == null) {
return;
}
@@ -114,7 +115,7 @@
}
}
- new PhaseResolver().engageModuleToService(this, moduleref);
+ new PhaseResolver(axisConfig).engageModuleToService(this, moduleref);
Collection collectionModule = (Collection) this.getComponentProperty(
MODULEREF_KEY);
collectionModule.add(moduleref);
@@ -125,9 +126,10 @@
*
* @param module
*/
- public void addModuleOperations(ModuleDescription module) {
+ public void addModuleOperations(ModuleDescription module ,AxisConfiguration axisConfig) {
HashMap map = module.getOperations();
Collection col = map.values();
+ PhaseResolver pr = new PhaseResolver(axisConfig, this);
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
OperationDescription operation = (OperationDescription) iterator.next();
this.addOperation(operation);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java?rev=224705&r1=224704&r2=224705&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseResolver.java Mon Jul 25 02:44:06 2005
@@ -96,6 +96,17 @@
}
/**
+ * To build the opration for the opeartion which the module going to be added
+ * @param opartion <code>OperationDescription</code>
+ * @throws AxisFault
+ */
+ public void buildModuleOperation(OperationDescription opartion) throws AxisFault {
+ for (int i = 1; i < 5; i++) {
+ buildExcutionChains(i, opartion);
+ }
+ }
+
+ /**
* this opeartion is used to build all the three cahins ,
* so type varible is used to difrenciate them
* type = 1 inflow
@@ -346,7 +357,7 @@
Collection serviceCol = services.values();
for (Iterator iterator = serviceCol.iterator(); iterator.hasNext();) {
ServiceDescription serviceDescription = (ServiceDescription) iterator.next();
- serviceDescription.addModuleOperations(module);
+ serviceDescription.addModuleOperations(module,axisConfig);
engageModuleToServiceFromGlobal(serviceDescription, module);
serviceDescription.addToEngagModuleList(module);
}
@@ -535,7 +546,7 @@
HashMap opeartions = service.getOperations();
Collection opCol = opeartions.values();
boolean engaged = false;
- service.addModuleOperations(module);
+ service.addModuleOperations(module,axisConfig);
for (Iterator iterator = opCol.iterator(); iterator.hasNext();) {
OperationDescription opDesc = (OperationDescription) iterator.next();
Collection modules = opDesc.getModules();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=224705&r1=224704&r2=224705&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Mon Jul 25 02:44:06 2005
@@ -319,7 +319,7 @@
new QName(serviceName))
.engageModule(
configContext.getAxisConfiguration().getModule(
- new QName(moduleName)));
+ new QName(moduleName)),configContext.getAxisConfiguration());
req.getSession().setAttribute(Constants.ENGAGE_STATUS,
moduleName +
" module engaged to the service Successfully");
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java?rev=224705&r1=224704&r2=224705&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java Mon Jul 25 02:44:06 2005
@@ -69,7 +69,8 @@
new QName("", "A Mdoule 1"));
m1.setInFlow(new MockFlow("service module inflow", 4));
//m1.setFaultInFlow(new MockFlow("service module faultflow", 1));
- service.engageModule(m1);
+ engineRegistry = new AxisConfigurationImpl();
+ service.engageModule(m1,engineRegistry);
OperationDescription operation = new OperationDescription(
operationName);