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 gd...@apache.org on 2005/07/11 19:49:08 UTC
svn commit: r210165 [3/20] - in /webservices/axis/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/util/
core/src/org/apache/axis2/a...
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentParser.java Mon Jul 11 10:48:55 2005
@@ -17,7 +17,16 @@
package org.apache.axis2.deployment;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.Flow;
+import org.apache.axis2.description.FlowImpl;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfigurationImpl;
import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.MessageReceiver;
@@ -67,7 +76,9 @@
public DeploymentParser(InputStream inputStream, DeploymentEngine engine)
throws XMLStreamException {
this.dpengine = engine;
- pullparser = XMLInputFactory.newInstance().createXMLStreamReader(inputStream);
+ pullparser =
+ XMLInputFactory.newInstance().createXMLStreamReader(
+ inputStream);
}
public void parseServiceXML(ServiceDescription axisService) throws DeploymentException {
@@ -95,7 +106,8 @@
/**
* To process axis2.xml
*/
- public void processGlobalConfig(AxisConfigurationImpl axisGlobal, String starttag)
+ public void processGlobalConfig(AxisConfigurationImpl axisGlobal,
+ String starttag)
throws DeploymentException {
String START_TAG = starttag;
try {
@@ -120,11 +132,13 @@
TransportInDescription transportin = proccessTrasnsportIN();
dpengine.getAxisConfig().addTransportIn(transportin);
} else if (TYPEMAPPINGST.equals(ST)) {
- throw new UnsupportedOperationException("Type Mappings are not allowed in axis2.xml");
+ throw new UnsupportedOperationException(
+ "Type Mappings are not allowed in axis2.xml");
} else if (MESSAGERECEIVER.equals(ST)) {
int attribCount = pullparser.getAttributeCount();
if (attribCount == 2) {
- String attname = pullparser.getAttributeLocalName(0);
+ String attname = pullparser.getAttributeLocalName(
+ 0);
String attvalue = pullparser.getAttributeValue(0);
if (MEP.equals(attname)) {
String name = attvalue;
@@ -134,35 +148,50 @@
try {
Class messageReceiver = null;
ClassLoader loader1 =
- Thread.currentThread().getContextClassLoader();
- if (attvalue != null && !"".equals(attvalue)) {
+ Thread.currentThread()
+ .getContextClassLoader();
+ if (attvalue != null &&
+ !"".equals(attvalue)) {
messageReceiver =
- Class.forName(attvalue, true, loader1);
+ Class.forName(attvalue,
+ true,
+ loader1);
axisGlobal.addMessageReceiver(name,
- (MessageReceiver) messageReceiver.newInstance());
+ (MessageReceiver) messageReceiver.newInstance());
}
} catch (ClassNotFoundException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
} catch (IllegalAccessException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
} catch (InstantiationException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
}
} else
- throw new UnsupportedOperationException("invalid attributes in axis2.xml (messageReceiver elemet) "
- + attname);
+ throw new UnsupportedOperationException(
+ "invalid attributes in axis2.xml (messageReceiver elemet) "
+ + attname);
} else
- throw new UnsupportedOperationException("invalid attributes in axis2.xml (messageReceiver elemet) "
- + attname);
+ throw new UnsupportedOperationException(
+ "invalid attributes in axis2.xml (messageReceiver elemet) "
+ + attname);
} else
- throw new UnsupportedOperationException("invalid attributes in axis2.xml (messageReceiver elemet)");
+ throw new UnsupportedOperationException(
+ "invalid attributes in axis2.xml (messageReceiver elemet)");
} else if (MODULEST.equals(ST)) {
int attribCount = pullparser.getAttributeCount();
if (attribCount > 0) {
for (int i = 0; i < attribCount; i++) {
- String attname = pullparser.getAttributeLocalName(i);
- String attvalue = pullparser.getAttributeValue(i);
+ String attname = pullparser.getAttributeLocalName(
+ i);
+ String attvalue = pullparser.getAttributeValue(
+ i);
if (REF.equals(attname)) {
dpengine.addModule(new QName(attvalue));
// DeploymentData.getInstance().addModule(new QName(attvalue));
@@ -174,27 +203,36 @@
PhasesInfo info = dpengine.getPhasesinfo();
if (attribCount > 0) {
for (int i = 0; i < attribCount; i++) {
- String attname = pullparser.getAttributeLocalName(i);
- String attvalue = pullparser.getAttributeValue(i);
+ String attname = pullparser.getAttributeLocalName(
+ i);
+ String attvalue = pullparser.getAttributeValue(
+ i);
if (TYPE.equals(attname)) {
if (INFLOWST.equals(attvalue)) {
info.setINPhases(processPhaseOrder());
} else if (OUTFLOWST.equals(attvalue)) {
info.setOUTPhases(processPhaseOrder());
} else if (IN_FAILTFLOW.equals(attvalue)) {
- info.setIN_FaultPhases(processPhaseOrder());
+ info.setIN_FaultPhases(
+ processPhaseOrder());
} else if (OUT_FAILTFLOW.equals(attvalue)) {
- info.setOUT_FaultPhases(processPhaseOrder());
+ info.setOUT_FaultPhases(
+ processPhaseOrder());
} else {
- throw new DeploymentException("un defined flow type " + ST);
+ throw new DeploymentException(
+ "un defined flow type " + ST);
}
}
}
} else {
- throw new DeploymentException("Flow type is a required attribute in " + ST);
+ throw new DeploymentException(
+ "Flow type is a required attribute in " +
+ ST);
}
} else {
- throw new UnsupportedOperationException(ST + " element is not allowed in the axis2.xml");
+ throw new UnsupportedOperationException(
+ ST +
+ " element is not allowed in the axis2.xml");
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -227,8 +265,9 @@
try {
receiverClass =
Class.forName(attvalue,
- true,
- Thread.currentThread().getContextClassLoader());
+ true,
+ Thread.currentThread()
+ .getContextClassLoader());
TransportListener receiver = (TransportListener) receiverClass.newInstance();
transportin.setReceiver(receiver);
} catch (ClassNotFoundException e) {
@@ -255,12 +294,16 @@
Flow inFlow = processInFlow();
transportin.setInFlow(inFlow);
} else if (transportin != null && OUTFLOWST.equals(tagnae)) {
- throw new DeploymentException("OUTFlow dose not support in AxisTransportIN " + tagnae);
- } else if (transportin != null && IN_FAILTFLOW.equals(tagnae)) {
+ throw new DeploymentException(
+ "OUTFlow dose not support in AxisTransportIN " +
+ tagnae);
+ } else if (transportin != null &&
+ IN_FAILTFLOW.equals(tagnae)) {
Flow faultFlow = processInFaultFlow();
transportin.setFaultFlow(faultFlow);
} else {
- throw new DeploymentException("Unknown element " + tagnae);
+ throw new DeploymentException(
+ "Unknown element " + tagnae);
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -287,14 +330,16 @@
attname = pullparser.getAttributeLocalName(i);
attvalue = pullparser.getAttributeValue(i);
if (ATTNAME.equals(attname)) {
- transportout = new TransportOutDescription(new QName(attvalue));
+ transportout =
+ new TransportOutDescription(new QName(attvalue));
} else if (transportout != null && CLASSNAME.equals(attname)) {
Class sender = null;
try {
sender =
Class.forName(attvalue,
- true,
- Thread.currentThread().getContextClassLoader());
+ true,
+ Thread.currentThread()
+ .getContextClassLoader());
TransportSender transportSender = (TransportSender) sender.newInstance();
transportout.setSender(transportSender);
} catch (ClassNotFoundException e) {
@@ -318,15 +363,20 @@
Parameter parameter = processParameter();
transportout.addParameter(parameter);
} else if (transportout != null && INFLOWST.equals(tagnae)) {
- throw new DeploymentException("InFlow dose not support in TransportOutDescription " + tagnae);
- } else if (transportout != null && OUTFLOWST.equals(tagnae)) {
+ throw new DeploymentException(
+ "InFlow dose not support in TransportOutDescription " +
+ tagnae);
+ } else if (transportout != null &&
+ OUTFLOWST.equals(tagnae)) {
Flow outFlow = processOutFlow();
transportout.setOutFlow(outFlow);
- } else if (transportout != null && OUT_FAILTFLOW.equals(tagnae)) {
+ } else if (transportout != null &&
+ OUT_FAILTFLOW.equals(tagnae)) {
Flow faultFlow = processOutFaultFlow();
transportout.setFaultFlow(faultFlow);
} else {
- throw new DeploymentException("Unknown element " + tagnae);
+ throw new DeploymentException(
+ "Unknown element " + tagnae);
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -355,19 +405,31 @@
String attvalue = pullparser.getAttributeValue(i);
if (ATQNAME.equals(attname)) {
if (attvalue == null || attvalue.trim().equals("")) {
- axisService.setName(new QName(getAxisServiceName(dpengine.getCurrentFileItem().getServiceName())));
+ axisService.setName(
+ new QName(
+ getAxisServiceName(
+ dpengine.getCurrentFileItem()
+ .getServiceName())));
} else {
axisService.setName(new QName(attvalue));
}
} else {
- throw new DeploymentException(attname
- + " Bad arguments for the service"
- + getAxisServiceName(dpengine.getCurrentFileItem().getServiceName()));
+ throw new DeploymentException(
+ attname
+ + " Bad arguments for the service"
+ +
+ getAxisServiceName(
+ dpengine.getCurrentFileItem()
+ .getServiceName()));
}
}
} else {
//if user dose not specify the service name then the default name will be the archive name
- axisService.setName(new QName(getAxisServiceName(dpengine.getCurrentFileItem().getServiceName())));
+ axisService.setName(
+ new QName(
+ getAxisServiceName(
+ dpengine.getCurrentFileItem()
+ .getServiceName())));
}
boolean END_DOCUMENT = false;
try {
@@ -387,13 +449,16 @@
String desc = processDescription();
axisService.setServiceDescription(desc);
} else if (TYPEMAPPINGST.equals(ST)) {
- throw new UnsupportedOperationException("Type mapping dose not implemented yet ");
+ throw new UnsupportedOperationException(
+ "Type mapping dose not implemented yet ");
// processTypeMapping();
} else if (BEANMAPPINGST.equals(ST)) {
- throw new UnsupportedOperationException("Bean mapping dose not implemented yet ");
+ throw new UnsupportedOperationException(
+ "Bean mapping dose not implemented yet ");
// processBeanMapping();
} else if (OPRATIONST.equals(ST)) {
- OperationDescription operation = processOperation(axisService);
+ OperationDescription operation = processOperation(
+ axisService);
PhasesInfo info = dpengine.getPhasesinfo();
info.setOperationPhases(operation);
// DeploymentData.getInstance().setOperationPhases(operation);
@@ -403,18 +468,27 @@
* Setting default Message Recive as Message Reciever
*/
ClassLoader loader1 =
- Thread.currentThread().getContextClassLoader();
+ Thread.currentThread()
+ .getContextClassLoader();
Class messageReceiver =
- Class.forName("org.apache.axis2.receivers.RawXMLINOutMessageReceiver",
- true,
- loader1);
- operation.setMessageReciever((MessageReceiver) messageReceiver.newInstance());
+ Class.forName(
+ "org.apache.axis2.receivers.RawXMLINOutMessageReceiver",
+ true,
+ loader1);
+ operation.setMessageReciever(
+ (MessageReceiver) messageReceiver.newInstance());
} catch (ClassNotFoundException e) {
- throw new DeploymentException("Error in loading messageReceivers " + e.getMessage());
+ throw new DeploymentException(
+ "Error in loading messageReceivers " +
+ e.getMessage());
} catch (IllegalAccessException e) {
- throw new DeploymentException("Error in loading messageReceivers " + e.getMessage());
+ throw new DeploymentException(
+ "Error in loading messageReceivers " +
+ e.getMessage());
} catch (InstantiationException e) {
- throw new DeploymentException("Error in loading messageReceivers " + e.getMessage());
+ throw new DeploymentException(
+ "Error in loading messageReceivers " +
+ e.getMessage());
}
}
axisService.addOperation(operation);
@@ -434,21 +508,28 @@
attribCount = pullparser.getAttributeCount();
if (attribCount > 0) {
for (int i = 0; i < attribCount; i++) {
- String attname = pullparser.getAttributeLocalName(i);
- String attvalue = pullparser.getAttributeValue(i);
+ String attname = pullparser.getAttributeLocalName(
+ i);
+ String attvalue = pullparser.getAttributeValue(
+ i);
if (REF.equals(attname)) {
- if (dpengine.getModule(new QName(attvalue)) == null) {
- throw new DeploymentException(ST
- + " module is invalid or dose not have bean deployed");
+ if (dpengine.getModule(new QName(attvalue)) ==
+ null) {
+ throw new DeploymentException(
+ ST
+ +
+ " module is invalid or dose not have bean deployed");
} else {
- dpengine.getCurrentFileItem().addModule(new QName(attvalue));
+ dpengine.getCurrentFileItem()
+ .addModule(new QName(attvalue));
}
}
}
}
} else {
- throw new DeploymentException("parser Exception : un supported element" + ST);
+ throw new DeploymentException(
+ "parser Exception : un supported element" + ST);
}
}
}
@@ -559,17 +640,22 @@
handler.setClassName(attvalue);
} else if (ATTNAME.equals(attname)) {
if (ref_name) {
- throw new DeploymentException("Hanlder canot have both name and ref " + attvalue);
+ throw new DeploymentException(
+ "Hanlder canot have both name and ref " +
+ attvalue);
} else {
handler.setName(new QName(attvalue));
ref_name = true;
}
} else if (REF.equals(attname)) {
if (ref_name) {
- throw new DeploymentException("Hanlder canot have both name and ref " + attvalue);
+ throw new DeploymentException(
+ "Hanlder canot have both name and ref " +
+ attvalue);
} else {
ref_name = true;
- throw new UnsupportedOperationException("This should be implmented");
+ throw new UnsupportedOperationException(
+ "This should be implmented");
}
}
}
@@ -587,7 +673,8 @@
if (ORDER.equals(tagnae)) {
attribCount = pullparser.getAttributeCount();
for (int i = 0; i < attribCount; i++) {
- String attname = pullparser.getAttributeLocalName(i);
+ String attname = pullparser.getAttributeLocalName(
+ i);
String attvalue = pullparser.getAttributeValue(i);
if (AFTER.equals(attname)) {
@@ -617,7 +704,9 @@
Parameter parameter = processParameter();
handler.addParameter(parameter);
} else {
- throw new DeploymentException("parser Exception : un supported element" + tagnae);
+ throw new DeploymentException(
+ "parser Exception : un supported element" +
+ tagnae);
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -667,7 +756,8 @@
}
}
- private OperationDescription processOperation(ServiceDescription axisService) throws DeploymentException {
+ private OperationDescription processOperation(
+ ServiceDescription axisService) throws DeploymentException {
// String name = pullparser.getLocalName();
OperationDescription operation = null; //= new OperationDescription();
int attribCount = pullparser.getAttributeCount();
@@ -682,13 +772,16 @@
if (operation == null) {
operation = new OperationDescription();
operation.setName(new QName(attvalue));
- log.info(attvalue + " Operation Name not found in WSDL");
+ log.info(
+ attvalue +
+ " Operation Name not found in WSDL");
}
} else if (MEP.equals(attname)) {
operation.setMessageExchangePattern(attvalue);
} else
- throw new DeploymentException("bad attribute in operation " + attname);
+ throw new DeploymentException(
+ "bad attribute in operation " + attname);
}
}
boolean END_OPERATION = false;
@@ -703,14 +796,20 @@
attribCount = pullparser.getAttributeCount();
if (attribCount > 0) {
for (int i = 0; i < attribCount; i++) {
- String attname = pullparser.getAttributeLocalName(i);
- String attvalue = pullparser.getAttributeValue(i);
+ String attname = pullparser.getAttributeLocalName(
+ i);
+ String attvalue = pullparser.getAttributeValue(
+ i);
if (REF.equals(attname)) {
- if (dpengine.getModule(new QName(attvalue)) == null) {
- throw new DeploymentException(ST
- + " module is invalid or dose not have bean deployed");
+ if (dpengine.getModule(new QName(attvalue)) ==
+ null) {
+ throw new DeploymentException(
+ ST
+ +
+ " module is invalid or dose not have bean deployed");
} else {
- operation.addModule(new QName(attvalue));
+ operation.addModule(
+ new QName(attvalue));
}
}
}
@@ -719,35 +818,53 @@
Parameter parameter = processParameter();
operation.addParameter(parameter);
} else if (IN_FAILTFLOW.equals(ST)) {
- throw new UnsupportedOperationException("nexted elements are not allowed for M1");
+ 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");
+ throw new UnsupportedOperationException(
+ "nexted elements are not allowed for M1");
} else if (OUTFLOWST.equals(ST)) {
- throw new UnsupportedOperationException("nexted elements are not allowed for M1");
+ throw new UnsupportedOperationException(
+ "nexted elements are not allowed for M1");
} else if (MESSAGERECEIVER.equals(ST)) {
attribCount = pullparser.getAttributeCount();
if (attribCount > 0) {
- String attname = pullparser.getAttributeLocalName(0);
+ String attname = pullparser.getAttributeLocalName(
+ 0);
String attvalue = pullparser.getAttributeValue(0);
if (CLASSNAME.equals(attname)) {
try {
Class messageReceiver = null;
- ClassLoader loader1 = dpengine.getCurrentFileItem().getClassLoader();
+ ClassLoader loader1 = dpengine.getCurrentFileItem()
+ .getClassLoader();
// ClassLoader loader1 =
// Thread.currentThread().getContextClassLoader();
- if (attvalue != null && !"".equals(attvalue)) {
- messageReceiver = Class.forName(attvalue, true, loader1);
- operation.setMessageReciever((MessageReceiver) messageReceiver.newInstance());
+ if (attvalue != null &&
+ !"".equals(attvalue)) {
+ messageReceiver =
+ Class.forName(attvalue,
+ true,
+ loader1);
+ operation.setMessageReciever(
+ (MessageReceiver) messageReceiver.newInstance());
}
} catch (ClassNotFoundException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
} catch (IllegalAccessException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
} catch (InstantiationException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
}
} else {
- throw new UnsupportedOperationException(attname + " is not allowed in messageRecievr element");
+ throw new UnsupportedOperationException(
+ attname +
+ " is not allowed in messageRecievr element");
}
}
}
@@ -808,7 +925,9 @@
if (ATTNAME.equals(attname)) {
if (ref_name) {
- throw new DeploymentException("Module canot have both name and ref " + attvalue);
+ throw new DeploymentException(
+ "Module canot have both name and ref " +
+ attvalue);
} else {
module.setName(new QName(attvalue));
ref_name = true;
@@ -818,11 +937,14 @@
dpengine.getCurrentFileItem().setModuleClass(attvalue);
} else if (REF.equals(attname)) {
if (ref_name) {
- throw new DeploymentException("Module canot have both name and ref " + attvalue);
+ throw new DeploymentException(
+ "Module canot have both name and ref " +
+ attvalue);
} else {
// module.setRef(attvalue);
ref_name = true;
- throw new UnsupportedOperationException("This should be implemented");
+ throw new UnsupportedOperationException(
+ "This should be implemented");
}
}
}
@@ -866,23 +988,33 @@
* Setting default Message Recive as Message Reciever
*/
ClassLoader loader1 =
- Thread.currentThread().getContextClassLoader();
+ Thread.currentThread()
+ .getContextClassLoader();
Class messageReceiver =
- Class.forName("org.apache.axis2.receivers.RawXMLINOutMessageReceiver",
- true,
- loader1);
- operation.setMessageReciever((MessageReceiver) messageReceiver.newInstance());
+ Class.forName(
+ "org.apache.axis2.receivers.RawXMLINOutMessageReceiver",
+ true,
+ loader1);
+ operation.setMessageReciever(
+ (MessageReceiver) messageReceiver.newInstance());
} catch (ClassNotFoundException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
} catch (IllegalAccessException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
} catch (InstantiationException e) {
- throw new DeploymentException("Error in loading messageReceivers ", e);
+ throw new DeploymentException(
+ "Error in loading messageReceivers ",
+ e);
}
}
module.addOperation(operation);
} else {
- throw new UnsupportedOperationException(ST + "elment is not allowed in module.xml");
+ throw new UnsupportedOperationException(
+ ST + "elment is not allowed in module.xml");
}
// complete implenatation
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
@@ -918,7 +1050,9 @@
HandlerDescription handler = processHandler();
inFlow.addHandler(handler);
} else {
- throw new DeploymentException("parser Exception : un supported element" + tagnae);
+ throw new DeploymentException(
+ "parser Exception : un supported element" +
+ tagnae);
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -952,7 +1086,9 @@
HandlerDescription handler = processHandler();
outFlow.addHandler(handler);
} else {
- throw new DeploymentException("parser Exception : un supported element" + tagnae);
+ throw new DeploymentException(
+ "parser Exception : un supported element" +
+ tagnae);
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -987,7 +1123,9 @@
HandlerDescription handler = processHandler();
faultFlow.addHandler(handler);
} else {
- throw new DeploymentException("parser Exception : un supported element" + tagnae);
+ throw new DeploymentException(
+ "parser Exception : un supported element" +
+ tagnae);
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -1021,7 +1159,9 @@
HandlerDescription handler = processHandler();
faultFlow.addHandler(handler);
} else {
- throw new DeploymentException("parser Exception : un supported element" + tagnae);
+ throw new DeploymentException(
+ "parser Exception : un supported element" +
+ tagnae);
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -1056,7 +1196,9 @@
pahseList.add(attvalue);
}
} else {
- throw new DeploymentException("parser Exception : un supported element" + tagnae);
+ throw new DeploymentException(
+ "parser Exception : un supported element" +
+ tagnae);
}
} else if (eventType == XMLStreamConstants.END_ELEMENT) {
String endtagname = pullparser.getLocalName();
@@ -1127,7 +1269,8 @@
// module.setArchiveName(archiveName);
// module.setName(archiveName);
} else {
- throw new DeploymentException("parser Exception : un supported element" + ST);
+ throw new DeploymentException(
+ "parser Exception : un supported element" + ST);
}
//processStartElement();
break;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/listener/RepositoryListenerImpl.java Mon Jul 11 10:48:55 2005
@@ -24,7 +24,8 @@
import java.util.ArrayList;
import java.util.List;
-public class RepositoryListenerImpl implements RepositoryListener, DeploymentConstants {
+public class RepositoryListenerImpl implements RepositoryListener,
+ DeploymentConstants {
/**
* to store curreently checking jars
@@ -49,7 +50,8 @@
* @param folderName path to parent directory that the listener should listent
* @param deploy_engine refearnce to engine registry inorder to inform the updates
*/
- public RepositoryListenerImpl(String folderName, DeploymentEngine deploy_engine) {
+ public RepositoryListenerImpl(String folderName,
+ DeploymentEngine deploy_engine) {
this.folderName = folderName;
wsinfoList = new WSInfoList(deploy_engine);
init();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveFileData.java Mon Jul 11 10:48:55 2005
@@ -106,11 +106,13 @@
URL[] urlsToLoadFrom = new URL[0];
try {
if (!file.exists()) {
- throw new RuntimeException("file not found !!!!!!!!!!!!!!!");
+ throw new RuntimeException(
+ "file not found !!!!!!!!!!!!!!!");
}
URLs.add(file.toURL());
urlsToLoadFrom = new URL[]{file.toURL()};
- classLoader = new DeploymentClassLoader(urlsToLoadFrom, parent);
+ classLoader =
+ new DeploymentClassLoader(urlsToLoadFrom, parent);
// classLoader = new URLClassLoader(urlsToLoadFrom, parent);
} catch (Exception e) {
throw new AxisFault(e);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Mon Jul 11 10:48:55 2005
@@ -30,7 +30,11 @@
import org.apache.commons.logging.LogFactory;
import org.apache.wsdl.WSDLDescription;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
import java.util.Iterator;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -81,13 +85,18 @@
boolean foundservice = false;
try {
if (in != null) {
- WOMBuilder builder = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11);
- WSDLVersionWrapper wsdlVersionWrapper = builder.build(in, new AxisDescWSDLComponentFactory());
+ WOMBuilder builder = WOMBuilderFactory.getBuilder(
+ WOMBuilderFactory.WSDL11);
+ WSDLVersionWrapper wsdlVersionWrapper = builder.build(in,
+ new AxisDescWSDLComponentFactory());
WSDLDescription womDescription = wsdlVersionWrapper.getDescription();
- Iterator iterator = womDescription.getServices().keySet().iterator();
+ Iterator iterator = womDescription.getServices().keySet()
+ .iterator();
if (iterator.hasNext()) {
foundservice = true;
- service = (ServiceDescription) womDescription.getServices().get(iterator.next());
+ service =
+ (ServiceDescription) womDescription.getServices()
+ .get(iterator.next());
}
if (!foundservice) {
service = new ServiceDescription();
@@ -96,7 +105,9 @@
in.close();
} else {
service = new ServiceDescription();
- log.info("WSDL file not found for the service : " + file.getName());
+ log.info(
+ "WSDL file not found for the service : " +
+ file.getName());
}
} catch (Exception e) {
throw new DeploymentException(e);
@@ -113,7 +124,9 @@
* @param engine
*/
- public void readServiceArchive(String filename, DeploymentEngine engine, ServiceDescription service) throws DeploymentException {
+ public void readServiceArchive(String filename,
+ DeploymentEngine engine,
+ ServiceDescription service) throws DeploymentException {
// get attribute values
boolean foundServiceXML = false;
String strArchive = filename;
@@ -138,7 +151,9 @@
}
}
- public void readModuleArchive(String filename, DeploymentEngine engine, ModuleDescription module) throws DeploymentException {
+ public void readModuleArchive(String filename,
+ DeploymentEngine engine,
+ ModuleDescription module) throws DeploymentException {
// get attribute values
boolean foundmoduleXML = false;
String strArchive = filename;
@@ -157,7 +172,9 @@
// zin.closeEntry();
zin.close();
if (!foundmoduleXML) {
- throw new DeploymentException("module.xml not found for the module : " + strArchive);
+ throw new DeploymentException(
+ "module.xml not found for the module : " +
+ strArchive);
}
} catch (Exception e) {
throw new DeploymentException(e.getMessage());
@@ -173,7 +190,8 @@
* @return
* @throws DeploymentException
*/
- public File creatModuleArchivefromResource(String moduleName, String axis2repository) throws DeploymentException {
+ public File creatModuleArchivefromResource(String moduleName,
+ String axis2repository) throws DeploymentException {
File modulearchiveFile = null;
File modules = null;
try {
@@ -208,12 +226,14 @@
byte data[] = new byte[BUFFER];
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- InputStream in = cl.getResourceAsStream("modules/" + moduleName + ".mar");
+ InputStream in = cl.getResourceAsStream(
+ "modules/" + moduleName + ".mar");
if (in == null) {
in = cl.getResourceAsStream("modules/" + moduleName + ".jar");
}
if (in == null) {
- throw new DeploymentException(moduleName + " module is not found");
+ throw new DeploymentException(
+ moduleName + " module is not found");
}
ZipInputStream zin = null;
zin = new ZipInputStream(in);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/WSInfoList.java Mon Jul 11 10:48:55 2005
@@ -71,18 +71,26 @@
case SERVICE:
{
if (!isFileExist(file.getName())) { // chacking whether the file is already deployed
- WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), SERVICE);
+ WSInfo wsInfo = new WSInfo(file.getName(),
+ file.lastModified(),
+ SERVICE);
jarlist.add(wsInfo);
- ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE);
+ ArchiveFileData archiveFileData = new ArchiveFileData(
+ file, SERVICE);
deplorer.addtowsToDeploy(archiveFileData);//to inform that new web service is deployed
} else {
if (deplorer.isHotUpdate()) {
WSInfo tempWSInfo = getFileItem(file.getName());
if (isModified(file, tempWSInfo)) { // caheck whether file is updated
- tempWSInfo.setLastmodifieddate(file.lastModified());
- WSInfo wsInfo = new WSInfo(tempWSInfo.getFilename(), tempWSInfo.getLastmodifieddate(), SERVICE);
+ tempWSInfo.setLastmodifieddate(
+ file.lastModified());
+ WSInfo wsInfo = new WSInfo(
+ tempWSInfo.getFilename(),
+ tempWSInfo.getLastmodifieddate(),
+ SERVICE);
deplorer.addtowstoUnDeploy(wsInfo); // add entry to undeploy list
- ArchiveFileData archiveFileData = new ArchiveFileData(file, SERVICE);
+ ArchiveFileData archiveFileData = new ArchiveFileData(
+ file, SERVICE);
deplorer.addtowsToDeploy(archiveFileData); // add entry to deploylist
}
@@ -93,18 +101,26 @@
case MODULE:
{
if (!isFileExist(file.getName())) { // chacking whether the file is already deployed
- WSInfo wsInfo = new WSInfo(file.getName(), file.lastModified(), MODULE);
+ WSInfo wsInfo = new WSInfo(file.getName(),
+ file.lastModified(),
+ MODULE);
jarlist.add(wsInfo);
- ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE);
+ ArchiveFileData archiveFileData = new ArchiveFileData(
+ file, MODULE);
deplorer.addtowsToDeploy(archiveFileData);//to inform that new web service is deployed
} else {
if (deplorer.isHotUpdate()) {
WSInfo tempWSInfo = getFileItem(file.getName());
if (isModified(file, tempWSInfo)) {
- tempWSInfo.setLastmodifieddate(file.lastModified());
- WSInfo wsInfo = new WSInfo(tempWSInfo.getFilename(), tempWSInfo.getLastmodifieddate(), MODULE);
+ tempWSInfo.setLastmodifieddate(
+ file.lastModified());
+ WSInfo wsInfo = new WSInfo(
+ tempWSInfo.getFilename(),
+ tempWSInfo.getLastmodifieddate(),
+ MODULE);
deplorer.addtowstoUnDeploy(wsInfo); // add entry to undeploy list
- ArchiveFileData archiveFileData = new ArchiveFileData(file, MODULE);
+ ArchiveFileData archiveFileData = new ArchiveFileData(
+ file, MODULE);
deplorer.addtowsToDeploy(archiveFileData); // add entry to deploylist
}
@@ -187,7 +203,8 @@
if (!exist) {
tempvector.add(fileitem);
- WSInfo wsInfo = new WSInfo(fileitem.getFilename(), fileitem.getLastmodifieddate());
+ WSInfo wsInfo = new WSInfo(fileitem.getFilename(),
+ fileitem.getLastmodifieddate());
deplorer.addtowstoUnDeploy(wsInfo);//this is to be undeploye
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/Scheduler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/Scheduler.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/Scheduler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/scheduler/Scheduler.java Mon Jul 11 10:48:55 2005
@@ -30,7 +30,8 @@
private DeploymentIterator iterator;
- public SchedulerTimerTask(SchedulerTask schedulerTask, DeploymentIterator iterator) {
+ public SchedulerTimerTask(SchedulerTask schedulerTask,
+ DeploymentIterator iterator) {
this.schedulerTask = schedulerTask;
this.iterator = iterator;
}
@@ -52,7 +53,8 @@
* scheduler was cancelled, or scheduler thread terminated.
*/
- public void schedule(SchedulerTask schedulerTask, DeploymentIterator iterator) {
+ public void schedule(SchedulerTask schedulerTask,
+ DeploymentIterator iterator) {
Date time = iterator.next();
if (time == null) {
@@ -67,7 +69,8 @@
}
}
- private void reschedule(SchedulerTask schedulerTask, DeploymentIterator iterator) {
+ private void reschedule(SchedulerTask schedulerTask,
+ DeploymentIterator iterator) {
Date time = iterator.next();
if (time == null) {
schedulerTask.cancel();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java Mon Jul 11 10:48:55 2005
@@ -75,7 +75,8 @@
public ArrayList getOperationInPhases() {
oprationINPhases = new ArrayList();
- oprationINPhases.add(new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
+ oprationINPhases.add(
+ new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
for (int i = 0; i < INPhases.size(); i++) {
String phaseName = (String) INPhases.get(i);
if (PhaseMetadata.PHASE_TRANSPORTIN.equals(phaseName) ||
@@ -100,7 +101,8 @@
oprationOUTPhases.add(new Phase(phaseName));
}
}
- oprationOUTPhases.add(new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
+ oprationOUTPhases.add(
+ new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
oprationOUTPhases.add(new Phase(PhaseMetadata.PHASE_MESSAGE_OUT));
return oprationOUTPhases;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/AxisDescWSDLComponentFactory.java Mon Jul 11 10:48:55 2005
@@ -1,10 +1,40 @@
package org.apache.axis2.description;
import org.apache.axis2.wsdl.builder.WSDLComponentFactory;
-import org.apache.wsdl.*;
+import org.apache.wsdl.MessageReference;
+import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingFault;
+import org.apache.wsdl.WSDLBindingMessageReference;
+import org.apache.wsdl.WSDLBindingOperation;
+import org.apache.wsdl.WSDLDescription;
+import org.apache.wsdl.WSDLEndpoint;
+import org.apache.wsdl.WSDLExtensibilityAttribute;
+import org.apache.wsdl.WSDLFaultReference;
+import org.apache.wsdl.WSDLFeature;
+import org.apache.wsdl.WSDLImport;
+import org.apache.wsdl.WSDLInclude;
+import org.apache.wsdl.WSDLInterface;
+import org.apache.wsdl.WSDLOperation;
+import org.apache.wsdl.WSDLProperty;
+import org.apache.wsdl.WSDLService;
+import org.apache.wsdl.WSDLTypes;
import org.apache.wsdl.extensions.ExtensionFactory;
import org.apache.wsdl.extensions.impl.ExtensionFactoryImpl;
-import org.apache.wsdl.impl.*;
+import org.apache.wsdl.impl.MessageReferenceImpl;
+import org.apache.wsdl.impl.WSDLBindingFaultImpl;
+import org.apache.wsdl.impl.WSDLBindingImpl;
+import org.apache.wsdl.impl.WSDLBindingMessageReferenceImpl;
+import org.apache.wsdl.impl.WSDLBindingOperationImpl;
+import org.apache.wsdl.impl.WSDLDescriptionImpl;
+import org.apache.wsdl.impl.WSDLEndpointImpl;
+import org.apache.wsdl.impl.WSDLExtensibilityAttributeImpl;
+import org.apache.wsdl.impl.WSDLFaultReferenceImpl;
+import org.apache.wsdl.impl.WSDLFeatureImpl;
+import org.apache.wsdl.impl.WSDLImportImpl;
+import org.apache.wsdl.impl.WSDLIncludeImpl;
+import org.apache.wsdl.impl.WSDLInterfaceImpl;
+import org.apache.wsdl.impl.WSDLPropertyImpl;
+import org.apache.wsdl.impl.WSDLTypesImpl;
/**
* @author chathura@opensource.lk
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/OperationDescription.java Mon Jul 11 10:48:55 2005
@@ -1,6 +1,10 @@
package org.apache.axis2.description;
-import org.apache.axis2.context.*;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.OperationContextFactory;
+import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.engine.AxisError;
import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.MessageReceiver;
@@ -40,7 +44,8 @@
this.setComponentProperty(MODULEREF_KEY, new ArrayList());
remainingPhasesInFlow = new ArrayList();
- remainingPhasesInFlow.add(new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
+ remainingPhasesInFlow.add(
+ new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
phasesOutFlow = new ArrayList();
phasesOutFlow.add(new Phase(PhaseMetadata.PHASE_POLICY_DETERMINATION));
@@ -67,24 +72,30 @@
return;
}
if (moduleref != null) {
- Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
- for (Iterator iterator = collectionModule.iterator(); iterator.hasNext();) {
+ Collection collectionModule = (Collection) this.getComponentProperty(
+ MODULEREF_KEY);
+ for (Iterator iterator = collectionModule.iterator();
+ iterator.hasNext();) {
ModuleDescription modu = (ModuleDescription) iterator.next();
if (modu.getName().equals(moduleref.getName())) {
- throw new AxisFault(moduleref.getName().getLocalPart() + " module has alredy engaged to the operation" +
- " operation terminated !!!");
+ throw new AxisFault(moduleref.getName().getLocalPart() +
+ " module has alredy engaged to the operation" +
+ " operation terminated !!!");
}
}
}
new PhaseResolver().engageModuleToOperation(this, moduleref);
- Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
+ Collection collectionModule = (Collection) this.getComponentProperty(
+ MODULEREF_KEY);
collectionModule.add(moduleref);
}
public void addToEngageModuleList(ModuleDescription moduleName) {
- Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
- for (Iterator iterator = collectionModule.iterator(); iterator.hasNext();) {
+ Collection collectionModule = (Collection) this.getComponentProperty(
+ MODULEREF_KEY);
+ for (Iterator iterator = collectionModule.iterator();
+ iterator.hasNext();) {
ModuleDescription moduleDescription = (ModuleDescription) iterator.next();
if (moduleName.getName().equals(moduleDescription.getName())) {
return;
@@ -166,25 +177,30 @@
if (null == msgContext.getRelatesTo()) {
//Its a new incomming message so get the factory to create a new
// one
- operationContext = OperationContextFactory.createMEPContext(getAxisSpecifMEPConstant(), this,
- serviceContext);
+ operationContext =
+ OperationContextFactory.createMEPContext(
+ getAxisSpecifMEPConstant(), this,
+ serviceContext);
} else {
// So this message is part of an ongoing MEP
// operationContext =
ConfigurationContext configContext = msgContext.getSystemContext();
- operationContext = configContext.getOperationContext(msgContext.getRelatesTo().getValue());
+ operationContext =
+ configContext.getOperationContext(
+ msgContext.getRelatesTo().getValue());
if (null == operationContext) {
throw new AxisFault("Cannot relate the message in the operation :"
- + this.getName()
- + " :Unrelated RelatesTO value "
- + msgContext.getRelatesTo().getValue());
+ + this.getName()
+ + " :Unrelated RelatesTO value "
+ + msgContext.getRelatesTo().getValue());
}
}
- msgContext.getSystemContext().registerOperationContext(msgContext.getMessageID(), operationContext);
+ msgContext.getSystemContext().registerOperationContext(
+ msgContext.getMessageID(), operationContext);
operationContext.addMessageContext(msgContext);
msgContext.setOperationContext(operationContext);
if (operationContext.isComplete()) {
@@ -237,7 +253,8 @@
}
if (temp == MEP_CONSTANT_INVALID) {
- throw new AxisError("Could not Map the MEP URI to a axis MEP constant value");
+ throw new AxisError(
+ "Could not Map the MEP URI to a axis MEP constant value");
}
this.mep = temp;
return this.mep;
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=210165&r1=210164&r2=210165&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 11 10:48:55 2005
@@ -30,20 +30,31 @@
import org.apache.wsdl.impl.WSDLInterfaceImpl;
import org.apache.wsdl.impl.WSDLServiceImpl;
-import javax.wsdl.*;
+import javax.wsdl.Binding;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.WSDLException;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.Writer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
/**
* Class ServiceDescription
*/
public class ServiceDescription
extends WSDLServiceImpl
- implements WSDLService, ParameterInclude, FlowInclude, DescriptionConstants {
+ implements WSDLService,
+ ParameterInclude,
+ FlowInclude,
+ DescriptionConstants {
private Definition difDefinition = null; //to store the wsdl definition , which is build at the deployment time
@@ -93,18 +104,22 @@
return;
}
if (moduleref != null) {
- Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
- for (Iterator iterator = collectionModule.iterator(); iterator.hasNext();) {
+ Collection collectionModule = (Collection) this.getComponentProperty(
+ MODULEREF_KEY);
+ for (Iterator iterator = collectionModule.iterator();
+ iterator.hasNext();) {
ModuleDescription modu = (ModuleDescription) iterator.next();
if (modu.getName().equals(moduleref.getName())) {
- throw new AxisFault(moduleref.getName().getLocalPart() + " module has alredy engaged to the seevice" +
- " operation terminated !!!");
+ throw new AxisFault(moduleref.getName().getLocalPart() +
+ " module has alredy engaged to the seevice" +
+ " operation terminated !!!");
}
}
}
new PhaseResolver().engageModuleToService(this, moduleref);
- Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
+ Collection collectionModule = (Collection) this.getComponentProperty(
+ MODULEREF_KEY);
collectionModule.add(moduleref);
}
@@ -123,8 +138,10 @@
}
public void addToEngagModuleList(ModuleDescription moduleName) {
- Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
- for (Iterator iterator = collectionModule.iterator(); iterator.hasNext();) {
+ Collection collectionModule = (Collection) this.getComponentProperty(
+ MODULEREF_KEY);
+ for (Iterator iterator = collectionModule.iterator();
+ iterator.hasNext();) {
ModuleDescription moduleDescription = (ModuleDescription) iterator.next();
if (moduleName.getName().equals(moduleDescription.getName())) {
return;
@@ -434,7 +451,8 @@
}
public OperationDescription getOperation(String ncName) {
- return (OperationDescription) this.getServiceInterface().getOperations().get(ncName);
+ return (OperationDescription) this.getServiceInterface().getOperations()
+ .get(ncName);
}
/**
@@ -452,8 +470,10 @@
public OperationDescription getOperationBySOAPAction(String soapAction) {
Iterator iterator = this.getEndpoints().keySet().iterator();
if (iterator.hasNext()) {
- WSDLEndpoint endpoint = (WSDLEndpoint) this.getEndpoints().get(iterator.next());
- return this.getOperationBySOAPAction(soapAction, endpoint.getName());
+ WSDLEndpoint endpoint = (WSDLEndpoint) this.getEndpoints().get(
+ iterator.next());
+ return this.getOperationBySOAPAction(soapAction,
+ endpoint.getName());
}
return null;
@@ -474,19 +494,25 @@
* @return A OperationDescription if a unque Operation can be found with the given SOAP Action
* otherwise will return null.
*/
- public OperationDescription getOperationBySOAPAction(String soapAction, QName endpoint) {
- HashMap bindingOperations = this.getEndpoint(endpoint).getBinding().getBindingOperations();
+ public OperationDescription getOperationBySOAPAction(String soapAction,
+ QName endpoint) {
+ HashMap bindingOperations = this.getEndpoint(endpoint).getBinding()
+ .getBindingOperations();
Iterator operationKeySetIterator = bindingOperations.keySet().iterator();
OperationDescription operation = null;
int count = 0;
while (operationKeySetIterator.hasNext()) {
- WSDLBindingOperation bindingOperation = (WSDLBindingOperation) bindingOperations.get(operationKeySetIterator.next());
- Iterator extIterator = bindingOperation.getExtensibilityElements().iterator();
+ WSDLBindingOperation bindingOperation = (WSDLBindingOperation) bindingOperations.get(
+ operationKeySetIterator.next());
+ Iterator extIterator = bindingOperation.getExtensibilityElements()
+ .iterator();
while (extIterator.hasNext()) {
WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
if (element.getType().equals(ExtensionConstants.SOAP_OPERATION)) {
- if (((SOAPOperation) element).getSoapAction().equals(soapAction)) {
- operation = (OperationDescription) bindingOperation.getOperation();
+ if (((SOAPOperation) element).getSoapAction().equals(
+ soapAction)) {
+ operation =
+ (OperationDescription) bindingOperation.getOperation();
count++;
}
}
@@ -510,13 +536,15 @@
public ServiceContext findServiceContext(MessageContext msgContext) {
ServiceContext serviceContext = null;
if (null == msgContext.getServiceInstanceID()) {
- serviceContext = new ServiceContext(this, msgContext.getSystemContext());
+ serviceContext =
+ new ServiceContext(this, msgContext.getSystemContext());
//TODO Once the ServiceContext is bound to an incomming serviceContext ID(like a cookie,reference Property) FIX this
// msgContext.getSystemContext().registerServiceContext(serviceContext.getServiceInstanceID(),
// serviceContext);
} else {
serviceContext =
- (ServiceContext) msgContext.getSystemContext().getServiceContext(msgContext.getServiceInstanceID());
+ (ServiceContext) msgContext.getSystemContext()
+ .getServiceContext(msgContext.getServiceInstanceID());
}
return serviceContext;
@@ -553,7 +581,8 @@
try {
Definition wsdlDefinition = this.getWSDLDefinition();
if (wsdlDefinition != null) {
- Iterator sreviceitr = wsdlDefinition.getServices().keySet().iterator();
+ Iterator sreviceitr = wsdlDefinition.getServices().keySet()
+ .iterator();
while (sreviceitr.hasNext()) {
wsdlDefinition.removeService((QName) sreviceitr.next());
}
@@ -572,7 +601,8 @@
Map bindingsMap = wsdlDefinition.getBindings();
Collection bind_col = bindingsMap.values();
- for (Iterator iterator = bind_col.iterator(); iterator.hasNext();) {
+ for (Iterator iterator = bind_col.iterator();
+ iterator.hasNext();) {
Binding binding = (Binding) iterator.next();
port.setBinding(binding);
break;
@@ -580,10 +610,12 @@
service.addPort(port);
wsdlDefinition.addService(service);
- WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDefinition, out);
+ WSDLFactory.newInstance().newWSDLWriter().writeWSDL(
+ wsdlDefinition, out);
out.flush();
} else {
- WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDefinition, out);
+ WSDLFactory.newInstance().newWSDLWriter().writeWSDL(
+ wsdlDefinition, out);
out.write("<wsdl>WSDL is NOT found</wsdl>");
out.flush();
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AbstractDispatcher.java Mon Jul 11 10:48:55 2005
@@ -33,7 +33,8 @@
* Field NAME
*/
public static final QName NAME =
- new QName("http://axis.ws.apache.org", "AddressingBasedDispatcher");
+ new QName("http://axis.ws.apache.org",
+ "AddressingBasedDispatcher");
/**
* Constructor Dispatcher
@@ -55,22 +56,28 @@
if (msgctx.getServiceContext() == null) {
ServiceDescription axisService = findService(msgctx);
if (axisService != null) {
- msgctx.setServiceContext(axisService.findServiceContext(msgctx));
+ msgctx.setServiceContext(
+ axisService.findServiceContext(msgctx));
}
}
- if (msgctx.getServiceContext() != null && msgctx.getOperationContext() == null) {
- OperationDescription axisOperation = findOperation(msgctx.getServiceContext().getServiceConfig(), msgctx);
+ if (msgctx.getServiceContext() != null &&
+ msgctx.getOperationContext() == null) {
+ OperationDescription axisOperation = findOperation(
+ msgctx.getServiceContext().getServiceConfig(), msgctx);
if (axisOperation != null) {
- OperationContext operationContext = axisOperation.findOperationContext(msgctx, msgctx.getServiceContext());
+ OperationContext operationContext = axisOperation.findOperationContext(
+ msgctx, msgctx.getServiceContext());
msgctx.setOperationContext(operationContext);
}
}
}
- public abstract ServiceDescription findService(MessageContext messageContext) throws AxisFault;
+ public abstract ServiceDescription findService(
+ MessageContext messageContext) throws AxisFault;
- public abstract OperationDescription findOperation(ServiceDescription service, MessageContext messageContext) throws AxisFault;
+ public abstract OperationDescription findOperation(
+ ServiceDescription service, MessageContext messageContext) throws AxisFault;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Mon Jul 11 10:48:55 2005
@@ -31,7 +31,8 @@
* Field NAME
*/
public static final QName NAME =
- new QName("http://axis.ws.apache.org", "AddressingBasedDispatcher");
+ new QName("http://axis.ws.apache.org",
+ "AddressingBasedDispatcher");
public AddressingBasedDispatcher() {
init(new HandlerDescription(NAME));
@@ -60,7 +61,8 @@
if (toEPR != null) {
QName serviceName = new QName(toEPR.getAddress());
service =
- messageContext.getSystemContext().getAxisConfiguration().getService(serviceName);
+ messageContext.getSystemContext().getAxisConfiguration()
+ .getService(serviceName);
}
return service;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Mon Jul 11 10:48:55 2005
@@ -15,7 +15,11 @@
*/
package org.apache.axis2.engine;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import javax.xml.namespace.QName;
import java.util.ArrayList;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Mon Jul 11 10:48:55 2005
@@ -18,13 +18,24 @@
import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
import org.apache.axis2.deployment.util.PhasesInfo;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.ModuleDescription;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.ParameterIncludeImpl;
+import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.phaseresolver.PhaseResolver;
import javax.xml.namespace.QName;
import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
/**
* Class EngineRegistryImpl
@@ -98,8 +109,10 @@
errornesModules = new Hashtable();
inPhasesUptoAndIncludingPostDispatch = new ArrayList();
- inPhasesUptoAndIncludingPostDispatch.add(new Phase(PhaseMetadata.PHASE_TRANSPORTIN));
- inPhasesUptoAndIncludingPostDispatch.add(new Phase(PhaseMetadata.PHASE_PRE_DISPATCH));
+ inPhasesUptoAndIncludingPostDispatch.add(
+ new Phase(PhaseMetadata.PHASE_TRANSPORTIN));
+ inPhasesUptoAndIncludingPostDispatch.add(
+ new Phase(PhaseMetadata.PHASE_PRE_DISPATCH));
Phase dispatch = new Phase(PhaseMetadata.PHASE_DISPATCH);
dispatch.addHandler(new AddressingBasedDispatcher(), 0);
@@ -280,7 +293,8 @@
////////////////////////// Form Axis Global
- public void addMessageReceiver(String key, MessageReceiver messageReceiver) {
+ public void addMessageReceiver(String key,
+ MessageReceiver messageReceiver) {
messagRecievers.put(key, messageReceiver);
}
@@ -320,22 +334,27 @@
ModuleDescription module = getModule(moduleref);
boolean isNewmodule = false;
if (module == null) {
- File file = new ArchiveReader().creatModuleArchivefromResource(moduleref.getLocalPart(), getRepository());
+ File file = new ArchiveReader().creatModuleArchivefromResource(
+ moduleref.getLocalPart(), getRepository());
module = new DeploymentEngine().buildModule(file);
isNewmodule = true;
}
if (module != null) {
- for (Iterator iterator = engagedModules.iterator(); iterator.hasNext();) {
+ for (Iterator iterator = engagedModules.iterator();
+ iterator.hasNext();) {
QName qName = (QName) iterator.next();
if (moduleref.equals(qName)) {
- throw new AxisFault(moduleref.getLocalPart() + " module has alredy engaged globally" +
- " operation terminated !!!");
+ throw new AxisFault(moduleref.getLocalPart() +
+ " module has alredy engaged globally" +
+ " operation terminated !!!");
}
}
new PhaseResolver(this).engageModuleGlobally(module);
} else {
- throw new AxisFault(this + " Refer to invalid module "
- + moduleref.getLocalPart() + " has not bean deployed yet !");
+ throw new AxisFault(
+ this + " Refer to invalid module "
+ + moduleref.getLocalPart() +
+ " has not bean deployed yet !");
}
engagedModules.add(moduleref);
if (isNewmodule) {