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/04/11 14:29:16 UTC
svn commit: r160867 - in
webservices/axis/trunk/java/modules/core/src/org/apache/axis:
deployment/DeploymentConstants.java deployment/DeploymentEngine.java
deployment/DeploymentParser.java deployment/repository/utill/HDFileItem.java
deployment/repository/utill/UnZipJAR.java deployment/server.xml
engine/EngineConfiguration.java
Author: deepal
Date: Mon Apr 11 05:29:13 2005
New Revision: 160867
URL: http://svn.apache.org/viewcvs?view=rev&rev=160867
Log: (empty)
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.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/deployment/repository/utill/HDFileItem.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfiguration.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java?view=diff&r1=160866&r2=160867
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentConstants.java Mon Apr 11 05:29:13 2005
@@ -35,7 +35,8 @@
String OPRATIONST = "operation";// operation start tag
String INFLOWST = "inflow";// inflow start tag
String OUTFLOWST = "outflow";// outflowr start tag
- String FAILTFLOWST = "faultflow";// faultflow start tag
+ String IN_FAILTFLOW = "INfaultflow";// faultflow start tag
+ String OUT_FAILTFLOW = "Outfaultflow";// faultflow start tag
// String FOLDE_NAME = "D:/Axis 2.0/projects/Deployement/test-data";
String MODULE_PATH = "/modules/";
@@ -78,6 +79,8 @@
String TRANSPORTTAG = "transport";
String TRANSPORTSENDER = "transportSender";
String TRANSPORTRECEIVER = "transportReceiver";
+
+ String MESSAGERECEIVER = "messageReceiver";
String HOTDEPLOYMENT = "hotdeployment";
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=160866&r2=160867
==============================================================================
--- 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 11 05:29:13 2005
@@ -291,7 +291,7 @@
* @throws PhaseException
*/
private AxisService getRunnableService(AxisService serviceMetaData) throws AxisFault, PhaseException {
- loadServiceClass(serviceMetaData);
+ loadMessageReceiver(serviceMetaData);
Flow inflow = serviceMetaData.getInFlow();
if (inflow != null) {
addFlowHandlers(inflow);
@@ -313,21 +313,15 @@
}
- private void loadServiceClass(AxisService service) throws AxisFault {
- Class serviceclass = null;
+ private void loadMessageReceiver(AxisService service) throws AxisFault {
+ Class messageReceiver = null;
ClassLoader loader1 = currentFileItem.getClassLoader();
try {
service.setClassLoader(loader1);
- String readInClass = currentFileItem.getClassName();
+ String readInClass = currentFileItem.getMessgeReceiver();
if (readInClass != null && !"".equals(readInClass)) {
- serviceclass = Class.forName(currentFileItem.getClassName(), true, loader1);
- }
- service.setServiceClass(serviceclass);
- String readInProviderName = currentFileItem.getProvideName();
- if (readInProviderName != null && !"".equals(readInProviderName)) {
- Class provider = Class.forName(currentFileItem.getProvideName(), true, loader1);
-
- service.setMessageReceiver((Provider) provider.newInstance());
+ messageReceiver = Class.forName(readInClass, true, loader1);
+ service.setMessageReceiver((MessageReceiver)messageReceiver.newInstance());
}
} catch (Exception e) {
throw new AxisFault(e.getMessage(), e);
@@ -510,7 +504,7 @@
currentFileItem = new HDFileItem(SERVICE, servieName);
currentFileItem.setClassLoader(classLoder);
service = new AxisService();
- DeploymentParser schme = new DeploymentParser(serviceStream, this, "");
+ DeploymentParser schme = new DeploymentParser(serviceStream, this);
schme.parseServiceXML(service);
service = getRunnableService(service);
} catch (XMLStreamException e) {
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?view=diff&r1=160866&r2=160867
==============================================================================
--- 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 Mon Apr 11 05:29:13 2005
@@ -16,30 +16,20 @@
package org.apache.axis.deployment;
-import java.io.InputStream;
-import java.util.ArrayList;
+import org.apache.axis.description.*;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineConfigurationImpl;
+import org.apache.axis.phaseresolver.PhaseException;
+import org.apache.axis.transport.TransportReceiver;
+import org.apache.axis.transport.TransportSender;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
-import org.apache.axis.description.AxisTransportIn;
-import org.apache.axis.description.AxisTransportOut;
-import org.apache.axis.description.Flow;
-import org.apache.axis.description.FlowImpl;
-import org.apache.axis.description.HandlerMetadata;
-import org.apache.axis.description.Parameter;
-import org.apache.axis.description.ParameterImpl;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.phaseresolver.PhaseException;
-import org.apache.axis.transport.TransportReceiver;
-import org.apache.axis.transport.TransportSender;
+import java.io.InputStream;
+import java.util.ArrayList;
/**
@@ -56,11 +46,6 @@
private static final String MODULEXMLST = "module";
// service.xml strating tag
private static final String SERVICEXMLST = "service";
- //to get the input stream
- private InputStream inputStream;
- // Referance to XMLPullPasrser
-
- // private XmlPullParser pullparser;
private XMLStreamReader pullparser;
@@ -68,25 +53,14 @@
* referebce to the deployment engine
*/
private DeploymentEngine dpengine;
- private String archiveName;
/**
* constructor to parce service.xml
*
* @param inputStream
* @param engine
- * @param fileName
*/
- public DeploymentParser(InputStream inputStream, DeploymentEngine engine, String fileName) throws XMLStreamException {
- this.inputStream = inputStream;
- this.dpengine = engine;
- this.archiveName = fileName;
- pullparser = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
- }
-
-
public DeploymentParser(InputStream inputStream, DeploymentEngine engine) throws XMLStreamException {
- this.inputStream = inputStream;
this.dpengine = engine;
pullparser = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
}
@@ -95,12 +69,10 @@
//To check whether document end tag has encountered
boolean END_DOCUMENT = false;
// ServiceMetaData service = null;
-
try {
while (!END_DOCUMENT) {
int eventType = pullparser.next();
if (eventType == XMLStreamConstants.END_DOCUMENT) {
- // document end tag met , break the loop
END_DOCUMENT = true;
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String ST = pullparser.getLocalName();
@@ -108,8 +80,7 @@
procesServiceXML(axisService);
axisService.setName(new QName(getAxisServiceName(dpengine.getCurrentFileItem().getServiceName())));
}
- //processStartElement();
- break;//todo this has to be chenfed only for testng
+ break;
}
}
} catch (XMLStreamException e) {
@@ -154,29 +125,29 @@
}
}
} else if (PHASE_ORDER.equals(ST)) {
- int attribCount = pullparser.getAttributeCount();
+ int attribCount = pullparser.getAttributeCount();
if (attribCount > 0) {
for (int i = 0; i < attribCount; i++) {
String attname = pullparser.getAttributeLocalName(i);
String attvalue = pullparser.getAttributeValue(i);
if (TYPE.equals(attname)) {
if(INFLOWST.equals(attvalue)){
- dpengine.getEngineconfig().setInPhases(processPhaseOrder());
+ ((EngineConfigurationImpl)dpengine.getEngineconfig()).setInPhases(processPhaseOrder());
} else if (OUTFLOWST.equals(attvalue)){
- dpengine.getEngineconfig().setOutPhases(processPhaseOrder());
- } else if (FAILTFLOWST.equals(attvalue)){
- dpengine.getEngineconfig().setFaultPhases(processPhaseOrder());
- } else {
- throw new DeploymentException("un defined flow type " + ST);
+ ((EngineConfigurationImpl)dpengine.getEngineconfig()).setOutPhases(processPhaseOrder());
+ } else if (IN_FAILTFLOW.equals(attvalue)){
+ ((EngineConfigurationImpl)dpengine.getEngineconfig()).setInFaultPhases(processPhaseOrder());
+ }else if (OUT_FAILTFLOW.equals(attvalue)){
+ ((EngineConfigurationImpl)dpengine.getEngineconfig()).setOutFaultPhases(processPhaseOrder());
+ }
+ else {
+ throw new DeploymentException("un defined flow type " + ST);
}
}
}
} else {
throw new DeploymentException("Flow type is a required attribute in " + ST);
}
- //((EngineRegistryImpl) dpengine.getEngineconfig()).setPhases(processPhaseOrder());
- } else if (SERVERST.equals(ST)) {
- //TODO process attributes
} else {
throw new UnsupportedOperationException(ST + " element is not allowed in the server.xml");
}
@@ -193,30 +164,29 @@
AxisTransportIn transportin = null;
String attname = pullparser.getAttributeLocalName(0);
String attvalue = pullparser.getAttributeValue(0);
-
+
int attribCount = pullparser.getAttributeCount();
- for (int i = 0; i < attribCount; i++) {
- attname = pullparser.getAttributeLocalName(i);
- attvalue = pullparser.getAttributeValue(i);
- if (ATTNAME.equals(attname)) {
- transportin = new AxisTransportIn(new QName(attvalue));
- } else if (transportin != null && CLASSNAME.equals(attname)) {
- Class reciever = null;
- try {
- reciever = Class.forName(attvalue, true, Thread.currentThread().getContextClassLoader());
- TransportReceiver trnsrecievr = (TransportReceiver) reciever.newInstance();
- transportin.setReciver(trnsrecievr);
- } catch (ClassNotFoundException e) {
- throw new DeploymentException(e.getMessage());
- } catch (IllegalAccessException e) {
- throw new DeploymentException(e.getMessage());
- } catch (InstantiationException e) {
- throw new DeploymentException(e.getMessage());
- }
- }
- }
+ for (int i = 0; i < attribCount; i++) {
+ attname = pullparser.getAttributeLocalName(i);
+ attvalue = pullparser.getAttributeValue(i);
+ if (ATTNAME.equals(attname)) {
+ transportin = new AxisTransportIn(new QName(attvalue));
+ } else if (transportin != null && CLASSNAME.equals(attname)) {
+ Class reciever = null;
+ try {
+ reciever = Class.forName(attvalue, true, Thread.currentThread().getContextClassLoader());
+ TransportReceiver trnsrecievr = (TransportReceiver) reciever.newInstance();
+ transportin.setReciver(trnsrecievr);
+ } catch (ClassNotFoundException e) {
+ throw new DeploymentException(e.getMessage());
+ } catch (IllegalAccessException e) {
+ throw new DeploymentException(e.getMessage());
+ } catch (InstantiationException e) {
+ throw new DeploymentException(e.getMessage());
+ }
+ }
+ }
boolean END_TRANSPORTS = false;
- String text = ""; // to store the paramater elemnt
try {
while (!END_TRANSPORTS) {
int eventType = pullparser.next();
@@ -232,7 +202,7 @@
transportin.setInFlow(inFlow);
} else if (transportin != null && OUTFLOWST.equals(tagnae)) {
throw new DeploymentException("OUTFlow dose not support in AxisTransportIN " + tagnae);
- } else if (transportin != null && FAILTFLOWST.equals(tagnae)) {
+ } else if (transportin != null && IN_FAILTFLOW.equals(tagnae)) {
Flow faultFlow = processFaultFlow();
transportin.setFaultFlow(faultFlow);
} else {
@@ -244,8 +214,6 @@
END_TRANSPORTS = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -282,7 +250,6 @@
}
}
boolean END_TRANSPORTS = false;
- String text = ""; // to store the paramater elemnt
try {
while (!END_TRANSPORTS) {
int eventType = pullparser.next();
@@ -298,7 +265,7 @@
} else if (transportout != null && OUTFLOWST.equals(tagnae)) {
Flow outFlow = processOutFlow();
transportout.setOutFlow(outFlow);
- } else if (transportout != null && FAILTFLOWST.equals(tagnae)) {
+ } else if (transportout != null && IN_FAILTFLOW.equals(tagnae)) {
Flow faultFlow = processFaultFlow();
transportout.setFaultFlow(faultFlow);
} else {
@@ -310,8 +277,6 @@
END_TRANSPORTS = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -327,11 +292,15 @@
*/
private void procesServiceXML(AxisService axisService) throws DeploymentException {
int attribCount = pullparser.getAttributeCount();
+ boolean foundMR = false;
if (attribCount >= 1) {
for (int i = 0; i < attribCount; i++) {
String attname = pullparser.getAttributeLocalName(i);
String attvalue = pullparser.getAttributeValue(i);
- if (STYLENAME.equals(attname)) {
+ if(MESSAGERECEIVER.equals(attname)) {
+ dpengine.getCurrentFileItem().setMessgeReceiver(attvalue);
+ foundMR = true;
+ } else if (STYLENAME.equals(attname)) {
axisService.setStyle(attvalue);
} else if (CONTEXTPATHNAME.equals(attname)) {
axisService.setContextPath(getValue(attvalue));
@@ -341,6 +310,9 @@
}
} else
throw new DeploymentException("Bad arguments" + axisService.getName());
+ if(! foundMR ) {
+ throw new DeploymentException("Message Receiver dose not specify " + axisService.getName());
+ }
//*********************************************************************************************//
// This is to process remainng part of the document
@@ -357,23 +329,10 @@
break;
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String ST = pullparser.getLocalName(); //Staring tag name
-
if (PARAMETERST.equals(ST)) {
Parameter parameter = processParameter();
axisService.addParameter(parameter);
//axisService. .appParameter(parameter);
- } else if (JAVAIMPL.equals(ST)) {
- if (JAVAST.equals(pullparser.getNamespaceURI())) {
- attribCount = pullparser.getAttributeCount();
- if (attribCount > 0) {
- for (int i = 0; i < attribCount; i++) {
- String attvalue = pullparser.getAttributeValue(i);
- dpengine.getCurrentFileItem().setClassName(attvalue);
- }
- }
- } else {
- throw new UnsupportedOperationException("Illegal namespace");
- }
} else if (TYPEMAPPINGST.equals(ST)) {
throw new UnsupportedOperationException();
// todo this should implemnt latter
@@ -391,7 +350,7 @@
} else if (OUTFLOWST.equals(ST)) {
Flow outFlow = processOutFlow();
axisService.setOutFlow(outFlow);
- } else if (FAILTFLOWST.equals(ST)) {
+ } else if (IN_FAILTFLOW.equals(ST)) {
Flow faultFlow = processFaultFlow();
axisService.setFaultFlow(faultFlow);
} else if (MODULEST.equals(ST)) {
@@ -514,8 +473,6 @@
}
boolean END_HANDLER = false;
- String element = ""; // to store the paramater elemnt
- //todo this should change to support xsdany
try {
while (!END_HANDLER) {
int eventType = pullparser.next();
@@ -566,8 +523,6 @@
END_HANDLER = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- element += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -591,7 +546,6 @@
//todo complete this method
// and modify to return a type mapping object
boolean END_TYPEMAPPING = false;
- String text = ""; // to store the paramater elemnt
try {
while (!END_TYPEMAPPING) {
int eventType = pullparser.next();
@@ -605,8 +559,6 @@
END_TYPEMAPPING = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -643,8 +595,6 @@
}
boolean END_OPERATION = false;
- String text = ""; // to store the paramater elemnt
-//todo this should change to support xsdany
try {
while (!END_OPERATION) {
int eventType = pullparser.next();
@@ -656,7 +606,7 @@
String ST = pullparser.getLocalName();
if (MODULEXMLST.equals(ST)) {
throw new UnsupportedOperationException("nexted elements are not allowed for M1");
- } else if (FAILTFLOWST.equals(ST)) {
+ } else if (IN_FAILTFLOW.equals(ST)) {
throw new UnsupportedOperationException("nexted elements are not allowed for M1");
} else if (INFLOWST.equals(ST)) {
throw new UnsupportedOperationException("nexted elements are not allowed for M1");
@@ -670,8 +620,6 @@
END_OPERATION = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -692,7 +640,6 @@
//todo complete this method
// and modify to return a type mapping object
boolean END_BEANMAPPING = false;
- String text = ""; // to store the paramater elemnt
try {
while (!END_BEANMAPPING) {
int eventType = pullparser.next();
@@ -706,8 +653,6 @@
END_BEANMAPPING = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -745,7 +690,6 @@
}
}
boolean END_MODULE = false;
- String text = ""; // to store the paramater elemnt
try {
while (!END_MODULE) {
int eventType = pullparser.next();
@@ -758,7 +702,7 @@
if (PARAMETERST.equals(ST)) {
Parameter parameter = processParameter();
module.addParameter(parameter);
- } else if (FAILTFLOWST.equals(ST)) {
+ } else if (IN_FAILTFLOW.equals(ST)) {
Flow faultFlow = processFaultFlow();
module.setFaultFlow(faultFlow);
} else if (INFLOWST.equals(ST)) {
@@ -778,8 +722,6 @@
END_MODULE = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -793,7 +735,6 @@
public Flow processInFlow() throws DeploymentException {
Flow inFlow = new FlowImpl();
boolean END_INFLOW = false;
- String text = ""; // to store the paramater elemnt
try {
while (!END_INFLOW) {
pullparser.next();
@@ -816,8 +757,6 @@
END_INFLOW = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -832,7 +771,6 @@
public Flow processOutFlow() throws DeploymentException {
Flow outFlow = new FlowImpl();
boolean END_OUTFLOW = false;
- String text = ""; // to store the paramater elemnt
try {
while (!END_OUTFLOW) {
int eventType = pullparser.next();
@@ -854,8 +792,6 @@
END_OUTFLOW = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -871,7 +807,6 @@
public Flow processFaultFlow() throws DeploymentException {
Flow faultFlow = new FlowImpl();
boolean END_FAULTFLOW = false;
- String text = ""; // to store the paramater elemnt
try {
while (!END_FAULTFLOW) {
int eventType = pullparser.next();
@@ -889,12 +824,10 @@
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
- if (FAILTFLOWST.equals(endtagname)) {
+ if (IN_FAILTFLOW.equals(endtagname)) {
END_FAULTFLOW = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -909,7 +842,6 @@
public ArrayList processPhaseOrder() throws DeploymentException {
boolean END_PHASEORDER = false;
ArrayList pahseList = new ArrayList();
- String text = ""; // to store the paramater elemnt
try {
while (!END_PHASEORDER) {
int eventType = pullparser.next();
@@ -932,8 +864,6 @@
END_PHASEORDER = true;
break;
}
- } else if (eventType == XMLStreamConstants.CHARACTERS) {
- text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java?view=diff&r1=160866&r2=160867
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/HDFileItem.java Mon Apr 11 05:29:13 2005
@@ -32,8 +32,7 @@
private ClassLoader classLoader;
private File file = null;
private int type;
- private String className;
- private String provideName;
+ private String messgeReceiver;
private String name;
public HDFileItem(int type, String name) {
@@ -41,20 +40,12 @@
this.name = name;
}
- public String getClassName() {
- return className;
+ public String getMessgeReceiver() {
+ return messgeReceiver;
}
- public void setClassName(String className) {
- this.className = className;
- }
-
- public String getProvideName() {
- return provideName;
- }
-
- public void setProvideName(String provideName) {
- this.provideName = provideName;
+ public void setMessgeReceiver(String messgeReceiver) {
+ this.messgeReceiver = messgeReceiver;
}
public HDFileItem(File file, int type) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java?view=diff&r1=160866&r2=160867
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/UnZipJAR.java Mon Apr 11 05:29:13 2005
@@ -48,7 +48,7 @@
while ((entry = zin.getNextEntry()) != null) {
if (entry.getName().equals(SERVICEXML)) {
foundServiceXML = true;
- DeploymentParser schme = new DeploymentParser(zin, engine, filename);
+ DeploymentParser schme = new DeploymentParser(zin, engine);
schme.parseServiceXML(service);
break;
}
@@ -73,7 +73,7 @@
while ((entry = zin.getNextEntry()) != null) {
if (entry.getName().equals(MODULEXML)) {
foundmoduleXML = true;
- DeploymentParser schme = new DeploymentParser(zin, engine, filename);
+ DeploymentParser schme = new DeploymentParser(zin, engine);
schme.procesModuleXML(module);
break;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml?view=diff&r1=160866&r2=160867
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/server.xml Mon Apr 11 05:29:13 2005
@@ -20,7 +20,13 @@
<phase name="Logging"/>
<phase name="service"/>
</phaseOrder>
- <phaseOrder type="faultflow">
+ <phaseOrder type="INfaultflow">
+ <phase name="global"/>
+ <phase name="transport"/>
+ <phase name="Logging"/>
+ <phase name="service"/>
+ </phaseOrder>
+ <phaseOrder type="Outfaultflow">
<phase name="global"/>
<phase name="transport"/>
<phase name="Logging"/>
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfiguration.java?view=diff&r1=160866&r2=160867
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfiguration.java Mon Apr 11 05:29:13 2005
@@ -103,17 +103,13 @@
* @throws AxisFault
*/
public HashMap getTransports() throws AxisFault;
- /**
- * To store the order of the phases
- * @param inPhases
- */
+
+
public ArrayList getInPhases();
public ArrayList getOutPhases();
public ArrayList getInFaultPhases() ;
public ArrayList getOutFaultPhases();
-
-
/**
* Method getServices
*
@@ -128,6 +124,7 @@
public void addTransportIn(AxisTransportIn transport) throws AxisFault;
public AxisTransportOut getTransportOut(QName name) throws AxisFault ;
public void addTransportOut(AxisTransportOut transport) throws AxisFault ;
+
public HashMap getTransportsIn();
public HashMap getTransportsOut();