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 17:49:55 UTC
svn commit: r210150 [4/35] - in /webservices/axis/trunk/java: ./ etc/
modules/addressing/
modules/addressing/src/org/apache/axis2/handlers/addressing/
modules/addressing/test-resources/
modules/addressing/test/org/apache/axis2/handlers/addressing/ modu...
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -138,28 +138,22 @@
if (attvalue != null && !"".equals(attvalue)) {
messageReceiver =
Class.forName(attvalue, true, loader1);
- axisGlobal.addMessageReceiver(
- name,
- (MessageReceiver) messageReceiver.newInstance());
+ axisGlobal.addMessageReceiver(name,
+ (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)");
@@ -192,18 +186,15 @@
} else if (OUT_FAILTFLOW.equals(attvalue)) {
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();
@@ -235,10 +226,9 @@
Class receiverClass = null;
try {
receiverClass =
- Class.forName(
- attvalue,
- true,
- Thread.currentThread().getContextClassLoader());
+ Class.forName(attvalue,
+ true,
+ Thread.currentThread().getContextClassLoader());
TransportListener receiver = (TransportListener) receiverClass.newInstance();
transportin.setReceiver(receiver);
} catch (ClassNotFoundException e) {
@@ -265,8 +255,7 @@
Flow inFlow = processInFlow();
transportin.setInFlow(inFlow);
} else if (transportin != null && OUTFLOWST.equals(tagnae)) {
- throw new DeploymentException(
- "OUTFlow dose not support in AxisTransportIN " + 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);
@@ -303,10 +292,9 @@
Class sender = null;
try {
sender =
- Class.forName(
- attvalue,
- true,
- Thread.currentThread().getContextClassLoader());
+ Class.forName(attvalue,
+ true,
+ Thread.currentThread().getContextClassLoader());
TransportSender transportSender = (TransportSender) sender.newInstance();
transportout.setSender(transportSender);
} catch (ClassNotFoundException e) {
@@ -330,8 +318,7 @@
Parameter parameter = processParameter();
transportout.addParameter(parameter);
} else if (transportout != null && INFLOWST.equals(tagnae)) {
- throw new DeploymentException(
- "InFlow dose not support in TransportOutDescription " + tagnae);
+ throw new DeploymentException("InFlow dose not support in TransportOutDescription " + tagnae);
} else if (transportout != null && OUTFLOWST.equals(tagnae)) {
Flow outFlow = processOutFlow();
transportout.setOutFlow(outFlow);
@@ -368,24 +355,19 @@
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 {
@@ -423,21 +405,16 @@
ClassLoader loader1 =
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);
@@ -461,20 +438,17 @@
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");
+ 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);
}
}
}
@@ -585,16 +559,14 @@
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");
@@ -645,8 +617,7 @@
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();
@@ -705,18 +676,18 @@
String attname = pullparser.getAttributeLocalName(i);
String attvalue = pullparser.getAttributeValue(i);
if (ATTNAME.equals(attname)) {
- if(axisService !=null){
+ if (axisService != null) {
operation = axisService.getOperation(attvalue);
}
- if(operation == null){
+ if (operation == null) {
operation = new OperationDescription();
operation.setName(new QName(attvalue));
log.info(attvalue + " Operation Name not found in WSDL");
}
- } else if(MEP.equals(attname)){
+ } else if (MEP.equals(attname)) {
operation.setMessageExchangePattern(attvalue);
- }else
+ } else
throw new DeploymentException("bad attribute in operation " + attname);
}
}
@@ -736,19 +707,18 @@
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");
+ throw new DeploymentException(ST
+ + " module is invalid or dose not have bean deployed");
} else {
operation.addModule(new QName(attvalue));
}
}
}
}
- }else if(PARAMETERST.equals(ST)){
+ } else if (PARAMETERST.equals(ST)) {
Parameter parameter = processParameter();
operation.addParameter(parameter);
- }else if (IN_FAILTFLOW.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");
@@ -762,27 +732,22 @@
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());
+ 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");
}
}
}
@@ -843,8 +808,7 @@
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;
@@ -854,8 +818,7 @@
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;
@@ -894,7 +857,7 @@
module.setOutFlow(outFlow);
} else if (OPRATIONST.equals(ST)) {
OperationDescription operation = processOperation(null);
- PhasesInfo info= dpengine.getPhasesinfo();
+ PhasesInfo info = dpengine.getPhasesinfo();
info.setOperationPhases(operation);
// DeploymentData.getInstance().setOperationPhases(operation);
if (operation.getMessageReciever() == null) {
@@ -905,27 +868,21 @@
ClassLoader loader1 =
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) {
@@ -961,8 +918,7 @@
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();
@@ -996,8 +952,7 @@
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();
@@ -1032,8 +987,7 @@
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();
@@ -1067,8 +1021,7 @@
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();
@@ -1103,8 +1056,7 @@
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();
@@ -1175,8 +1127,7 @@
// 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/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/axis2.xml Mon Jul 11 08:49:30 2005
@@ -1,12 +1,11 @@
<axisconfig name="AxisJava2.0">
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
<parameter name="hotdeployment" locked="xsd:false">true</parameter>
<parameter name="hotupdate" locked="xsd:false">false</parameter>
<!-- Uncomment this to enable REST support -->
-<!-- <parameter name="enableREST" locked="xsd:false">true</parameter>-->
-
+ <!-- <parameter name="enableREST" locked="xsd:false">true</parameter>-->
<parameter name="userName" locked="xsd:false">admin</parameter>
@@ -14,62 +13,62 @@
- <!-- ================================================= -->
- <!-- Message Receivers -->
- <!-- ================================================= -->
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
<!-- This is the Deafult Message Receiver for the Request Response style Operations -->
<messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
- <!-- ================================================= -->
- <!-- Transport Ins -->
- <!-- ================================================= -->
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
<transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
<parameter name="port" locked="xsd:false">6060</parameter>
</transportReceiver>
- <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
- <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
- <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
- <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
- <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
- </transportReceiver> -->
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="xsd:false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="xsd:false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
<transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
<parameter name="port" locked="xsd:false">6060</parameter>
</transportReceiver>
- <!-- ================================================= -->
- <!-- Transport Outs -->
- <!-- ================================================= -->
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
<transportSender name="http" class="org.apache.axis2.transport.http.HTTPTransportSender"/>
<transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="commons-http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
- <parameter name="Transfer-Encoding" locked="xsd:false">chunked</parameter>
- </transportSender>
-
- <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
- <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
- <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
- <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding" locked="xsd:false">chunked</parameter>
</transportSender>
- -->
- <!-- ================================================= -->
- <!-- Global Modules -->
- <!-- ================================================= -->
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="xsd:false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="xsd:false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="xsd:false">25</parameter>
+ </transportSender>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
<!-- Uncomment this to enable Addressing
<module ref="addressing"/> -->
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
<phaseOrder type="inflow">
<!-- System pre defined phases -->
<phase name="TransportIn"/>
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -121,7 +121,7 @@
* this is the actual method that is call from scheduler
*/
public void startListent() {
- // checkModules();
+ // checkModules();
checkServices();
update();
}
@@ -169,7 +169,7 @@
return false;
}
- private boolean isModuleArchiveFile(String filename) {
+ private boolean isModuleArchiveFile(String filename) {
if (filename.endsWith(".jar") || filename.endsWith(".mar")) {
return true;
}
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -16,19 +16,13 @@
package org.apache.axis2.deployment.repository.util;
-import org.apache.axis2.deployment.DeploymentEngine;
-import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.deployment.DeploymentClassLoader;
import org.apache.axis2.engine.AxisFault;
import javax.xml.namespace.QName;
-import java.io.*;
+import java.io.File;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
/**
* ArchiveFileData = Hot Deployment File Item , to store infromation of the module or servise
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -24,8 +24,8 @@
import org.apache.axis2.description.ModuleDescription;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.wsdl.WSDLVersionWrapper;
-import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import org.apache.axis2.wsdl.builder.WOMBuilder;
+import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wsdl.WSDLDescription;
@@ -77,19 +77,19 @@
public ServiceDescription createService(ArchiveFileData file) throws DeploymentException {
ServiceDescription service = null;
- InputStream in= file.getClassLoader().getResourceAsStream(SERVICEWSDL);
+ InputStream in = file.getClassLoader().getResourceAsStream(SERVICEWSDL);
boolean foundservice = false;
try {
- if(in!= null){
+ if (in != null) {
WOMBuilder builder = WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11);
WSDLVersionWrapper wsdlVersionWrapper = builder.build(in, new AxisDescWSDLComponentFactory());
- WSDLDescription womDescription = wsdlVersionWrapper.getDescription();
+ WSDLDescription womDescription = wsdlVersionWrapper.getDescription();
Iterator iterator = womDescription.getServices().keySet().iterator();
- if(iterator.hasNext()){
+ if (iterator.hasNext()) {
foundservice = true;
- service = (ServiceDescription)womDescription.getServices().get(iterator.next());
+ service = (ServiceDescription) womDescription.getServices().get(iterator.next());
}
- if(!foundservice){
+ if (!foundservice) {
service = new ServiceDescription();
}
service.setWSDLDefinition(wsdlVersionWrapper.getDefinition());
@@ -168,16 +168,17 @@
* This method first check whether the given module is there in the user home dirctory if so return
* that , else try to read the given module form classpath (from resources ) if found first get the module.mar
* file from the resourceStream and write that into user home/axis2home/nodule directory
+ *
* @param moduleName
* @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 {
int BUFFER = 2048;
- if(axis2repository == null ){
+ if (axis2repository == null) {
String userHome = System.getProperty("user.home");
File userHomedir = new File(userHome);
File repository = new File(userHomedir, ".axis2home");
@@ -187,14 +188,14 @@
modules.mkdirs();
}
} else {
- modules = new File(axis2repository , "modules");
- if(!modules.exists()){
+ modules = new File(axis2repository, "modules");
+ if (!modules.exists()) {
modules = new File(axis2repository, "modules");
modules.mkdirs();
}
}
- String modulearchiveName =moduleName + ".mar";
- modulearchiveFile = new File(modules,modulearchiveName);
+ String modulearchiveName = moduleName + ".mar";
+ modulearchiveFile = new File(modules, modulearchiveName);
if (modulearchiveFile.exists()) {
return modulearchiveFile;
} else {
@@ -208,11 +209,11 @@
ClassLoader cl = Thread.currentThread().getContextClassLoader();
InputStream in = cl.getResourceAsStream("modules/" + moduleName + ".mar");
- if(in == null ){
+ if (in == null) {
in = cl.getResourceAsStream("modules/" + moduleName + ".jar");
}
- if(in == null){
- throw new DeploymentException( moduleName + " module is not found");
+ if (in == null) {
+ throw new DeploymentException(moduleName + " module is not found");
}
ZipInputStream zin = null;
zin = new ZipInputStream(in);
@@ -230,7 +231,7 @@
} catch (Exception e) {
throw new DeploymentException(e.getMessage());
}
- return modulearchiveFile;
+ return modulearchiveFile;
}
}
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -1,8 +1,8 @@
package org.apache.axis2.deployment.util;
+import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.engine.Phase;
import org.apache.axis2.phaseresolver.PhaseMetadata;
-import org.apache.axis2.description.OperationDescription;
import java.util.ArrayList;
@@ -131,5 +131,5 @@
operation.setPhasesOutFaultFlow(getOperationOutFaultPhases());
}
}
-
+
}
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -8,97 +8,95 @@
/**
* @author chathura@opensource.lk
- *
*/
public class AxisDescWSDLComponentFactory implements WSDLComponentFactory {
-
- public WSDLDescription createDescription() {
- return new WSDLDescriptionImpl();
- }
-
-
- public WSDLService createService() {
- return new ServiceDescription();
- }
-
-
- public WSDLInterface createInterface() {
- return new WSDLInterfaceImpl();
- }
-
-
- public WSDLTypes createTypes() {
- return new WSDLTypesImpl();
- }
-
-
- public WSDLBinding createBinding() {
- return new WSDLBindingImpl();
- }
-
-
- public WSDLOperation createOperation() {
- return new OperationDescription();
- }
-
-
- public WSDLEndpoint createEndpoint() {
- return new WSDLEndpointImpl();
- }
-
-
- public WSDLFeature createFeature() {
- return new WSDLFeatureImpl();
- }
-
-
- public WSDLImport createImport() {
- return new WSDLImportImpl();
- }
-
-
- public WSDLInclude createInclude() {
- return new WSDLIncludeImpl();
- }
-
-
- public WSDLProperty createProperty() {
- return new WSDLPropertyImpl();
- }
-
- public MessageReference createMessageReference(){
- return new MessageReferenceImpl();
- }
-
- public WSDLBindingMessageReference createWSDLBindingMessageReference(){
- return new WSDLBindingMessageReferenceImpl();
- }
-
- public WSDLBindingOperation createWSDLBindingOperation(){
- return new WSDLBindingOperationImpl();
- }
-
- public WSDLExtensibilityAttribute createWSDLExtensibilityAttribute(){
- return new WSDLExtensibilityAttributeImpl();
- }
-
- /**
- *
- * @return A new Instance of <code>ExtensionFactory</code> that
- * is capable of creating the correct <code>ExtensibilityElement</code>
- * given a <code>QName</code>.
- */
- public ExtensionFactory createExtensionFactory(){
- return new ExtensionFactoryImpl();
- }
-
- public WSDLFaultReference createFaultReference(){
- return new WSDLFaultReferenceImpl();
- }
-
- public WSDLBindingFault createBindingFault(){
- return new WSDLBindingFaultImpl();
- }
+
+ public WSDLDescription createDescription() {
+ return new WSDLDescriptionImpl();
+ }
+
+
+ public WSDLService createService() {
+ return new ServiceDescription();
+ }
+
+
+ public WSDLInterface createInterface() {
+ return new WSDLInterfaceImpl();
+ }
+
+
+ public WSDLTypes createTypes() {
+ return new WSDLTypesImpl();
+ }
+
+
+ public WSDLBinding createBinding() {
+ return new WSDLBindingImpl();
+ }
+
+
+ public WSDLOperation createOperation() {
+ return new OperationDescription();
+ }
+
+
+ public WSDLEndpoint createEndpoint() {
+ return new WSDLEndpointImpl();
+ }
+
+
+ public WSDLFeature createFeature() {
+ return new WSDLFeatureImpl();
+ }
+
+
+ public WSDLImport createImport() {
+ return new WSDLImportImpl();
+ }
+
+
+ public WSDLInclude createInclude() {
+ return new WSDLIncludeImpl();
+ }
+
+
+ public WSDLProperty createProperty() {
+ return new WSDLPropertyImpl();
+ }
+
+ public MessageReference createMessageReference() {
+ return new MessageReferenceImpl();
+ }
+
+ public WSDLBindingMessageReference createWSDLBindingMessageReference() {
+ return new WSDLBindingMessageReferenceImpl();
+ }
+
+ public WSDLBindingOperation createWSDLBindingOperation() {
+ return new WSDLBindingOperationImpl();
+ }
+
+ public WSDLExtensibilityAttribute createWSDLExtensibilityAttribute() {
+ return new WSDLExtensibilityAttributeImpl();
+ }
+
+ /**
+ * @return A new Instance of <code>ExtensionFactory</code> that
+ * is capable of creating the correct <code>ExtensibilityElement</code>
+ * given a <code>QName</code>.
+ */
+ public ExtensionFactory createExtensionFactory() {
+ return new ExtensionFactoryImpl();
+ }
+
+ public WSDLFaultReference createFaultReference() {
+ return new WSDLFaultReferenceImpl();
+ }
+
+ public WSDLBindingFault createBindingFault() {
+ return new WSDLBindingFaultImpl();
+ }
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/DescriptionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/DescriptionConstants.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/DescriptionConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/DescriptionConstants.java Mon Jul 11 08:49:30 2005
@@ -101,6 +101,6 @@
* Field SERVICE_CLASS_NAME
*/
public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME";
-
-
+
+
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/MessageDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/MessageDescription.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/MessageDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/MessageDescription.java Mon Jul 11 08:49:30 2005
@@ -21,9 +21,8 @@
/**
* @author chathura@opensource.lk
- *
*/
public class MessageDescription extends MessageReferenceImpl implements
- MessageReference {
+ MessageReference {
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java Mon Jul 11 08:49:30 2005
@@ -43,7 +43,7 @@
private final FlowInclude flowInclude = new FlowIncludeImpl();
//to store module opeartions , which are suppose to be added to a service if it is engaged to a service
- private HashMap opeartions ;
+ private HashMap opeartions;
/**
* Field parameters
@@ -148,6 +148,7 @@
public void setName(QName name) {
this.name = name;
}
+
/**
* @return
*/
@@ -162,11 +163,11 @@
this.module = module;
}
- public void addOperation(OperationDescription operation){
- opeartions.put(operation.getName(),operation);
+ public void addOperation(OperationDescription operation) {
+ opeartions.put(operation.getName(), operation);
}
-
- public HashMap getOperations(){
+
+ public HashMap getOperations() {
return opeartions;
}
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -69,10 +69,10 @@
if (moduleref != null) {
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 !!!");
+ 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 !!!");
}
}
@@ -82,11 +82,11 @@
collectionModule.add(moduleref);
}
- public void addToEngageModuleList(ModuleDescription moduleName){
+ public void addToEngageModuleList(ModuleDescription moduleName) {
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())){
+ if (moduleName.getName().equals(moduleDescription.getName())) {
return;
}
}
@@ -166,8 +166,8 @@
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
@@ -177,9 +177,9 @@
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());
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java Mon Jul 11 08:49:30 2005
@@ -45,11 +45,11 @@
}
/**
- * Method getParameter
- *
- * @param name
- * @return
- */
+ * Method getParameter
+ *
+ * @param name
+ * @return
+ */
public Parameter getParameter(String name) {
return (Parameter) parmeters.get(name);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/PhaseRule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/PhaseRule.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/PhaseRule.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/PhaseRule.java Mon Jul 11 08:49:30 2005
@@ -57,12 +57,12 @@
this.after = "";
this.phaseName = "";
}
-
+
public PhaseRule(String phaseName) {
- this.before = "";
- this.after = "";
- this.phaseName = phaseName;
- }
+ this.before = "";
+ this.after = "";
+ this.phaseName = phaseName;
+ }
/**
* Method getBefore
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -31,7 +31,6 @@
import org.apache.wsdl.impl.WSDLServiceImpl;
import javax.wsdl.*;
-import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
@@ -64,12 +63,12 @@
public ServiceDescription() {
this.setComponentProperty(MODULEREF_KEY, new ArrayList());
this.setComponentProperty(PARAMETER_KEY, new ParameterIncludeImpl());
- this.setServiceInterface( new WSDLInterfaceImpl());
+ this.setServiceInterface(new WSDLInterfaceImpl());
}
/**
* Constructor ServiceDescription
- *
+ *
* @param qName
*/
public ServiceDescription(QName qName) {
@@ -85,6 +84,7 @@
/**
* To ebgage a module it is reuired to use this method
+ *
* @param moduleref
* @throws AxisFault
*/
@@ -95,37 +95,38 @@
if (moduleref != null) {
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 !!!");
+ 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 !!!");
}
}
}
- new PhaseResolver().engageModuleToService(this,moduleref);
+ new PhaseResolver().engageModuleToService(this, moduleref);
Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
collectionModule.add(moduleref);
}
/**
* To add a opeartion to a service if a module requird to do so
+ *
* @param module
*/
- public void addModuleOperations(ModuleDescription module){
+ public void addModuleOperations(ModuleDescription module) {
HashMap map = module.getOperations();
- Collection col = map.values();
+ Collection col = map.values();
for (Iterator iterator = col.iterator(); iterator.hasNext();) {
OperationDescription operation = (OperationDescription) iterator.next();
this.addOperation(operation);
}
}
- public void addToEngagModuleList(ModuleDescription moduleName){
+ public void addToEngagModuleList(ModuleDescription moduleName) {
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())){
+ if (moduleName.getName().equals(moduleDescription.getName())) {
return;
}
}
@@ -140,7 +141,7 @@
/**
* Method getEngadgedModules
- *
+ *
* @return
*/
public Collection getEngagedModules() {
@@ -149,13 +150,13 @@
/**
* Method getOperation
- *
+ *
* @param operationName
* @return
*/
public OperationDescription getOperation(QName operationName) {
String opStr = operationName.getLocalPart();
-
+
HashMap allOperations = this.getServiceInterface().getAllOperations();
return (OperationDescription) allOperations.get(opStr);
}
@@ -168,7 +169,7 @@
/**
* Method addOperation
- *
+ *
* @param operation
*/
public void addOperation(OperationDescription operation) {
@@ -184,7 +185,7 @@
/**
* Method setClassLoader
- *
+ *
* @param classLoader
*/
public void setClassLoader(ClassLoader classLoader) {
@@ -201,7 +202,7 @@
/**
* Method getClassLoader
- *
+ *
* @return
*/
public ClassLoader getClassLoader() {
@@ -216,7 +217,7 @@
/**
* Method setContextPath
- *
+ *
* @param contextPath
*/
public void setContextPath(String contextPath) {
@@ -233,7 +234,7 @@
/**
* Method getContextPath
- *
+ *
* @return
*/
public String getContextPath() {
@@ -248,7 +249,7 @@
/**
* Method setStyle
- *
+ *
* @param style
*/
public void setStyle(String style) {
@@ -265,7 +266,7 @@
/**
* Method getStyle
- *
+ *
* @return
*/
public String getStyle() {
@@ -287,7 +288,7 @@
/**
* Method addParameter
- *
+ *
* @param param
*/
public void addParameter(Parameter param) {
@@ -307,7 +308,7 @@
/**
* Method getParameter
- *
+ *
* @param name
* @return
*/
@@ -325,7 +326,7 @@
/**
* Method getInFlow
- *
+ *
* @return
*/
public Flow getInFlow() {
@@ -340,7 +341,7 @@
/**
* Method setInFlow
- *
+ *
* @param inFlow
*/
public void setInFlow(Flow inFlow) {
@@ -357,7 +358,7 @@
/**
* Method getOutFlow
- *
+ *
* @return
*/
public Flow getOutFlow() {
@@ -372,7 +373,7 @@
/**
* Method setOutFlow
- *
+ *
* @param outFlow
*/
public void setOutFlow(Flow outFlow) {
@@ -389,7 +390,7 @@
/**
* Method getFaultInFlow
- *
+ *
* @return
*/
public Flow getFaultInFlow() {
@@ -404,7 +405,7 @@
/**
* Method setFaultInFlow
- *
+ *
* @param faultFlow
*/
public void setFaultInFlow(Flow faultFlow) {
@@ -425,32 +426,33 @@
/**
* Method getOperations
- *
+ *
* @return
*/
public HashMap getOperations() {
return this.getServiceInterface().getOperations();
}
- public OperationDescription getOperation(String ncName){
- return (OperationDescription)this.getServiceInterface().getOperations().get(ncName);
+ public OperationDescription getOperation(String ncName) {
+ return (OperationDescription) this.getServiceInterface().getOperations().get(ncName);
}
/**
- * This method will return the operation given particular SOAP Action.
+ * This method will return the operation given particular SOAP Action.
* This method should only be called if there is only one Endpoint is defined
* for this Service. If more than one Endpoint exists one of them will be picked.
- * If more than one Operation is found with the given
- * SOAP Action; null will be ruturned. If no particular Operation is found with
+ * If more than one Operation is found with the given
+ * SOAP Action; null will be ruturned. If no particular Operation is found with
* the given SOAP Action; null will be returned.
- * @param soapAction SOAP Action defined for the particular Operation
+ *
+ * @param soapAction SOAP Action defined for the particular Operation
* @return A OperationDescription if a unque Operation can be found with the given SOAP Action
- * otherwise will return null.
+ * otherwise will return null.
*/
- public OperationDescription getOperationBySOAPAction(String soapAction){
+ public OperationDescription getOperationBySOAPAction(String soapAction) {
Iterator iterator = this.getEndpoints().keySet().iterator();
- if(iterator.hasNext()){
- WSDLEndpoint endpoint = (WSDLEndpoint)this.getEndpoints().get(iterator.next());
+ if (iterator.hasNext()) {
+ WSDLEndpoint endpoint = (WSDLEndpoint) this.getEndpoints().get(iterator.next());
return this.getOperationBySOAPAction(soapAction, endpoint.getName());
}
@@ -461,35 +463,36 @@
/**
- * This method will return the operation given the particular endpoing and the
- * particular SOAP Action. If more than one Operation is found with the given
- * SOAP Action; null will be ruturned. If no particular Operation is found with
+ * This method will return the operation given the particular endpoing and the
+ * particular SOAP Action. If more than one Operation is found with the given
+ * SOAP Action; null will be ruturned. If no particular Operation is found with
* the given SOAP Action; null will be returned
- * @param endpoint Particular Enpoint in which the bining is defined with the particular SOAP
- * Action.
- * @param soapAction SOAP Action defined for the particular Operation
+ *
+ * @param endpoint Particular Enpoint in which the bining is defined with the particular SOAP
+ * Action.
+ * @param soapAction SOAP Action defined for the particular Operation
* @return A OperationDescription if a unque Operation can be found with the given SOAP Action
- * otherwise will return null.
+ * otherwise will return null.
*/
- public OperationDescription getOperationBySOAPAction(String soapAction, QName endpoint){
+ 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());
+ while (operationKeySetIterator.hasNext()) {
+ 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();
+ 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();
count++;
}
}
}
}
- if(1 == count){
+ if (1 == count) {
return operation;
}
return null;
@@ -500,7 +503,7 @@
* This finds the ServiceContext provided that the incomming message that
* has have some serviceInstanceID. Currently this will not be added to the
* EngineContext's ServiceContextMap.
- *
+ *
* @param msgContext
* @return
*/
@@ -513,8 +516,7 @@
// serviceContext);
} else {
serviceContext =
- (ServiceContext) msgContext.getSystemContext().getServiceContext(
- msgContext.getServiceInstanceID());
+ (ServiceContext) msgContext.getSystemContext().getServiceContext(msgContext.getServiceInstanceID());
}
return serviceContext;
@@ -523,6 +525,7 @@
/**
* To get the description about the service
+ *
* @return
*/
public String getServiceDescription() {
@@ -531,6 +534,7 @@
/**
* Set the description about the service
+ *
* @param serviceDescription
*/
public void setServiceDescription(String serviceDescription) {
@@ -545,16 +549,16 @@
this.difDefinition = difDefinition;
}
- public void printWSDL(Writer out, String PortURL)throws AxisFault{
+ public void printWSDL(Writer out, String PortURL) throws AxisFault {
try {
Definition wsdlDefinition = this.getWSDLDefinition();
- if(wsdlDefinition !=null){
- Iterator sreviceitr = wsdlDefinition.getServices().keySet().iterator();
+ if (wsdlDefinition != null) {
+ Iterator sreviceitr = wsdlDefinition.getServices().keySet().iterator();
while (sreviceitr.hasNext()) {
- wsdlDefinition.removeService((QName)sreviceitr.next());
+ wsdlDefinition.removeService((QName) sreviceitr.next());
}
- // wsdlDefinition.removeService(this.getName());
+ // wsdlDefinition.removeService(this.getName());
Service service = wsdlDefinition.createService();
service.setQName(this.getName());
@@ -576,14 +580,13 @@
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);
+ } else {
+ WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDefinition, out);
out.write("<wsdl>WSDL is NOT found</wsdl>");
out.flush();
}
-
} catch (WSDLException e) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportInDescription.java Mon Jul 11 08:49:30 2005
@@ -54,12 +54,9 @@
protected TransportListener reciever;
//to store handler in inFlow
- private Phase inPhase ;
+ private Phase inPhase;
//to store handler Fault in inFlow
- private Phase faultPhase ;
-
-
-
+ private Phase faultPhase;
/**
@@ -122,6 +119,7 @@
public void setFaultFlow(Flow faultFlow) {
this.faultFlow = faultFlow;
}
+
/**
* @return
*/
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/description/TransportOutDescription.java Mon Jul 11 08:49:30 2005
@@ -42,17 +42,17 @@
*/
private Flow faultFlow;
- private Phase outPhase;
- private Phase faultPhase;
+ private Phase outPhase;
+ private Phase faultPhase;
/**
* Field name
*/
protected QName name;
-
-
+
+
protected TransportSender sender;
-
+
/**
* Constructor AxisTransport
*
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -33,13 +33,13 @@
* 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
*/
private ConfigurationContext engineContext;
-
+
public AbstractDispatcher() {
init(new HandlerDescription(NAME));
}
@@ -51,25 +51,26 @@
* @throws AxisFault
*/
public final void invoke(MessageContext msgctx) throws AxisFault {
-
- if(msgctx.getServiceContext() == null){
+
+ if (msgctx.getServiceContext() == null) {
ServiceDescription axisService = findService(msgctx);
- if(axisService != null){
+ if (axisService != null) {
msgctx.setServiceContext(axisService.findServiceContext(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());
+ OperationDescription axisOperation = findOperation(msgctx.getServiceContext().getServiceConfig(), msgctx);
+ if (axisOperation != null) {
+ OperationContext operationContext = axisOperation.findOperationContext(msgctx, msgctx.getServiceContext());
msgctx.setOperationContext(operationContext);
}
}
}
-
- public abstract ServiceDescription findService(MessageContext messageContext)throws AxisFault;
- public abstract OperationDescription findOperation(ServiceDescription service,MessageContext messageContext)throws AxisFault;
-
+
+ public abstract ServiceDescription findService(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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -31,16 +31,15 @@
* 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));
}
- public OperationDescription findOperation(
- ServiceDescription service,
- MessageContext messageContext)
- throws AxisFault {
+ public OperationDescription findOperation(ServiceDescription service,
+ MessageContext messageContext)
+ throws AxisFault {
String action = (String) messageContext.getWSAAction();
if (action != null) {
@@ -61,7 +60,7 @@
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -28,7 +28,7 @@
* Service states kept in the <code>MessageContext</code>. Other runtime
* artifacts does not keep states foward from the execution.
*/
-public interface AxisConfiguration extends ParameterInclude{
+public interface AxisConfiguration extends ParameterInclude {
/**
* Field INFLOW
*/
@@ -87,23 +87,25 @@
* @throws AxisFault
*/
public void addMdoule(ModuleDescription module) throws AxisFault;
-
+
public boolean isEngaged(QName moduleName);
- /**
- * To engage a module at the run time it can be used this method
- * @param moduleref
- * @throws AxisFault
- */
- public void engageModule(QName moduleref) throws AxisFault ;
+ /**
+ * To engage a module at the run time it can be used this method
+ *
+ * @param moduleref
+ * @throws AxisFault
+ */
+ public void engageModule(QName moduleref) throws AxisFault;
/**
- * This returns
+ * This returns
*/
public ArrayList getInPhasesUptoAndIncludingPostDispatch();
public ArrayList getInFaultFlow();
+
/**
* Method getServices
*
@@ -112,13 +114,19 @@
public HashMap getServices();
public Hashtable getFaulytServices();
+
public Hashtable getFaulytModules();
public TransportInDescription getTransportIn(QName name) throws AxisFault;
+
public void addTransportIn(TransportInDescription transport) throws AxisFault;
+
public TransportOutDescription getTransportOut(QName name) throws AxisFault;
+
public void addTransportOut(TransportOutDescription transport) throws AxisFault;
+
public HashMap getTransportsIn();
+
public HashMap getTransportsOut();
}
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=210150&r1=210149&r2=210150&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 08:49:30 2005
@@ -16,8 +16,8 @@
package org.apache.axis2.engine;
import org.apache.axis2.deployment.DeploymentEngine;
-import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
+import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.description.*;
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.axis2.phaseresolver.PhaseResolver;
@@ -48,7 +48,6 @@
private final HashMap services = new HashMap();
-
private final HashMap transportsIn = new HashMap();
private final HashMap transportsOut = new HashMap();
@@ -79,7 +78,7 @@
*/
protected final List engagedModules;
- private String axis2Repository =null;
+ private String axis2Repository = null;
protected HashMap messagRecievers;
/////////////////////// From AxisGlobal /////////////////////////////////////
@@ -101,14 +100,14 @@
inPhasesUptoAndIncludingPostDispatch = new ArrayList();
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);
dispatch.addHandler(new RequestURIBasedDispatcher(), 1);
dispatch.addHandler(new SOAPActionBasedDispatcher(), 2);
- dispatch.addHandler(new SOAPMessageBodyBasedDispatcher(),3);
+ dispatch.addHandler(new SOAPMessageBodyBasedDispatcher(), 3);
inPhasesUptoAndIncludingPostDispatch.add(dispatch);
-
+
Phase postDispatch = new Phase(PhaseMetadata.PHASE_POST_DISPATCH);
postDispatch.addHandler(new DispatchPostConditionsEvaluator());
inPhasesUptoAndIncludingPostDispatch.add(postDispatch);
@@ -128,7 +127,7 @@
}
public Hashtable getFaulytModules() {
- return errornesModules;
+ return errornesModules;
}
/**
@@ -149,7 +148,7 @@
*/
public synchronized void addService(ServiceDescription service) throws AxisFault {
services.put(service.getName(), service);
- PhaseResolver handlerResolver = new PhaseResolver(this,service);
+ PhaseResolver handlerResolver = new PhaseResolver(this, service);
handlerResolver.buildchains();
}
@@ -307,6 +306,7 @@
public void addParameter(Parameter param) {
paramInclude.addParameter(param);
}
+
/**
* Method getEngadgedModules
*
@@ -319,31 +319,31 @@
public void engageModule(QName moduleref) throws AxisFault {
ModuleDescription module = getModule(moduleref);
boolean isNewmodule = false;
- if(module == null ) {
- File file = new ArchiveReader().creatModuleArchivefromResource(moduleref.getLocalPart(),getRepository());
- module = new DeploymentEngine().buildModule(file);
+ if (module == null) {
+ 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();) {
QName qName = (QName) iterator.next();
- if(moduleref.equals(qName)){
- throw new AxisFault(moduleref.getLocalPart()+ " module has alredy engaged globally" +
- " operation terminated !!!");
+ if (moduleref.equals(qName)) {
+ 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){
+ if (isNewmodule) {
addMdoule(module);
}
}
-
- public boolean isEngaged(QName moduleName){
+
+ public boolean isEngaged(QName moduleName) {
return engagedModules.contains(moduleName);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Mon Jul 11 08:49:30 2005
@@ -146,9 +146,9 @@
// create a SOAP envelope with the Fault
MessageContext faultContext =
new MessageContext(engineContext,
- context.getSessionContext(),
- context.getTransportIn(),
- context.getTransportOut());
+ context.getSessionContext(),
+ context.getTransportIn(),
+ context.getTransportOut());
if (context.getFaultTo() != null) {
faultContext.setFaultTo(context.getFaultTo());
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisError.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisError.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisError.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisError.java Mon Jul 11 08:49:30 2005
@@ -2,32 +2,27 @@
/**
* @author chathura@opensource.lk
- *
*/
public class AxisError extends RuntimeException {
-
- public AxisError(){
-
- }
-
- /**
- *
- * @param message Error message
- */
- public AxisError(String message){
- super(message);
- }
-
- /**
- *
- * @param message Error message
- * @param cause Cause
- */
- public AxisError(String message, Throwable cause ){
- super(message, cause);
- }
-
-
-
-
+
+ public AxisError() {
+
+ }
+
+ /**
+ * @param message Error message
+ */
+ public AxisError(String message) {
+ super(message);
+ }
+
+ /**
+ * @param message Error message
+ * @param cause Cause
+ */
+ public AxisError(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+
}