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 2004/12/13 12:28:27 UTC
svn commit: r111703 - in webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis: deployment deployment/metadata/phaserule engine
Author: deepal
Date: Mon Dec 13 03:28:26 2004
New Revision: 111703
URL: http://svn.apache.org/viewcvs?view=rev&rev=111703
Log:
phase resolving is done after adding the axisService
to Engineregistry
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseHolder.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseResolver.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&rev=111703&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r1=111702&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r2=111703
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java Mon Dec 13 03:28:26 2004
@@ -1,6 +1,5 @@
package org.apache.axis.deployment;
-import org.apache.axis.context.MessageContext;
import org.apache.axis.deployment.metadata.ServerMetaData;
import org.apache.axis.deployment.metadata.phaserule.PhaseException;
import org.apache.axis.deployment.metadata.phaserule.PhaseResolver;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseHolder.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseHolder.java?view=diff&rev=111703&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseHolder.java&r1=111702&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseHolder.java&r2=111703
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseHolder.java Mon Dec 13 03:28:26 2004
@@ -2,10 +2,10 @@
import org.apache.axis.deployment.DeploymentConstants;
import org.apache.axis.deployment.metadata.ServerMetaData;
-import org.apache.axis.description.HandlerMetaData;
import org.apache.axis.description.AxisService;
+import org.apache.axis.description.HandlerMetaData;
import org.apache.axis.engine.ExecutionChain;
-import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Phase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -126,48 +126,46 @@
OrderdPhases();
Vector tempHander = new Vector();
HandlerMetaData[] handlers;
- for (int i = 0; i < phaseholder.size(); i++) {
- PhaseMetaData phase = (PhaseMetaData) phaseholder.elementAt(i);
- handlers = phase.getOrderedHandlers();
-
- for (int j = 0; j < handlers.length; j++) {
- tempHander.add(handlers[j]);
- }
-
- }
- HandlerMetaData[] handler = new HandlerMetaData[tempHander.size()];
- for (int i = 0; i < tempHander.size(); i++) {
- handler[i] = (HandlerMetaData) tempHander.elementAt(i);
-
- }
switch (chainType) {
case 1 : {
ExecutionChain inChain = new ExecutionChain();// service.getExecutableInChain();
- for (int i = 0; i < handler.length; i++) {
- HandlerMetaData handlerMetaData = handler[i];
- inChain.addHandler(handlerMetaData.getHandler());
- log.info("Phase Name " + handlerMetaData.getRules().getPhaseName() );
+ for (int i = 0; i < phaseholder.size(); i++) {
+ PhaseMetaData phase = (PhaseMetaData) phaseholder.elementAt(i);
+ Phase axisPhase = new Phase(phase.getName());
+ handlers = phase.getOrderedHandlers();
+ for (int j = 0; j < handlers.length; j++) {
+ axisPhase.addHandler(handlers[j].getHandler());
+ }
+ inChain.addPhase(axisPhase);
}
- service.setExecutableInChain(inChain);
+ service.setExecutableInChain(inChain);
break;
}
case 2 : {
ExecutionChain outChain =new ExecutionChain();// service.getExecutableOutChain();
- for (int i = 0; i < handler.length; i++) {
- HandlerMetaData handlerMetaData = handler[i];
- outChain.addHandler(handlerMetaData.getHandler());
- log.info("Phase Name " + handlerMetaData.getRules().getPhaseName() );
+ for (int i = 0; i < phaseholder.size(); i++) {
+ PhaseMetaData phase = (PhaseMetaData) phaseholder.elementAt(i);
+ Phase axisPhase = new Phase(phase.getName());
+ handlers = phase.getOrderedHandlers();
+ for (int j = 0; j < handlers.length; j++) {
+ axisPhase.addHandler(handlers[j].getHandler());
+ }
+ outChain.addPhase(axisPhase);
}
service.setExecutableOutChain(outChain);
break;
}
case 3 : {
ExecutionChain faultChain = new ExecutionChain();//service.getExecutableFaultChain();
- for (int i = 0; i < handler.length; i++) {
- HandlerMetaData handlerMetaData = handler[i];
- faultChain.addHandler(handlerMetaData.getHandler());
- log.info("Phase Name " + handlerMetaData.getRules().getPhaseName() );
+ for (int i = 0; i < phaseholder.size(); i++) {
+ PhaseMetaData phase = (PhaseMetaData) phaseholder.elementAt(i);
+ Phase axisPhase = new Phase(phase.getName());
+ handlers = phase.getOrderedHandlers();
+ for (int j = 0; j < handlers.length; j++) {
+ axisPhase.addHandler(handlers[j].getHandler());
+ }
+ faultChain.addPhase(axisPhase);
}
service.setExecutableFaultChain(faultChain);
break;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseResolver.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseResolver.java?view=diff&rev=111703&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseResolver.java&r1=111702&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseResolver.java&r2=111703
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/metadata/phaserule/PhaseResolver.java Mon Dec 13 03:28:26 2004
@@ -1,13 +1,13 @@
package org.apache.axis.deployment.metadata.phaserule;
-import org.apache.axis.engine.EngineRegistry;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.deployment.DeploymentEngine;
+import org.apache.axis.deployment.metadata.ServerMetaData;
import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisService;
import org.apache.axis.description.Flow;
import org.apache.axis.description.HandlerMetaData;
-import org.apache.axis.deployment.metadata.ServerMetaData;
-import org.apache.axis.deployment.DeploymentEngine;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineRegistry;
import javax.xml.namespace.QName;
import java.util.Vector;
@@ -32,6 +32,7 @@
* 5:27:11 PM
*/
public class PhaseResolver {
+
private EngineRegistry engineRegistry ;
private AxisService axisService;
private PhaseHolder phaseHolder ;
@@ -46,7 +47,7 @@
public void buildchains() throws PhaseException, AxisFault {
for(int i =1 ; i < 4 ; i++) {
- buildExcutionChains(i);
+ buildExcutionChains(i);
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java?view=diff&rev=111703&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java&r1=111702&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java&r2=111703
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/ExecutionChain.java Mon Dec 13 03:28:26 2004
@@ -34,19 +34,6 @@
phases = new HashMap();
executionList = new ArrayList();
}
-
- /**
- * to add handler directly to list ,
- * for teh execution chain , it is no need to rember about phases :)
- * @param handler
- *
- * addded by Deepal
- */
-
- public void addHandler(Handler handler){
- executionList.add(handler);
- }
-
public void addPhase(Phase phase) {
phases.put(phase.getPhaseName(), phase);
executionList.add(phase);