You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by gd...@apache.org on 2007/03/04 19:17:07 UTC
svn commit: r514453 [10/26] - in
/webservices/axis2/trunk/java/modules/kernel: src/org/apache/axis2/
src/org/apache/axis2/addressing/ src/org/apache/axis2/addressing/wsdl/
src/org/apache/axis2/builder/ src/org/apache/axis2/client/
src/org/apache/axis2/...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java Sun Mar 4 10:16:54 2007
@@ -31,12 +31,16 @@
static {
- defaultValuesMap.put(WSDL2Constants.ATTR_WSOAP_VERSION, SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ defaultValuesMap.put(WSDL2Constants.ATTR_WSOAP_VERSION,
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
defaultValuesMap.put(WSDL2Constants.ATTR_WSOAP_ACTION, "");
- defaultValuesMap.put(WHTTP_METHOD_WSDLX_SAFE, org.apache.axis2.Constants.Configuration.HTTP_METHOD_GET);
- defaultValuesMap.put(WHTTP_METHOD_WSDLX_SAFE, org.apache.axis2.Constants.Configuration.HTTP_METHOD_POST);
- defaultValuesMap.put(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR, ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR_DEFAULT);
- defaultValuesMap.put(WSDLConstants.WSDL_1_1_STYLE,WSDLConstants.STYLE_DOC);
+ defaultValuesMap.put(WHTTP_METHOD_WSDLX_SAFE,
+ org.apache.axis2.Constants.Configuration.HTTP_METHOD_GET);
+ defaultValuesMap.put(WHTTP_METHOD_WSDLX_SAFE,
+ org.apache.axis2.Constants.Configuration.HTTP_METHOD_POST);
+ defaultValuesMap.put(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR,
+ ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR_DEFAULT);
+ defaultValuesMap.put(WSDLConstants.WSDL_1_1_STYLE, WSDLConstants.STYLE_DOC);
}
public static String getDefaultValue(String name) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAllAxisServicesBuilder.java Sun Mar 4 10:16:54 2007
@@ -34,20 +34,20 @@
*/
public class WSDL20ToAllAxisServicesBuilder extends WSDL20ToAxisServiceBuilder {
protected static final Log log =
- LogFactory.getLog(WSDL20ToAllAxisServicesBuilder.class);
+ LogFactory.getLog(WSDL20ToAllAxisServicesBuilder.class);
private ArrayList axisServices = null;
-
+
/**
- * Class constructor.
+ * Class constructor.
*
- * @param in - Contains the wsdl 2.0 file
+ * @param in - Contains the wsdl 2.0 file
*/
public WSDL20ToAllAxisServicesBuilder(InputStream in) {
super(in, null, null);
axisServices = new ArrayList(); // create an empty ArrayList
}
-
+
/**
* Public method to access the wsdl 2.0 file and create a List of AxisService objects.
* For each endpoint on each service in the wsdl, an AxisService object is created and
@@ -55,12 +55,12 @@
* to the the following: <service name>#<endpoint name>. Note that the endpoint name
* is not unique to a wsdl 2.0 file. Multiple services in the file may have endpoints
* with the same name. Therefore the name of the AxisService needs to be a combination
- * of service/endpoint name to be unique to the wsdl.
+ * of service/endpoint name to be unique to the wsdl.
*
* @return A List containing one AxisService object for each port in the wsdl file.
- * The name of the AxisService is modified to uniquely represent the service/endpoint
- * pair. The format of the name is "<wsdl service name>#<wsdl endpoint name>"
- * @throws AxisFault
+ * The name of the AxisService is modified to uniquely represent the service/endpoint
+ * pair. The format of the name is "<wsdl service name>#<wsdl endpoint name>"
+ * @throws AxisFault
*/
public List populateAllServices() throws AxisFault {
try {
@@ -68,8 +68,8 @@
log.debug("Entry: populateAllServices");
}
setup(); // setup contains code with gathers non-service specific info
- // from the WSDL. This only needs to be done once per WSDL.
- if (description == null) {
+ // from the WSDL. This only needs to be done once per WSDL.
+ if (description == null) {
if (log.isDebugEnabled()) {
log.debug("Exit: populateAllServices. wsdl description is null!");
}
@@ -93,7 +93,8 @@
// port, change the name
// from wsdl service name to port name.
// TODO: mangle name?
- retAxisService.setName(retAxisService.getName() + "$" + interfaceName); // TODO: mangle name????
+ retAxisService.setName(retAxisService.getName() + "$" +
+ interfaceName); // TODO: mangle name????
axisServices.add(retAxisService);
} // end if axisService was returned
} // end for all ports of a service
@@ -106,7 +107,8 @@
throw e; // just rethrow any AxisFaults
} catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug("populateAllServices caught Exception. Converting to AxisFault. " + e.toString());
+ log.debug("populateAllServices caught Exception. Converting to AxisFault. " +
+ e.toString());
}
throw new AxisFault(e);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Sun Mar 4 10:16:54 2007
@@ -121,9 +121,9 @@
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
String fullPath = wsdlUri;
- if (!wsdlUri.startsWith("http://")){
- File file = new File(wsdlUri);
- fullPath = file.getAbsolutePath();
+ if (!wsdlUri.startsWith("http://")) {
+ File file = new File(wsdlUri);
+ fullPath = file.getAbsolutePath();
}
Description description = wsdlReader.readWSDL(fullPath);
DescriptionElement descriptionElement = description.toElement();
@@ -430,27 +430,29 @@
}
} else {
// Set the default to soap 1.2
- axisService.setSoapNsUri(WSDL20DefaultValueHolder.getDefaultValue(WSDL2Constants.ATTR_WSOAP_VERSION));
+ axisService.setSoapNsUri(
+ WSDL20DefaultValueHolder.getDefaultValue(WSDL2Constants.ATTR_WSOAP_VERSION));
axisBinding.setProperty(WSDL2Constants.ATTR_WSOAP_VERSION,
- WSDL20DefaultValueHolder.getDefaultValue(WSDL2Constants.ATTR_WSOAP_VERSION));
+ WSDL20DefaultValueHolder.getDefaultValue(
+ WSDL2Constants.ATTR_WSOAP_VERSION));
}
URI soapUnderlyingProtocol = soapBindingExtensions.getSoapUnderlyingProtocol();
if (soapUnderlyingProtocol != null) {
axisBinding.setProperty(WSDL2Constants.ATTR_WSOAP_PROTOCOL,
- soapUnderlyingProtocol.toString());
+ soapUnderlyingProtocol.toString());
}
URI soapMepDefault = soapBindingExtensions.getSoapMepDefault();
if (soapMepDefault != null) {
axisBinding.setProperty(WSDL2Constants.ATTR_WSOAP_MEP,
- soapMepDefault.toString());
+ soapMepDefault.toString());
}
axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
- soapBindingExtensions.getHttpContentEncodingDefault());
+ soapBindingExtensions.getHttpContentEncodingDefault());
axisBinding.setProperty(WSDL2Constants.ATTR_WSOAP_MODULE,
- createSoapModules(soapBindingExtensions.getSoapModules()));
+ createSoapModules(soapBindingExtensions.getSoapModules()));
axisBinding.setProperty(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR,
- soapBindingExtensions.getHttpQueryParameterSeparatorDefault());
+ soapBindingExtensions.getHttpQueryParameterSeparatorDefault());
// Capture all the fault specific properties
@@ -473,17 +475,20 @@
}
axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_HEADER,
- createHttpHeaders(soapBindingFaultExtensions.getHttpHeaders()));
+ createHttpHeaders(
+ soapBindingFaultExtensions.getHttpHeaders()));
axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
- soapBindingFaultExtensions.getHttpContentEncoding());
+ soapBindingFaultExtensions.getHttpContentEncoding());
axisBindingFault.setProperty(WSDL2Constants.ATTR_WSOAP_CODE,
- soapBindingFaultExtensions.getSoapFaultCode());
+ soapBindingFaultExtensions.getSoapFaultCode());
axisBindingFault.setProperty(WSDL2Constants.ATTR_WSOAP_SUBCODES,
- soapBindingFaultExtensions.getSoapFaultSubcodes());
+ soapBindingFaultExtensions.getSoapFaultSubcodes());
axisBindingFault.setProperty(WSDL2Constants.ATTR_WSOAP_HEADER,
- createSoapHeaders(soapBindingFaultExtensions.getSoapHeaders()));
+ createSoapHeaders(
+ soapBindingFaultExtensions.getSoapHeaders()));
axisBindingFault.setProperty(WSDL2Constants.ATTR_WSOAP_MODULE,
- createSoapModules(soapBindingFaultExtensions.getSoapModules()));
+ createSoapModules(
+ soapBindingFaultExtensions.getSoapModules()));
axisBinding.addFault(axisBindingFault);
@@ -515,14 +520,15 @@
URI soapAction = soapBindingOperationExtensions.getSoapAction();
if (soapAction != null) {
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WSOAP_ACTION,
- soapAction.toString());
+ soapAction.toString());
}
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WSOAP_MODULE,
- createSoapModules(soapBindingOperationExtensions.getSoapModules()));
+ createSoapModules(
+ soapBindingOperationExtensions.getSoapModules()));
URI soapMep = soapBindingOperationExtensions.getSoapMep();
if (soapMep != null) {
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WSOAP_MEP,
- soapMep.toString());
+ soapMep.toString());
}
HTTPLocation httpLocation = soapBindingOperationExtensions.getHttpLocation();
// If httpLocation is not null we should extract a constant part from it and add its value and the
@@ -531,16 +537,17 @@
String httpLocationString = "";
if (httpLocation != null) {
String httpLocationTemplete = httpLocation.getLocationTemplate();
- axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, httpLocationTemplete);
+ axisBindingOperation
+ .setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, httpLocationTemplete);
httpLocationString = RESTUtil.getConstantFromHTTPLocation(httpLocationTemplete);
}
httpLocationTable.put(httpLocationString, axisOperation);
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
- soapBindingOperationExtensions.getHttpContentEncodingDefault());
+ soapBindingOperationExtensions.getHttpContentEncodingDefault());
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR,
- soapBindingOperationExtensions.getHttpQueryParameterSeparator());
+ soapBindingOperationExtensions.getHttpQueryParameterSeparator());
BindingMessageReference[] bindingMessageReferences =
@@ -570,13 +577,16 @@
}
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_HEADER,
- createHttpHeaders(soapBindingMessageReferenceExtensions.getHttpHeaders()));
+ createHttpHeaders(
+ soapBindingMessageReferenceExtensions.getHttpHeaders()));
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
- soapBindingMessageReferenceExtensions.getHttpContentEncoding());
+ soapBindingMessageReferenceExtensions.getHttpContentEncoding());
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WSOAP_HEADER,
- createSoapHeaders(soapBindingMessageReferenceExtensions.getSoapHeaders()));
+ createSoapHeaders(
+ soapBindingMessageReferenceExtensions.getSoapHeaders()));
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WSOAP_MODULE,
- createSoapModules(soapBindingMessageReferenceExtensions.getSoapModules()));
+ createSoapModules(
+ soapBindingMessageReferenceExtensions.getSoapModules()));
axisBindingOperation.addChild(axisMessage.getDirection(), axisBindingMessage);
@@ -603,12 +613,13 @@
}
axisBindingMessageFault.setProperty(WSDL2Constants.ATTR_WSOAP_MODULE,
- createSoapModules(soapBindingFaultReferenceExtensions.getSoapModules()));
+ createSoapModules(
+ soapBindingFaultReferenceExtensions.getSoapModules()));
axisBindingOperation.addFault(axisBindingMessageFault);
}
- axisBinding.setProperty(WSDL2Constants.HTTP_LOCATION_TABLE,httpLocationTable);
+ axisBinding.setProperty(WSDL2Constants.HTTP_LOCATION_TABLE, httpLocationTable);
axisBinding.addChild(axisBindingOperation.getName(), axisBindingOperation);
@@ -658,11 +669,13 @@
}
axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_CODE,
- httpBindingFaultExtensions.getHttpErrorStatusCode().getCode());
+ httpBindingFaultExtensions
+ .getHttpErrorStatusCode().getCode());
axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_HEADER,
- createHttpHeaders(httpBindingFaultExtensions.getHttpHeaders()));
+ createHttpHeaders(
+ httpBindingFaultExtensions.getHttpHeaders()));
axisBindingFault.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
- httpBindingFaultExtensions.getHttpContentEncoding());
+ httpBindingFaultExtensions.getHttpContentEncoding());
axisBinding.addFault(axisBindingFault);
}
@@ -691,9 +704,9 @@
}
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_FAULT_SERIALIZATION,
- httpBindingOperationExtensions.getHttpFaultSerialization());
+ httpBindingOperationExtensions.getHttpFaultSerialization());
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_INPUT_SERIALIZATION,
- httpBindingOperationExtensions.getHttpInputSerialization());
+ httpBindingOperationExtensions.getHttpInputSerialization());
HTTPLocation httpLocation = httpBindingOperationExtensions.getHttpLocation();
// If httpLocation is not null we should extract a constant part from it and add its value and the
@@ -702,23 +715,26 @@
String httpLocationString = "";
if (httpLocation != null) {
String httpLocationTemplete = httpLocation.getLocationTemplate();
- axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, httpLocationTemplete);
+ axisBindingOperation
+ .setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, httpLocationTemplete);
httpLocationString = RESTUtil.getConstantFromHTTPLocation(httpLocationTemplete);
}
httpLocationTable.put(httpLocationString, axisOperation);
-
- axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_IGNORE_UNCITED, httpBindingOperationExtensions.
- isHttpLocationIgnoreUncited());
- axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_METHOD, httpBindingOperationExtensions.
- getHttpMethod());
+
+ axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_IGNORE_UNCITED,
+ httpBindingOperationExtensions.
+ isHttpLocationIgnoreUncited());
+ axisBindingOperation
+ .setProperty(WSDL2Constants.ATTR_WHTTP_METHOD, httpBindingOperationExtensions.
+ getHttpMethod());
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_OUTPUT_SERIALIZATION,
- httpBindingOperationExtensions.getHttpOutputSerialization());
+ httpBindingOperationExtensions.getHttpOutputSerialization());
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_QUERY_PARAMETER_SEPARATOR,
- httpBindingOperationExtensions.getHttpQueryParameterSeparator());
+ httpBindingOperationExtensions.getHttpQueryParameterSeparator());
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
- httpBindingOperationExtensions.getHttpContentEncodingDefault());
+ httpBindingOperationExtensions.getHttpContentEncodingDefault());
BindingMessageReference[] bindingMessageReferences =
bindingOperation.getBindingMessageReferences();
@@ -747,9 +763,10 @@
}
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_HEADER,
- createHttpHeaders(httpBindingMessageReferenceExtensions.getHttpHeaders()));
+ createHttpHeaders(
+ httpBindingMessageReferenceExtensions.getHttpHeaders()));
axisBindingMessage.setProperty(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING,
- httpBindingMessageReferenceExtensions.getHttpContentEncoding());
+ httpBindingMessageReferenceExtensions.getHttpContentEncoding());
axisBindingOperation.addChild(axisMessage.getDirection(), axisBindingMessage);
}
@@ -790,7 +807,7 @@
operationNames.add(interfaceOperations[i].getName());
}
- if (isCodegen){
+ if (isCodegen) {
axisService.setOperationsNameList(operationNames);
}
@@ -821,13 +838,16 @@
InterfaceOperationExtensionsImpl interfaceOperationExtensions;
try {
- interfaceOperationExtensions = (InterfaceOperationExtensionsImpl)operation.getComponentExtensionsForNamespace(new URI(WSDL2Constants.URI_WSDL2_EXTENSIONS));
+ interfaceOperationExtensions = (InterfaceOperationExtensionsImpl) operation
+ .getComponentExtensionsForNamespace(
+ new URI(WSDL2Constants.URI_WSDL2_EXTENSIONS));
} catch (URISyntaxException e) {
throw new AxisFault("WSDL2 extensions not defined for this operation");
}
if (interfaceOperationExtensions != null) {
- Parameter parameter = new Parameter(WSDL2Constants.ATTR_WSDLX_SAFE, new Boolean(interfaceOperationExtensions.isSafety()));
+ Parameter parameter = new Parameter(WSDL2Constants.ATTR_WSDLX_SAFE, new Boolean(
+ interfaceOperationExtensions.isSafety()));
axisOperation.addParameter(parameter);
}
@@ -842,19 +862,19 @@
if (isServerSide) {
createAxisMessage(axisOperation, messageReference,
- WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ WSDLConstants.MESSAGE_LABEL_IN_VALUE);
} else {
createAxisMessage(axisOperation, messageReference,
- WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+ WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
}
} else if (messageReference.getMessageLabel().equals(
MessageLabel.OUT)) {
if (isServerSide) {
createAxisMessage(axisOperation, messageReference,
- WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+ WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
} else {
createAxisMessage(axisOperation, messageReference,
- WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ WSDLConstants.MESSAGE_LABEL_IN_VALUE);
}
}
@@ -893,8 +913,9 @@
if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_ELEMENT.equals(messageContentModelName)) {
elementQName = messageReference.getElementDeclaration().getName();
} else if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_ANY.equals(messageContentModelName)) {
- elementQName = Constants.XSD_ANY;
- } else if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_NONE.equals(messageContentModelName)) {
+ elementQName = Constants.XSD_ANY;
+ } else
+ if (WSDLConstants.WSDL20_2006Constants.NMTOKEN_NONE.equals(messageContentModelName)) {
// nothing to do here keep the message element as null
} else {
throw new AxisFault("Sorry we do not support " + messageContentModelName +
@@ -928,7 +949,7 @@
private ArrayList createSoapHeaders(SOAPHeaderBlock soapHeaderBlocks[]) {
if (soapHeaderBlocks.length == 0) {
- return null;
+ return null;
}
ArrayList soapHeaderMessages = new ArrayList();
@@ -941,7 +962,8 @@
SOAPHeaderMessage soapHeaderMessage = new SOAPHeaderMessage();
soapHeaderMessage.setElement(name);
soapHeaderMessage.setRequired(soapHeaderBlock.isRequired().booleanValue());
- soapHeaderMessage.setMustUnderstand(soapHeaderBlock.mustUnderstand().booleanValue());
+ soapHeaderMessage
+ .setMustUnderstand(soapHeaderBlock.mustUnderstand().booleanValue());
soapHeaderMessages.add(soapHeaderMessage);
}
}
@@ -957,7 +979,7 @@
private ArrayList createSoapModules(SOAPModule soapModules[]) {
if (soapModules.length == 0) {
- return null;
+ return null;
}
ArrayList soapModuleMessages = new ArrayList();
@@ -979,17 +1001,17 @@
private ArrayList createHttpHeaders(HTTPHeader httpHeaders[]) {
if (httpHeaders.length == 0) {
- return null;
+ return null;
}
ArrayList httpHeaderMessages = new ArrayList();
for (int i = 0; i < httpHeaders.length; i++) {
- HTTPHeaderImpl httpHeader = (HTTPHeaderImpl)httpHeaders[i];
+ HTTPHeaderImpl httpHeader = (HTTPHeaderImpl) httpHeaders[i];
HTTPHeaderMessage httpHeaderMessage = new HTTPHeaderMessage();
- httpHeaderMessage.setqName(httpHeader.getTypeName());
- httpHeaderMessage.setName(httpHeader.getName());
- httpHeaderMessage.setRequired(httpHeader.isRequired().booleanValue());
- httpHeaderMessages.add(httpHeaderMessage);
+ httpHeaderMessage.setqName(httpHeader.getTypeName());
+ httpHeaderMessage.setName(httpHeader.getName());
+ httpHeaderMessage.setRequired(httpHeader.isRequired().booleanValue());
+ httpHeaderMessages.add(httpHeaderMessage);
}
return httpHeaderMessages;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java Sun Mar 4 10:16:54 2007
@@ -19,7 +19,7 @@
*/
public interface WSDL2Constants {
-
+
String WSDL_NAMESPACE = "http://www.w3.org/2006/01/wsdl";
String DEFAULT_WSDL_NAMESPACE_PREFIX = "wsdl2";
String DESCRIPTION = "description";
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDLToAxisServiceBuilder.java Sun Mar 4 10:16:54 2007
@@ -83,9 +83,9 @@
// keeping whether builder is used in codegen or not
protected boolean isCodegen;
-
- protected WSDLToAxisServiceBuilder(){
-
+
+ protected WSDLToAxisServiceBuilder() {
+
}
public WSDLToAxisServiceBuilder(InputStream in, QName serviceName) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractOperationDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractOperationDispatcher.java Sun Mar 4 10:16:54 2007
@@ -53,13 +53,14 @@
* @throws org.apache.axis2.AxisFault
*/
public InvocationResponse invoke(MessageContext msgctx) throws AxisFault {
- if ((msgctx.getAxisService() != null) && (msgctx.getAxisOperation() == null)) {
+ if ((msgctx.getAxisService() != null) && (msgctx.getAxisOperation() == null)) {
AxisOperation axisOperation = findOperation(msgctx.getAxisService(), msgctx);
if (axisOperation != null) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
- log.debug(msgctx.getLogIDString()+" "+Messages.getMessage("operationfound",
- axisOperation.getName().getLocalPart()));
+ log.debug(msgctx.getLogIDString() + " " + Messages.getMessage("operationfound",
+ axisOperation
+ .getName().getLocalPart()));
}
msgctx.setAxisOperation(axisOperation);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractServiceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractServiceDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractServiceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/AbstractServiceDispatcher.java Sun Mar 4 10:16:54 2007
@@ -56,8 +56,8 @@
if (axisService != null) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
- log.debug(msgctx.getLogIDString()+" "+Messages.getMessage("servicefound",
- axisService.getName()));
+ log.debug(msgctx.getLogIDString() + " " + Messages.getMessage("servicefound",
+ axisService.getName()));
}
msgctx.setAxisService(axisService);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/ActionBasedOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/ActionBasedOperationDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/ActionBasedOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/ActionBasedOperationDispatcher.java Sun Mar 4 10:16:54 2007
@@ -32,8 +32,9 @@
throws AxisFault {
String action = messageContext.getSoapAction();
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" Checking for Operation using Action : " + action);
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() + " Checking for Operation using Action : " +
+ action);
}
if (action != null) {
AxisOperation op = service.getOperationBySOAPAction(action);
@@ -45,6 +46,7 @@
return null;
}
+
public void initDispatcher() {
init(new HandlerDescription(NAME));
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedOperationDispatcher.java Sun Mar 4 10:16:54 2007
@@ -31,23 +31,28 @@
public static final String NAME = "RelatesToBasedOperationDispatcher";
private static final Log log = LogFactory.getLog(RelatesToBasedOperationDispatcher.class);
- public AxisOperation findOperation(AxisService service, MessageContext messageContext) throws AxisFault {
+ public AxisOperation findOperation(AxisService service, MessageContext messageContext)
+ throws AxisFault {
RelatesTo relatesTo = messageContext.getRelatesTo();
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" Checking for OperationContext using RelatesTo : " + relatesTo);
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() +
+ " Checking for OperationContext using RelatesTo : " + relatesTo);
}
- if((relatesTo!=null) && (relatesTo.getValue()!=null)){
+ if ((relatesTo != null) && (relatesTo.getValue() != null)) {
ConfigurationContext configurationContext = messageContext.getConfigurationContext();
- OperationContext operationContext = configurationContext.getOperationContext(relatesTo.getValue());
- if(operationContext != null){
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" Found OperationContext: " + operationContext);
+ OperationContext operationContext =
+ configurationContext.getOperationContext(relatesTo.getValue());
+ if (operationContext != null) {
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() + " Found OperationContext: " +
+ operationContext);
}
return operationContext.getAxisOperation();
}
}
return null;
}
+
public void initDispatcher() {
init(new HandlerDescription(NAME));
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RelatesToBasedServiceDispatcher.java Sun Mar 4 10:16:54 2007
@@ -32,22 +32,25 @@
public AxisService findService(MessageContext messageContext) throws AxisFault {
RelatesTo relatesTo = messageContext.getRelatesTo();
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" Checking for OperationContext using RelatesTo : " + relatesTo);
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() +
+ " Checking for OperationContext using RelatesTo : " + relatesTo);
}
- if((relatesTo!=null) && (relatesTo.getValue()!=null)){
+ if ((relatesTo != null) && (relatesTo.getValue() != null)) {
ConfigurationContext configurationContext = messageContext.getConfigurationContext();
- OperationContext operationContext = configurationContext.getOperationContext(relatesTo.getValue());
- if(operationContext != null){
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" Found OperationContext: " + operationContext);
+ OperationContext operationContext =
+ configurationContext.getOperationContext(relatesTo.getValue());
+ if (operationContext != null) {
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() + " Found OperationContext: " +
+ operationContext);
}
return operationContext.getServiceContext().getAxisService();
}
}
return null;
}
-
+
public void initDispatcher() {
init(new HandlerDescription(NAME));
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedOperationDispatcher.java Sun Mar 4 10:16:54 2007
@@ -46,18 +46,23 @@
if (toEPR != null) {
String filePart = toEPR.getAddress();
String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
- messageContext.getConfigurationContext().getServiceContextPath());
+ messageContext
+ .getConfigurationContext().getServiceContextPath());
if ((values.length >= 2) && (values[1] != null)) {
QName operationName = new QName(values[1]);
- log.debug(messageContext.getLogIDString()+" Checking for Operation using QName(target endpoint URI fragment) : " + operationName);
+ log.debug(messageContext.getLogIDString() +
+ " Checking for Operation using QName(target endpoint URI fragment) : " +
+ operationName);
return service.getOperation(operationName);
} else {
- log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
+ log.debug(messageContext.getLogIDString() +
+ " Attempted to check for Operation using target endpoint URI, but the operation fragment was missing");
return null;
}
} else {
- log.debug(messageContext.getLogIDString()+" Attempted to check for Operation using null target endpoint URI");
+ log.debug(messageContext.getLogIDString() +
+ " Attempted to check for Operation using null target endpoint URI");
return null;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/RequestURIBasedServiceDispatcher.java Sun Mar 4 10:16:54 2007
@@ -38,13 +38,16 @@
EndpointReference toEPR = messageContext.getTo();
if (toEPR != null) {
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" Checking for Service using target endpoint address : " + toEPR.getAddress());
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() +
+ " Checking for Service using target endpoint address : " +
+ toEPR.getAddress());
}
String filePart = toEPR.getAddress();
//REVIEW: (nagy) Parsing the RequestURI will also give us the operationName if present, so we could conceivably store it in the MessageContext, but doing so and retrieving it is probably no faster than simply reparsing the URI
String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
- messageContext.getConfigurationContext().getServiceContextPath());
+ messageContext
+ .getConfigurationContext().getServiceContextPath());
if ((values.length >= 1) && (values[0] != null)) {
AxisConfiguration registry =
@@ -52,14 +55,16 @@
return registry.getService(values[0]);
} else {
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" Attempted to check for Service using target endpoint URI, but the service fragment was missing");
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() +
+ " Attempted to check for Service using target endpoint URI, but the service fragment was missing");
}
return null;
}
} else {
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" Attempted to check for Service using null target endpoint URI");
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() +
+ " Attempted to check for Service using null target endpoint URI");
}
return null;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java Sun Mar 4 10:16:54 2007
@@ -38,10 +38,10 @@
if (bodyFirstChild == null) {
return null;
} else {
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+
- " Checking for Operation using SOAP message body's first child's local name : "
- + bodyFirstChild.getLocalName());
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() +
+ " Checking for Operation using SOAP message body's first child's local name : "
+ + bodyFirstChild.getLocalName());
}
operationName = new QName(bodyFirstChild.getLocalName());
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedServiceDispatcher.java Sun Mar 4 10:16:54 2007
@@ -41,13 +41,14 @@
if (ns != null) {
String filePart = ns.getNamespaceURI();
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+
- "Checking for Service using SOAP message body's first child's namespace : "
- + filePart);
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() +
+ "Checking for Service using SOAP message body's first child's namespace : "
+ + filePart);
}
String[] values = Utils.parseRequestURLForServiceAndOperation(filePart,
- messageContext.getConfigurationContext().getServiceContextPath());
+ messageContext
+ .getConfigurationContext().getServiceContextPath());
if (values[0] != null) {
serviceName = values[0];
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java Sun Mar 4 10:16:54 2007
@@ -86,8 +86,8 @@
if (axisService != null) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
- log.debug(msgctx.getLogIDString()+" "+Messages.getMessage("servicefound",
- axisService.getName()));
+ log.debug(msgctx.getLogIDString() + " " + Messages.getMessage("servicefound",
+ axisService.getName()));
}
msgctx.setAxisService(axisService);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java Sun Mar 4 10:16:54 2007
@@ -51,9 +51,10 @@
// TODO this logic needed to be improved, as the Dispatching is almost guaranteed to fail
public AxisOperation findOperation(AxisService service, MessageContext messageContext)
throws AxisFault {
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" "+Messages.getMessage("checkingoperation",
- messageContext.getWSAAction()));
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(
+ messageContext.getLogIDString() + " " + Messages.getMessage("checkingoperation",
+ messageContext.getWSAAction()));
}
String action = messageContext.getWSAAction();
@@ -75,19 +76,21 @@
}
String address = toEPR.getAddress();
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" "+Messages.getMessage("checkingserviceforepr", address));
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() + " " +
+ Messages.getMessage("checkingserviceforepr", address));
}
QName serviceName;
ConfigurationContext configurationContext = messageContext.getConfigurationContext();
String[] values = Utils.parseRequestURLForServiceAndOperation(address,
- configurationContext.getServiceContextPath());
+ configurationContext.getServiceContextPath());
if (values == null) {
return null;
}
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(messageContext.getLogIDString()+" "+Messages.getMessage("checkingserviceforepr", values[0]));
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(messageContext.getLogIDString() + " " +
+ Messages.getMessage("checkingserviceforepr", values[0]));
}
if (values[0] != null) {
serviceName = new QName(values[0]);
@@ -133,9 +136,9 @@
if (msgctx.getRelatesTo() != null) {
String relatesTo = msgctx.getRelatesTo().getValue();
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(msgctx.getLogIDString()+" "+Messages.getMessage("checkingrelatesto",
- relatesTo));
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(msgctx.getLogIDString() + " " + Messages.getMessage("checkingrelatesto",
+ relatesTo));
}
if (relatesTo != null && !"".equals(relatesTo)) {
OperationContext operationContext =
@@ -143,9 +146,10 @@
.getOperationContext(relatesTo);
if (operationContext != null) {
- if(operationContext.isComplete()){
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(msgctx.getLogIDString()+" Operation context is marked as complete. Calling cleanup on it.");
+ if (operationContext.isComplete()) {
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(msgctx.getLogIDString() +
+ " Operation context is marked as complete. Calling cleanup on it.");
}
operationContext.cleanup();
return InvocationResponse.CONTINUE;
@@ -158,9 +162,11 @@
msgctx.getAxisOperation().registerMessageContext(msgctx, operationContext);
msgctx.setServiceGroupContextId(
((ServiceGroupContext) msgctx.getServiceContext().getParent()).getId());
-
- if(LoggingControl.debugLoggingAllowed && log.isDebugEnabled()){
- log.debug(msgctx.getLogIDString()+" Dispatched successfully on the RelatesTo. operation="+operationContext.getAxisOperation());
+
+ if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
+ log.debug(msgctx.getLogIDString() +
+ " Dispatched successfully on the RelatesTo. operation=" +
+ operationContext.getAxisOperation());
}
return InvocationResponse.CONTINUE;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Sun Mar 4 10:16:54 2007
@@ -115,9 +115,9 @@
private ArrayList inPhasesUptoAndIncludingPostDispatch;
private HashMap messageReceivers;
-
+
private HashMap messageBuilders;
-
+
private HashMap messageFormatters;
private ClassLoader moduleClassLoader;
@@ -138,7 +138,7 @@
private boolean start;
private ArrayList targetResolvers;
-
+
private ClusterManager clusterManager;
/**
@@ -158,50 +158,52 @@
faultyModules = new Hashtable();
observersList = new ArrayList();
inPhasesUptoAndIncludingPostDispatch = new ArrayList();
- systemClassLoader = (ClassLoader) org.apache.axis2.java.security.AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- return Thread.currentThread().getContextClassLoader();
- }
- });
+ systemClassLoader = (ClassLoader) org.apache.axis2.java.security.AccessController
+ .doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
serviceClassLoader = systemClassLoader;
moduleClassLoader = systemClassLoader;
this.phasesinfo = new PhasesInfo();
targetResolvers = new ArrayList();
}
-
+
public void addMessageReceiver(String mepURL,
- MessageReceiver messageReceiver) {
+ MessageReceiver messageReceiver) {
messageReceivers.put(mepURL, messageReceiver);
}
-
+
/**
* Register a messageBuilder implementation against a content type.
* This is used by Axis2 to support different message formats.
+ *
* @param contentType
* @param messageBuilder
*/
public void addMessageBuilder(String contentType,
- Builder messageBuilder) {
+ Builder messageBuilder) {
messageBuilders.put(contentType, messageBuilder);
}
-
+
/**
* Register a messageFormatter implementation against a content type.
- * This is used by Axis2 to support serialization of messages to different
+ * This is used by Axis2 to support serialization of messages to different
* message formats. (Eg: JSON)
*
* @param contentType
* @param messageFormatter
*/
public void addMessageFormatter(String contentType,
- MessageFormatter messageFormatter) {
+ MessageFormatter messageFormatter) {
messageFormatters.put(contentType, messageFormatter);
}
/**
* Method addModule.
- *
+ *
* @param module
* @throws AxisFault
*/
@@ -243,7 +245,7 @@
*/
public void addModuleConfig(ModuleConfiguration moduleConfiguration) {
moduleConfigmap.put(moduleConfiguration.getModuleName(),
- moduleConfiguration);
+ moduleConfiguration);
}
public void addObservers(AxisObserver axisObserver) {
@@ -306,7 +308,7 @@
Map endpoints = axisService.getEndpoints();
String serviceName = axisService.getName();
allServices.put(serviceName, axisService);
- if (endpoints != null ) {
+ if (endpoints != null) {
Iterator endpointNameIter = endpoints.keySet().iterator();
while (endpointNameIter.hasNext()) {
String endpointName = (String) endpointNameIter.next();
@@ -327,7 +329,7 @@
AxisServiceGroup axisServiceGroup = (AxisServiceGroup) getChild(serviceGroupName);
if (axisServiceGroup == null) {
throw new AxisFault(Messages.getMessage("invalidservicegroupname",
- serviceGroupName));
+ serviceGroupName));
}
Iterator services = axisServiceGroup.getServices();
while (services.hasNext()) {
@@ -389,7 +391,7 @@
engageModule(module);
} else {
throw new AxisFault(Messages.getMessage("modulenotavailble",
- moduleref.getLocalPart()));
+ moduleref.getLocalPart()));
}
}
@@ -579,16 +581,16 @@
public MessageReceiver getMessageReceiver(String mepURL) {
return (MessageReceiver) messageReceivers.get(mepURL);
}
-
+
/**
* @param contentType
* @return the configured message builder implementation class name against
* the given content type.
*/
public Builder getMessageBuilder(String contentType) {
- return (Builder)messageBuilders.get(contentType);
+ return (Builder) messageBuilders.get(contentType);
}
-
+
/**
* @param contentType
* @return the configured message formatter implementation class name
@@ -836,7 +838,7 @@
+ defualtModuleVersion));
}
}
-
+
public ClusterManager getClusterManager() {
return clusterManager;
}
@@ -853,7 +855,7 @@
AxisService service = (AxisService) allServices.get(serviceName);
if (service == null) {
throw new AxisFault(Messages.getMessage("servicenamenotvalid",
- serviceName));
+ serviceName));
}
service.setActive(false);
notifyObservers(AxisEvent.SERVICE_STOP, service);
@@ -863,7 +865,7 @@
AxisService service = (AxisService) allServices.get(serviceName);
if (service == null) {
throw new AxisFault(Messages.getMessage("servicenamenotvalid",
- serviceName));
+ serviceName));
}
service.setActive(true);
notifyObservers(AxisEvent.SERVICE_START, service);
@@ -926,7 +928,7 @@
* resolveTarget is called
*/
public TargetResolver getTargetResolverChain() {
- if(targetResolvers.isEmpty()){
+ if (targetResolvers.isEmpty()) {
return null;
}
return new TargetResolver() {
@@ -959,45 +961,44 @@
public boolean isAssertionLocal(QName name) {
return this.localPolicyAssertions.contains(name);
}
-
+
/**
* Allow to define/configure Data Locator for specified dialect at Axis 2 Configuration.
- *
- * @param dialect- an absolute URI represents the format and version of data
- * @param classname - class name of the Data Locator configured to support retrieval
+ *
+ * @param dialect- an absolute URI represents the format and version of data
+ * @param classname - class name of the Data Locator configured to support retrieval
* for the specified dialect.
*/
public void addDataLocatorClassNames(String dialect, String classname) {
dataLocatorClassNames.put(dialect, classname);
}
-
+
/**
- * For internal used only! To store instance of DataLocator when it is first loaded. This allows to
- * re-use DataLocator after it is initially loaded.
+ * For internal used only! To store instance of DataLocator when it is first loaded. This allows to
+ * re-use DataLocator after it is initially loaded.
*
- * @param dialect- an absolute URI represents the format and version of data
- * @param dataLocator - specified an DataLocator instance to support retrieval
- * of the specified dialect.
+ * @param dialect- an absolute URI represents the format and version of data
+ * @param dataLocator - specified an DataLocator instance to support retrieval
+ * of the specified dialect.
*/
public void addDataLocator(String dialect, AxisDataLocator dataLocator) {
dataLocators.put(dialect, dataLocator);
}
-
- /**
+
+ /**
* Return DataLocator instance for specified dialect.
*/
public AxisDataLocator getDataLocator(String dialect) {
- return (AxisDataLocator)dataLocators.get(dialect);
+ return (AxisDataLocator) dataLocators.get(dialect);
}
-
-
+
+
/**
* Return classname of DataLocator configured for specified dialect.
*/
public String getDataLocatorClassName(String dialect) {
return (String) dataLocatorClassNames.get(dialect);
}
-
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfigurator.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfigurator.java Sun Mar 4 10:16:54 2007
@@ -36,7 +36,7 @@
/**
* Engages the global modules specified in the configuration
- *
+ *
* @throws AxisFault
*/
void engageGlobalModules() throws AxisFault;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org