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 de...@apache.org on 2005/04/19 05:41:41 UTC
svn commit: r161834 - in
webservices/axis/trunk/java/modules/core/src/org/apache/axis:
deployment/DeploymentEngine.java description/PhasesIncludeImpl.java
phaseresolver/PhaseResolver.java
Author: deepal
Date: Mon Apr 18 20:41:40 2005
New Revision: 161834
URL: http://svn.apache.org/viewcvs?view=rev&rev=161834
Log:
fixed bugs
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
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?view=diff&r1=161833&r2=161834
==============================================================================
--- 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 Mon Apr 18 20:41:40 2005
@@ -322,13 +322,20 @@
addFlowHandlers(outFlow);
}
- Flow faultFlow = serviceMetaData.getFaultInFlow();
- if (faultFlow != null) {
- addFlowHandlers(faultFlow);
+ Flow faultInFlow = serviceMetaData.getFaultInFlow();
+ if (faultInFlow != null) {
+ addFlowHandlers(faultInFlow);
}
+
+ Flow faultOutFlow = serviceMetaData.getFaultOutFlow();
+ if (faultOutFlow != null) {
+ addFlowHandlers(faultOutFlow);
+ }
+
+
ServiceContext serviceContext = new ServiceContext(serviceMetaData);
- PhaseResolver reolve = new PhaseResolver(engineconfig, serviceMetaData,serviceContext);
- reolve.buildchains();
+ PhaseResolver reolve = new PhaseResolver(engineconfig,serviceContext);
+ serviceContext = reolve.buildchains();
serviceMetaData.setClassLoader(currentFileItem.getClassLoader());
return serviceContext;
}
@@ -439,14 +446,17 @@
log.info("Invalid service" + currentFileItem.getName());
log.info("DeploymentException " + de);
serviceStatus = "Error:\n" + de.getMessage();
+ de.printStackTrace();
} catch (AxisFault axisFault) {
log.info("Invalid service" + currentFileItem.getName());
log.info("AxisFault " + axisFault);
serviceStatus = "Error:\n" + axisFault.getMessage();
+ axisFault.printStackTrace();
} catch (Exception e) {
log.info("Invalid service" + currentFileItem.getName());
log.info("Exception " + e);
serviceStatus = "Error:\n" + e.getMessage();
+ e.printStackTrace();
} finally {
if (serviceStatus.startsWith("Error:")) {
engineconfig.getFaulytServices().put(getAxisServiceName(currentFileItem.getName()), serviceStatus);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java?view=diff&r1=161833&r2=161834
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/PhasesIncludeImpl.java Mon Apr 18 20:41:40 2005
@@ -35,9 +35,11 @@
private ArrayList outflow;
/**
- * Field faultflow
+ * Field faultInflow
*/
- private ArrayList faultflow;
+ private ArrayList faultInflow;
+
+ private ArrayList faultOutflow;
/**
* Method getPhases
@@ -52,7 +54,9 @@
} else if (flow == EngineConfiguration.OUTFLOW) {
return outflow;
} else if (flow == EngineConfiguration.FAULT_IN_FLOW) {
- return faultflow;
+ return faultInflow;
+ } else if (flow == EngineConfiguration.FAULT_OUT_FLOW) {
+ return faultOutflow;
} else {
throw new AxisFault("Unknown type flow ");
}
@@ -71,7 +75,9 @@
} else if (flow == EngineConfiguration.OUTFLOW) {
outflow = phases;
} else if (flow == EngineConfiguration.FAULT_IN_FLOW) {
- faultflow = phases;
+ faultInflow = phases;
+ }else if (flow == EngineConfiguration.FAULT_OUT_FLOW) {
+ faultOutflow = phases;
} else {
throw new AxisFault("Unknown type flow ");
}
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=161833&r2=161834
==============================================================================
--- 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 18 20:41:40 2005
@@ -40,9 +40,9 @@
*/
public class PhaseResolver {
/**
- * Field engineRegistry
+ * Field engineConfig
*/
- private final EngineConfiguration engineRegistry;
+ private final EngineConfiguration engineConfig;
/**
* Field axisService
@@ -59,22 +59,22 @@
/**
* default constructor , to obuild chains for AxisGlobal
*
- * @param engineRegistry
+ * @param engineConfig
*/
- public PhaseResolver(EngineConfiguration engineRegistry) {
- this.engineRegistry = engineRegistry;
+ public PhaseResolver(EngineConfiguration engineConfig) {
+ this.engineConfig = engineConfig;
}
/**
* Constructor PhaseResolver
*
- * @param engineRegistry
- * @param axisService
+ * @param engineConfig
+ * @param serviceContext
*/
- public PhaseResolver(EngineConfiguration engineRegistry,
- AxisService axisService,ServiceContext serviceContext) {
- this.engineRegistry = engineRegistry;
- this.axisService = axisService;
+ public PhaseResolver(EngineConfiguration engineConfig,
+ ServiceContext serviceContext) {
+ this.engineConfig = engineConfig;
+ this.axisService = serviceContext.getServiceConfig();
this.serviceContext = serviceContext;
}
@@ -84,10 +84,11 @@
* @throws PhaseException
* @throws AxisFault
*/
- public void buildchains() throws PhaseException, AxisFault {
- for (int i = 1; i < 4; i++) {
+ public ServiceContext buildchains() throws PhaseException, AxisFault {
+ for (int i = 1; i < 5; i++) {
buildExcutionChains(i);
}
+ return this.serviceContext;
}
/**
@@ -115,7 +116,7 @@
* //adding server specific handlers . global
* for(int intA=0 ; intA < count; intA ++){
* moduleName = server.getModule(intA);
- * module = engineRegistry.getModule(moduleName);
+ * module = engineConfig.getModule(moduleName);
* switch (flowtype){
* case 1 : {
* flow = module.getInFlow();
@@ -151,7 +152,7 @@
// Vector modules = (Vector)axisService.getModules();
// for (int i = 0; i < modules.size(); i++) {
// QName moduleref = (QName) modules.elementAt(i);
- module = engineRegistry.getModule(moduleref);
+ module = engineConfig.getModule(moduleref);
switch (flowtype) {
case PhaseMetadata.IN_FLOW:
{
@@ -219,7 +220,7 @@
allHandlers.add(metadata);
}
}
- phaseHolder = new PhaseHolder(engineRegistry, axisService,serviceContext);
+ phaseHolder = new PhaseHolder(engineConfig, axisService,serviceContext);
phaseHolder.setFlowType(flowtype);
for (int i = 0; i < allHandlers.size(); i++) {
HandlerMetadata handlerMetaData =
@@ -235,8 +236,8 @@
* @throws PhaseException
*/
public void buildTranspotsChains() throws PhaseException {
- HashMap axisTransportIn = engineRegistry.getTransportsIn();
- HashMap axisTransportOut = engineRegistry.getTransportsOut();
+ HashMap axisTransportIn = engineConfig.getTransportsIn();
+ HashMap axisTransportOut = engineConfig.getTransportsOut();
Collection colintrnsport = axisTransportIn.values();
for (Iterator iterator = colintrnsport.iterator();
@@ -258,7 +259,7 @@
throws PhaseException {
Flow flow = null;
for (int type = 1; type < 4; type++) {
- phaseHolder = new PhaseHolder(engineRegistry);
+ phaseHolder = new PhaseHolder(engineConfig);
phaseHolder.setFlowType(type);
switch (type) {
case PhaseMetadata.IN_FLOW:
@@ -298,7 +299,7 @@
throws PhaseException {
Flow flow = null;
for (int type = 1; type < 4; type++) {
- phaseHolder = new PhaseHolder(engineRegistry);
+ phaseHolder = new PhaseHolder(engineConfig);
phaseHolder.setFlowType(type);
switch (type) {
case PhaseMetadata.OUT_FLOW:
@@ -343,11 +344,11 @@
AxisModule module;
Flow flow = null;
for (int type = 1; type < 4; type++) {
- phaseHolder = new PhaseHolder(engineRegistry);
+ phaseHolder = new PhaseHolder(engineConfig);
phaseHolder.setFlowType(type);
for (int intA = 0; intA < count; intA++) {
moduleName = (QName) modules.get(intA);
- module = engineRegistry.getModule(moduleName);
+ module = engineConfig.getModule(moduleName);
switch (type) {
case PhaseMetadata.IN_FLOW:
{