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 2007/03/04 19:17:07 UTC
svn commit: r514453 [8/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/c...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java Sun Mar 4 10:16:54 2007
@@ -71,7 +71,7 @@
private String moduleDescription;
private String[] supportedPolicyNames;
-
+
private QName[] localPolicyAssertions;
/**
@@ -255,7 +255,7 @@
}
public PolicyInclude getPolicyInclude() {
- if(policyInclude == null) {
+ if (policyInclude == null) {
policyInclude = new PolicyInclude();
}
return policyInclude;
@@ -276,11 +276,11 @@
public void setSupportedPolicyNamespaces(String[] supportedPolicyNamespaces) {
this.supportedPolicyNames = supportedPolicyNamespaces;
}
-
+
public QName[] getLocalPolicyAssertions() {
return localPolicyAssertions;
}
-
+
public void setLocalPolicyAssertions(QName[] localPolicyAssertions) {
this.localPolicyAssertions = localPolicyAssertions;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Sun Mar 4 10:16:54 2007
@@ -94,7 +94,7 @@
moduleConfigmap = new HashMap();
faultMessages = new ArrayList();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName()+"_"+UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" + UUIDGenerator.getUUID());
this.setName(tmpName);
}
@@ -120,7 +120,8 @@
public abstract void addMessageContext(MessageContext msgContext, OperationContext opContext)
throws AxisFault;
- public abstract void addFaultMessageContext(MessageContext msgContext, OperationContext opContext)
+ public abstract void addFaultMessageContext(MessageContext msgContext,
+ OperationContext opContext)
throws AxisFault;
public void addModule(QName moduleName) {
@@ -154,7 +155,8 @@
}
}
- private ArrayList engageModuleToOperation(AxisModule moduleref, AxisConfiguration axisConfig) throws AxisFault {
+ private ArrayList engageModuleToOperation(AxisModule moduleref, AxisConfiguration axisConfig)
+ throws AxisFault {
if (moduleref == null) {
return null;
}
@@ -270,7 +272,8 @@
*/
private AxisOperation copyOperation(AxisOperation axisOperation) throws AxisFault {
AxisOperation operation =
- AxisOperationFactory.getOperationDescription(axisOperation.getMessageExchangePattern());
+ AxisOperationFactory
+ .getOperationDescription(axisOperation.getMessageExchangePattern());
operation.setMessageReceiver(axisOperation.getMessageReceiver());
operation.setName(axisOperation.getName());
@@ -287,7 +290,8 @@
operation.setOutputAction(axisOperation.getOutputAction());
String[] faultActionNames = axisOperation.getFaultActionNames();
for (int i = 0; i < faultActionNames.length; i++) {
- operation.addFaultAction(faultActionNames[i], axisOperation.getFaultAction(faultActionNames[i]));
+ operation.addFaultAction(faultActionNames[i],
+ axisOperation.getFaultAction(faultActionNames[i]));
}
operation.setRemainingPhasesInFlow(axisOperation.getRemainingPhasesInFlow());
operation.setPhasesInFaultFlow(axisOperation.getPhasesInFaultFlow());
@@ -323,7 +327,9 @@
configContext.getOperationContext(msgContext.getRelatesTo().getValue());
if (null == operationContext && log.isDebugEnabled()) {
- log.debug(msgContext.getLogIDString()+" Cannot correlate inbound message RelatesTo value [" + msgContext.getRelatesTo() + "] to in-progree MEP");
+ log.debug(msgContext.getLogIDString() +
+ " Cannot correlate inbound message RelatesTo value [" +
+ msgContext.getRelatesTo() + "] to in-progree MEP");
}
}
@@ -360,7 +366,7 @@
// Its a new incoming message so get the factory to create a new
// one
- operationContext = ContextFactory.createOperationContext(this,serviceContext);
+ operationContext = ContextFactory.createOperationContext(this, serviceContext);
} else {
// So this message is part of an ongoing MEP
@@ -371,7 +377,8 @@
if (null == operationContext) {
throw new AxisFault(Messages.getMessage("cannotCorrelateMsg",
- this.name.toString(), msgContext.getRelatesTo().getValue()));
+ this.name.toString(),
+ msgContext.getRelatesTo().getValue()));
}
}
return operationContext;
@@ -382,7 +389,7 @@
throws AxisFault {
msgContext.setAxisOperation(this);
msgContext.getConfigurationContext().registerOperationContext(msgContext.getMessageID(),
- operationContext);
+ operationContext);
operationContext.addMessageContext(msgContext);
msgContext.setOperationContext(operationContext);
if (operationContext.isComplete()) {
@@ -551,7 +558,8 @@
*
*/
public OperationClient createClient(ServiceContext sc, Options options) {
- throw new UnsupportedOperationException(Messages.getMessage("mepnotyetimplemented", mepURI));
+ throw new UnsupportedOperationException(
+ Messages.getMessage("mepnotyetimplemented", mepURI));
}
public Object getKey() {
@@ -571,7 +579,7 @@
}
public String getInputAction() {
- return soapAction;
+ return soapAction;
}
public String getOutputAction() {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Sun Mar 4 10:16:54 2007
@@ -98,18 +98,18 @@
public class AxisService extends AxisDescription {
private Map endpointMap = new HashMap();
-
+
/*This is a map between the QName of the element of a message
- *specified in the WSDL and an Operation. It enables SOAP Body-based
- *dispatching for doc-literal bindings.
- */
+ *specified in the WSDL and an Operation. It enables SOAP Body-based
+ *dispatching for doc-literal bindings.
+ */
private Map messageElementQNameToOperationMap = new HashMap();
private int nsCount = 0;
private static final Log log = LogFactory.getLog(AxisService.class);
private URL fileName;
- // Maps httpLocations to corresponding operations. Used to dispatch rest messages.
+ // Maps httpLocations to corresponding operations. Used to dispatch rest messages.
private HashMap httpLocationDispatcherMap = null;
private HashMap operationsAliasesMap = null;
@@ -227,8 +227,10 @@
private HashMap dataLocators;
private HashMap dataLocatorClassNames;
private AxisDataLocatorImpl defaultDataLocator;
- // Define search sequence for datalocator based on Data Locator types.
- LocatorType[] availableDataLocatorTypes = new LocatorType[]{LocatorType.SERVICE_DIALECT, LocatorType.SERVICE_LEVEL,LocatorType.GLOBAL_DIALECT, LocatorType.GLOBAL_LEVEL, LocatorType.DEFAULT_AXIS};
+ // Define search sequence for datalocator based on Data Locator types.
+ LocatorType[] availableDataLocatorTypes = new LocatorType[]{LocatorType.SERVICE_DIALECT,
+ LocatorType.SERVICE_LEVEL, LocatorType.GLOBAL_DIALECT, LocatorType.GLOBAL_LEVEL,
+ LocatorType.DEFAULT_AXIS};
// name of the binding used : use in codegeneration
private String bindingName;
@@ -237,11 +239,11 @@
private List operationsNameList;
public AxisEndpoint getEndpoint(String key) {
- return (AxisEndpoint)endpointMap.get(key);
+ return (AxisEndpoint) endpointMap.get(key);
}
- public void addEndpoint(String key,AxisEndpoint axisEndpoint) {
- this.endpointMap.put(key,axisEndpoint);
+ public void addEndpoint(String key, AxisEndpoint axisEndpoint) {
+ this.endpointMap.put(key, axisEndpoint);
}
private boolean customWsld = false;
@@ -304,11 +306,12 @@
moduleRefs = new ArrayList();
engagedModules = new ArrayList();
schemaList = new ArrayList();
- serviceClassLoader = (ClassLoader) org.apache.axis2.java.security.AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- return Thread.currentThread().getContextClassLoader();
- }
- });
+ serviceClassLoader = (ClassLoader) org.apache.axis2.java.security.AccessController
+ .doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
objectSupplier = new DefaultObjectSupplier();
dataLocators = new HashMap();
dataLocatorClassNames = new HashMap();
@@ -372,36 +375,52 @@
public void addMessageReceiver(String mepURI, MessageReceiver messageReceiver) {
if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mepURI) ||
WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_ONLY.equals(mepURI)) {
- messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY, messageReceiver);
- messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_ONLY, messageReceiver);
+ messageReceivers
+ .put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_ONLY, messageReceiver);
+ messageReceivers
+ .put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_ONLY, messageReceiver);
} else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(mepURI) ||
WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_ONLY.equals(mepURI)) {
- messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY, messageReceiver);
- messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_ONLY, messageReceiver);
+ messageReceivers
+ .put(WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_ONLY, messageReceiver);
+ messageReceivers
+ .put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_ONLY, messageReceiver);
} else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mepURI) ||
WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_OUT.equals(mepURI)) {
- messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT, messageReceiver);
- messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_OUT, messageReceiver);
+ messageReceivers
+ .put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OUT, messageReceiver);
+ messageReceivers
+ .put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_OUT, messageReceiver);
} else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI) ||
WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI)) {
- messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT, messageReceiver);
- messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_OPTIONAL_OUT, messageReceiver);
+ messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT,
+ messageReceiver);
+ messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_IN_OPTIONAL_OUT,
+ messageReceiver);
} else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mepURI) ||
WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_IN.equals(mepURI)) {
- messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN, messageReceiver);
- messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_IN, messageReceiver);
+ messageReceivers
+ .put(WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_IN, messageReceiver);
+ messageReceivers
+ .put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_IN, messageReceiver);
} else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI) ||
WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI)) {
- messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN, messageReceiver);
- messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_OPTIONAL_IN, messageReceiver);
+ messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN,
+ messageReceiver);
+ messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_OUT_OPTIONAL_IN,
+ messageReceiver);
} else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) ||
WSDLConstants.WSDL20_2004_Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI)) {
- messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY, messageReceiver);
- messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_ROBUST_OUT_ONLY, messageReceiver);
+ messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY,
+ messageReceiver);
+ messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_ROBUST_OUT_ONLY,
+ messageReceiver);
} else if (WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI) ||
WSDLConstants.WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI)) {
- messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY, messageReceiver);
- messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY, messageReceiver);
+ messageReceivers.put(WSDLConstants.WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY,
+ messageReceiver);
+ messageReceivers.put(WSDLConstants.WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY,
+ messageReceiver);
} else {
messageReceivers.put(mepURI, messageReceiver);
}
@@ -564,7 +583,8 @@
*/
private AxisOperation copyOperation(AxisOperation axisOperation) throws AxisFault {
AxisOperation operation =
- AxisOperationFactory.getOperationDescription(axisOperation.getMessageExchangePattern());
+ AxisOperationFactory
+ .getOperationDescription(axisOperation.getMessageExchangePattern());
operation.setMessageReceiver(axisOperation.getMessageReceiver());
operation.setName(axisOperation.getName());
@@ -586,7 +606,8 @@
operation.setOutputAction(axisOperation.getOutputAction());
String[] faultActionNames = axisOperation.getFaultActionNames();
for (int i = 0; i < faultActionNames.length; i++) {
- operation.addFaultAction(faultActionNames[i], axisOperation.getFaultAction(faultActionNames[i]));
+ operation.addFaultAction(faultActionNames[i],
+ axisOperation.getFaultAction(faultActionNames[i]));
}
return operation;
@@ -639,41 +660,44 @@
/**
* Maps an action (a SOAPAction or WSA action) to the given operation. This is used by
- * dispatching (both SOAPAction- and WSAddressing- based dispatching) to figure out which
+ * dispatching (both SOAPAction- and WSAddressing- based dispatching) to figure out which
* operation a given message is for. Some notes on restrictions of "action"
* - A null or empty action will be ignored
* - An action that is a duplicate and references an idential operation is allowed
* - An acton that is a duplicate and references a different operation is NOT allowed. In this
- * case, the action for the original operation is removed from the alias table, thus removing
- * the ability to route based on this action. This is necessary to prevent mis-directing
- * incoming message to the wrong operation based on SOAPAction.
+ * case, the action for the original operation is removed from the alias table, thus removing
+ * the ability to route based on this action. This is necessary to prevent mis-directing
+ * incoming message to the wrong operation based on SOAPAction.
*
* @param action the action key
* @param axisOperation the operation to map to
*/
public void mapActionToOperation(String action, AxisOperation axisOperation) {
- if(action == null || "".equals(action)){
- if(log.isDebugEnabled()){
- log.debug("mapActionToOperation: A null or empty action cannot be used to map to an operation.");
+ if (action == null || "".equals(action)) {
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "mapActionToOperation: A null or empty action cannot be used to map to an operation.");
}
return;
}
- if(log.isDebugEnabled()){
- log.debug("mapActionToOperation: Mapping Action to Operation: action: " + action + "; operation: " + axisOperation);
+ if (log.isDebugEnabled()) {
+ log.debug("mapActionToOperation: Mapping Action to Operation: action: " + action +
+ "; operation: " + axisOperation);
}
- // First check if this action has already been flagged as invalid because it is a duplicate.
+ // First check if this action has already been flagged as invalid because it is a duplicate.
if (invalidOperationsAliases.contains(action)) {
// This SOAPAction has already been determined to be invalid; log a message
// and do not add it to the operation alias map.
if (log.isDebugEnabled()) {
- log.debug("mapActionToOperation: The action: " + action + " can not be used for operation: "
- + axisOperation + " with operation name: " + axisOperation.getName()
+ log.debug("mapActionToOperation: The action: " + action +
+ " can not be used for operation: "
+ + axisOperation + " with operation name: " + axisOperation.getName()
+ " because that SOAPAction is not unique for this service.");
}
return;
}
-
+
// Check if the action is currently mapping to an operation.
AxisOperation currentlyMappedOperation = getOperationByAction(action);
if (currentlyMappedOperation != null) {
@@ -681,8 +705,11 @@
// This maps to the same operation, then it is already in the alias table, so
// just silently ignore this mapping request.
if (log.isDebugEnabled()) {
- log.debug("mapActionToOperation: This operation is already mapped to this action: " + action + "; AxisOperation: "
- + currentlyMappedOperation + " named: " + currentlyMappedOperation.getName());
+ log.debug(
+ "mapActionToOperation: This operation is already mapped to this action: " +
+ action + "; AxisOperation: "
+ + currentlyMappedOperation + " named: " +
+ currentlyMappedOperation.getName());
}
} else {
// This action is already mapped, but it is to a different operation. Remove
@@ -690,11 +717,12 @@
operationsAliasesMap.remove(action);
invalidOperationsAliases.add(action);
if (log.isDebugEnabled()) {
- log.debug("mapActionToOperation: The action is already mapped to a different operation. The mapping of the action to any operations will be removed. Action: "
- + action + "; original operation: " + currentlyMappedOperation
- + " named " + currentlyMappedOperation.getName()
- + "; new operation: " + axisOperation
- + " named " + axisOperation.getName());
+ log.debug(
+ "mapActionToOperation: The action is already mapped to a different operation. The mapping of the action to any operations will be removed. Action: "
+ + action + "; original operation: " + currentlyMappedOperation
+ + " named " + currentlyMappedOperation.getName()
+ + "; new operation: " + axisOperation
+ + " named " + axisOperation.getName());
}
}
return;
@@ -787,7 +815,7 @@
private String[] getEPRs(String requestIP) {
AxisConfiguration axisConfig = getAxisConfiguration();
- if (axisConfig == null){
+ if (axisConfig == null) {
return null;
}
ArrayList eprList = new ArrayList();
@@ -798,7 +826,8 @@
TransportListener listener = transportIn.getReceiver();
if (listener != null) {
try {
- EndpointReference[] eprsForService = listener.getEPRsForService(this.name, requestIP);
+ EndpointReference[] eprsForService =
+ listener.getEPRsForService(this.name, requestIP);
if (eprsForService != null) {
for (int i = 0; i < eprsForService.length; i++) {
EndpointReference endpointReference = eprsForService[i];
@@ -823,7 +852,8 @@
TransportListener listener = transportIn.getReceiver();
if (listener != null) {
try {
- EndpointReference[] eprsForService = listener.getEPRsForService(this.name, requestIP);
+ EndpointReference[] eprsForService =
+ listener.getEPRsForService(this.name, requestIP);
if (eprsForService != null) {
for (int j = 0; j < eprsForService.length; j++) {
EndpointReference endpointReference = eprsForService[j];
@@ -865,7 +895,7 @@
if (wsld4jdefinition != null) {
try {
Definition definition = (Definition) wsld4jdefinition.getValue();
- if (isModifyUserWSDLPortAddress()){
+ if (isModifyUserWSDLPortAddress()) {
setPortAddress(definition);
}
WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
@@ -884,10 +914,10 @@
}
private void setPortAddress(Definition definition) throws AxisFault {
- setPortAddress(definition,null);
+ setPortAddress(definition, null);
}
- private void setPortAddress(Definition definition,String requestIP) throws AxisFault {
+ private void setPortAddress(Definition definition, String requestIP) throws AxisFault {
Iterator serviceItr = definition.getServices().values().iterator();
while (serviceItr.hasNext()) {
Service serviceElement = (Service) serviceItr.next();
@@ -898,7 +928,7 @@
for (int i = 0; i < list.size(); i++) {
Object extensibilityEle = list.get(i);
if (extensibilityEle instanceof SOAPAddress) {
- if (requestIP==null) {
+ if (requestIP == null) {
((SOAPAddress) extensibilityEle).setLocationURI(getEPRs()[0]);
} else {
((SOAPAddress) extensibilityEle).setLocationURI(getEPRs(requestIP)[0]);
@@ -910,16 +940,16 @@
}
private void getWSDL(OutputStream out, String[] serviceURL,
- String servicePath) throws AxisFault {
+ String servicePath) throws AxisFault {
// Retrieve WSDL using the same data retrieval path for GetMetadata request.
DataRetrievalRequest request = new DataRetrievalRequest();
request.putDialect(DRConstants.SPEC.DIALECT_TYPE_WSDL);
request.putOutputForm(OutputForm.INLINE_FORM);
-
+
MessageContext context = new MessageContext();
context.setAxisService(this);
context.setTo(new EndpointReference(serviceURL[0]));
-
+
Data[] result = getData(request, context);
OMElement wsdlElement;
if (result != null && result[0] != null) {
@@ -1501,7 +1531,7 @@
* @param schemaNamespace
* @throws AxisFault
*/
- public static AxisService createService(String implClass,
+ public static AxisService createService(String implClass,
AxisConfiguration axisConfiguration,
Map messageReceiverClassMap,
String targetNamespace,
@@ -1544,8 +1574,8 @@
try {
schemaGenerator = new SchemaGenerator(serviceClassLoader,
- implClass, schemaNamespace,
- axisService.getSchematargetNamespacePrefix());
+ implClass, schemaNamespace,
+ axisService.getSchematargetNamespacePrefix());
schemaGenerator.setElementFormDefault(Java2WSDLConstants.FORM_DEFAULT_UNQUALIFIED);
axisService.setElementFormDefault(false);
excludeOpeartion.add("init");
@@ -1573,9 +1603,9 @@
for (int i = 0; i < method.length; i++) {
JMethod jmethod = method[i];
- JAnnotation methodAnnon= jmethod.getAnnotation(AnnotationConstants.WEB_METHOD);
- if(methodAnnon!=null){
- if(methodAnnon.getValue(AnnotationConstants.EXCLUDE).asBoolean()){
+ JAnnotation methodAnnon = jmethod.getAnnotation(AnnotationConstants.WEB_METHOD);
+ if (methodAnnon != null) {
+ if (methodAnnon.getValue(AnnotationConstants.EXCLUDE).asBoolean()) {
continue;
}
}
@@ -1596,17 +1626,22 @@
mr = (MessageReceiver) obj;
operation.setMessageReceiver(mr);
} else {
- log.error("Object is not an instance of MessageReceiver, thus, default MessageReceiver has been set");
- mr = axisConfiguration.getMessageReceiver(operation.getMessageExchangePattern());
+ log.error(
+ "Object is not an instance of MessageReceiver, thus, default MessageReceiver has been set");
+ mr = axisConfiguration
+ .getMessageReceiver(operation.getMessageExchangePattern());
operation.setMessageReceiver(mr);
}
} else {
- log.error("Required MessageReceiver couldn't be found, thus, default MessageReceiver has been used");
- mr = axisConfiguration.getMessageReceiver(operation.getMessageExchangePattern());
+ log.error(
+ "Required MessageReceiver couldn't be found, thus, default MessageReceiver has been used");
+ mr = axisConfiguration
+ .getMessageReceiver(operation.getMessageExchangePattern());
operation.setMessageReceiver(mr);
}
} else {
- log.error("MessageRecevierClassMap couldn't be found, thus, default MessageReceiver has been used");
+ log.error(
+ "MessageRecevierClassMap couldn't be found, thus, default MessageReceiver has been used");
mr = axisConfiguration.getMessageReceiver(operation.getMessageExchangePattern());
operation.setMessageReceiver(mr);
}
@@ -1624,11 +1659,11 @@
String targetNamespace,
String schemaNamespace) throws AxisFault {
return createService(implClass,
- axisConfiguration,
- messageReceiverClassMap,
- targetNamespace,
- schemaNamespace,
- axisConfiguration.getServiceClassLoader());
+ axisConfiguration,
+ messageReceiverClassMap,
+ targetNamespace,
+ schemaNamespace,
+ axisConfiguration.getServiceClassLoader());
}
@@ -1687,8 +1722,8 @@
try {
schemaGenerator = new SchemaGenerator(serviceClassLoader,
- implClass, schemaNameSpace,
- axisService.getSchematargetNamespacePrefix());
+ implClass, schemaNameSpace,
+ axisService.getSchematargetNamespacePrefix());
schemaGenerator.setElementFormDefault(Java2WSDLConstants.FORM_DEFAULT_UNQUALIFIED);
axisService.setElementFormDefault(false);
excludeOpeartion.add("init");
@@ -1716,9 +1751,9 @@
for (int i = 0; i < method.length; i++) {
JMethod jmethod = method[i];
- JAnnotation methodAnnon= jmethod.getAnnotation(AnnotationConstants.WEB_METHOD);
- if(methodAnnon!=null){
- if(methodAnnon.getValue(AnnotationConstants.EXCLUDE).asBoolean()){
+ JAnnotation methodAnnon = jmethod.getAnnotation(AnnotationConstants.WEB_METHOD);
+ if (methodAnnon != null) {
+ if (methodAnnon.getValue(AnnotationConstants.EXCLUDE).asBoolean()) {
continue;
}
}
@@ -1732,14 +1767,17 @@
// loading message receivers
try {
- MessageReceiver messageReceiver = (MessageReceiver) messageReceiverClass.newInstance();
+ MessageReceiver messageReceiver =
+ (MessageReceiver) messageReceiverClass.newInstance();
operation.setMessageReceiver(messageReceiver);
} catch (IllegalAccessException e) {
- throw new AxisFault("IllegalAccessException occurred during message receiver loading"
- + e.getMessage());
+ throw new AxisFault(
+ "IllegalAccessException occurred during message receiver loading"
+ + e.getMessage());
} catch (InstantiationException e) {
- throw new AxisFault("InstantiationException occurred during message receiver loading"
- + e.getMessage());
+ throw new AxisFault(
+ "InstantiationException occurred during message receiver loading"
+ + e.getMessage());
}
pinfo.setOperationPhases(operation);
axisService.addOperation(operation);
@@ -1854,7 +1892,7 @@
//recursively call the same procedure
calcualteSchemaNames(Arrays.asList(
new XmlSchema[]{s}),
- nameTable);
+ nameTable);
}
}
}
@@ -1869,10 +1907,10 @@
*/
private void insertIntoNameTable(Hashtable nameTable, XmlSchema s) {
nameTable.put(s,
- ("xsd" + count++)
- + (customSchemaNameSuffix != null ?
- customSchemaNameSuffix :
- ""));
+ ("xsd" + count++)
+ + (customSchemaNameSuffix != null ?
+ customSchemaNameSuffix :
+ ""));
}
/**
@@ -1898,7 +1936,8 @@
* @param parentSchema
* @param nameTable
*/
- private void adjustSchemaName(XmlSchema parentSchema, Hashtable nameTable, Hashtable importedScheams) {
+ private void adjustSchemaName(XmlSchema parentSchema, Hashtable nameTable,
+ Hashtable importedScheams) {
XmlSchemaObjectCollection includes = parentSchema.getIncludes();
for (int j = 0; j < includes.getCount(); j++) {
Object item = includes.getItem(j);
@@ -1918,7 +1957,8 @@
* @param xmlSchemaExternal
* @param nameTable
*/
- private void adjustSchemaLocation(XmlSchema s, XmlSchemaExternal xmlSchemaExternal, Hashtable nameTable, Hashtable importedScheams) {
+ private void adjustSchemaLocation(XmlSchema s, XmlSchemaExternal xmlSchemaExternal,
+ Hashtable nameTable, Hashtable importedScheams) {
if (s != null) {
String schemaLocation = xmlSchemaExternal.getSchemaLocation();
if (importedScheams.get(schemaLocation) != null) {
@@ -1993,8 +2033,8 @@
}
/**
- * By default the port address in user WSDLs is modified, set
- * the following parameter to override this behaviour
+ * By default the port address in user WSDLs is modified, set
+ * the following parameter to override this behaviour
* <parameter name="modifyUserWSDLPortAddress">false</parameter>
*/
public boolean isModifyUserWSDLPortAddress() {
@@ -2039,21 +2079,21 @@
public void setTypeTable(TypeTable typeTable) {
this.typeTable = typeTable;
}
-
-
+
+
/**
* Find a data locator from the available data locators (both configured and default ones) to retrieve Metadata or data
- * specified in the request.
- *
- * @param request an {@link DataRetrievalRequest} object
+ * specified in the request.
+ *
+ * @param request an {@link DataRetrievalRequest} object
* @param msgContext message context
- * @return array of {@link Data} object for the request.
- * @throws AxisFault
+ * @return array of {@link Data} object for the request.
+ * @throws AxisFault
*/
-
+
public Data[] getData(DataRetrievalRequest request,
- MessageContext msgContext) throws AxisFault {
-
+ MessageContext msgContext) throws AxisFault {
+
Data[] data = null;
String dialect = request.getDialect();
AxisDataLocator dataLocator = null;
@@ -2073,19 +2113,19 @@
if (data == null) {
if (nextDataLocatorIndex < totalLocators) {
data = bubbleupDataLocators(nextDataLocatorIndex, request,
- msgContext);
+ msgContext);
}
}
return data;
}
-
+
/*
- * To search the next Data Locator from the available Data Locators that understood
- * the data retrieval request.
- */
+ * To search the next Data Locator from the available Data Locators that understood
+ * the data retrieval request.
+ */
private Data[] bubbleupDataLocators(int nextIndex,
- DataRetrievalRequest request, MessageContext msgContext)
+ DataRetrievalRequest request, MessageContext msgContext)
throws AxisFault {
Data[] data = null;
if (nextIndex < availableDataLocatorTypes.length) {
@@ -2094,7 +2134,7 @@
nextIndex++;
if (dataLocator != null) {
data = dataLocator.getData(request, msgContext);
- if (data==null){
+ if (data == null) {
data = bubbleupDataLocators(nextIndex, request, msgContext);
} else {
return data;
@@ -2103,71 +2143,72 @@
} else {
data = bubbleupDataLocators(nextIndex, request, msgContext);
}
-
+
}
return data;
}
-
- /**
+
+ /**
* Save data Locator configured at service level for this Axis Service
- *
- * @param dialect- an absolute URI represents the Dialect i.e. WSDL, Policy, Schema or
- * "ServiceLevel" for non-dialect service level data locator.
- * @param dataLocatorClassName - class name of the Data Locator configured to support data retrieval
- * for the specified dialect.
+ *
+ * @param dialect- an absolute URI represents the Dialect i.e. WSDL, Policy, Schema or
+ * "ServiceLevel" for non-dialect service level data locator.
+ * @param dataLocatorClassName - class name of the Data Locator configured to support data retrieval
+ * for the specified dialect.
*/
public void addDataLocatorClassNames(String dialect, String dataLocatorClassName) {
dataLocatorClassNames.put(dialect, dataLocatorClassName);
}
-
-
+
+
/*
- * Get data locator instance based on the LocatorType and dialect.
- */
- private AxisDataLocator getDataLocator(LocatorType locatorType, String dialect) throws AxisFault {
+ * Get data locator instance based on the LocatorType and dialect.
+ */
+ private AxisDataLocator getDataLocator(LocatorType locatorType, String dialect)
+ throws AxisFault {
AxisDataLocator locator = null;
if (locatorType == LocatorType.SERVICE_DIALECT) {
- locator = getServiceDataLocator( dialect);
+ locator = getServiceDataLocator(dialect);
} else if (locatorType == LocatorType.SERVICE_LEVEL) {
- locator = getServiceDataLocator( DRConstants.SERVICE_LEVEL);
+ locator = getServiceDataLocator(DRConstants.SERVICE_LEVEL);
} else if (locatorType == LocatorType.GLOBAL_DIALECT) {
- locator = getGlobalDataLocator( dialect);
+ locator = getGlobalDataLocator(dialect);
} else if (locatorType == LocatorType.GLOBAL_LEVEL) {
- locator = getGlobalDataLocator( DRConstants.GLOBAL_LEVEL);
+ locator = getGlobalDataLocator(DRConstants.GLOBAL_LEVEL);
} else if (locatorType == LocatorType.DEFAULT_AXIS) {
- locator = getDefaultDataLocator();
+ locator = getDefaultDataLocator();
} else {
- locator = getDefaultDataLocator();
+ locator = getDefaultDataLocator();
}
-
-
+
+
return locator;
}
-
+
// Return default Axis2 Data Locator
private AxisDataLocator getDefaultDataLocator() throws DataRetrievalException {
if (defaultDataLocator == null) {
defaultDataLocator = new AxisDataLocatorImpl(this);
}
-
+
defaultDataLocator.loadServiceData();
-
+
return defaultDataLocator;
}
-
-
+
+
/*
- * Checks if service level data locator configured for specified dialect.
- * Returns an instance of the data locator if exists, and null otherwise.
- */
+ * Checks if service level data locator configured for specified dialect.
+ * Returns an instance of the data locator if exists, and null otherwise.
+ */
private AxisDataLocator getServiceDataLocator(String dialect)
throws AxisFault {
AxisDataLocator locator = null;
- locator = (AxisDataLocator)dataLocators.get(dialect);
+ locator = (AxisDataLocator) dataLocators.get(dialect);
if (locator == null) {
- String className = (String)dataLocatorClassNames.get(dialect);
+ String className = (String) dataLocatorClassNames.get(dialect);
if (className != null) {
locator = loadDataLocator(className);
dataLocators.put(dialect, locator);
@@ -2178,14 +2219,14 @@
return locator;
}
-
+
/*
- * Checks if global level data locator configured for specified dialect.
- * @param dialect- an absolute URI represents the Dialect i.e. WSDL, Policy, Schema or
- * "GlobalLevel" for non-dialect Global level data locator.
- * Returns an instance of the data locator if exists, and null otherwise.
- */
-
+ * Checks if global level data locator configured for specified dialect.
+ * @param dialect- an absolute URI represents the Dialect i.e. WSDL, Policy, Schema or
+ * "GlobalLevel" for non-dialect Global level data locator.
+ * Returns an instance of the data locator if exists, and null otherwise.
+ */
+
public AxisDataLocator getGlobalDataLocator(String dialect)
throws AxisFault {
AxisConfiguration axisConfig = getAxisConfiguration();
@@ -2198,14 +2239,14 @@
locator = loadDataLocator(className);
axisConfig.addDataLocator(dialect, locator);
}
- }
+ }
}
return locator;
}
-
-
+
+
protected AxisDataLocator loadDataLocator(String className)
throws AxisFault {
@@ -2233,16 +2274,17 @@
* document/literal bare services to match the first child element of the
* SOAP Body element to an operation. (Routing for RPC and
* document/literal wrapped services occurs via the operationsAliasesMap.)
- *
+ * <p/>
* From section 4.7.6 of the WS-I BP 1.1:
* the "operation signature" is "the fully qualified name of the child
* element of SOAP body of the SOAP input message described by an operation
* in a WSDL binding," and thus this map must be from a QName to an
* operation.
- *
- * @param messageElementQNameToOperationMap The map from WSDL message
- * element QNames to
- * AxisOperations.
+ *
+ * @param messageElementQNameToOperationMap
+ * The map from WSDL message
+ * element QNames to
+ * AxisOperations.
*/
public void setMessageElementQNameToOperationMap(Map messageElementQNameToOperationMap) {
this.messageElementQNameToOperationMap = messageElementQNameToOperationMap;
@@ -2251,26 +2293,27 @@
/**
* Look up an AxisOperation for this service based off of an element QName
* from a WSDL message element.
- *
+ *
* @param messageElementQName The QName to search for.
* @return The AxisOperation registered to the QName or null if no match
* was found.
* @see #setMessageElementQNameToOperationMap(Map)
*/
public AxisOperation getOperationByMessageElementQName(QName messageElementQName) {
- return (AxisOperation) messageElementQNameToOperationMap.get(messageElementQName);
+ return (AxisOperation) messageElementQNameToOperationMap.get(messageElementQName);
}
/**
* Add an entry to the map between element QNames in WSDL messages and
* AxisOperations for this service.
- *
+ *
* @param messageElementQName The QName of the element on the input message
* that maps to the given operation.
- * @param operation The AxisOperation to be mapped to.
+ * @param operation The AxisOperation to be mapped to.
* @see #setMessageElementQNameToOperationMap(Map)
*/
- public void addMessageElementQNameToOperationMapping(QName messageElementQName, AxisOperation operation) {
+ public void addMessageElementQNameToOperationMapping(QName messageElementQName,
+ AxisOperation operation) {
messageElementQNameToOperationMap.put(messageElementQName, operation);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java Sun Mar 4 10:16:54 2007
@@ -125,7 +125,7 @@
OMFactory fac = OMAbstractFactory.getOMFactory();
wsdl = fac.createOMNamespace(WSDL_NAMESPACE,
- DEFAULT_WSDL_NAMESPACE_PREFIX);
+ DEFAULT_WSDL_NAMESPACE_PREFIX);
OMElement ele = fac.createOMElement("definitions", wsdl);
setDefinitionElement(ele);
@@ -150,7 +150,7 @@
prefix = DEFAULT_TARGET_NAMESPACE_PREFIX;
}
axisService.getNameSpacesMap().put(prefix,
- axisService.getTargetNamespace());
+ axisService.getTargetNamespace());
tns = ele.declareNamespace(axisService.getTargetNamespace(), prefix);
// adding documentation element
@@ -160,13 +160,13 @@
String servicedescription = axisService.getServiceDescription();
if (servicedescription != null && !"".equals(servicedescription)) {
OMElement documenentattion = fac.createOMElement("documentation",
- wsdl);
+ wsdl);
documenentattion.setText(servicedescription);
ele.addChild(documenentattion);
}
ele.addAttribute("targetNamespace", axisService.getTargetNamespace(),
- null);
+ null);
OMElement wsdlTypes = fac.createOMElement("types", wsdl);
ele.addChild(wsdlTypes);
@@ -186,7 +186,7 @@
String schemaString = writer.toString();
if (!"".equals(schemaString)) {
wsdlTypes.addChild(XMLUtils.toOM(new StringReader(
- schemaString)));
+ schemaString)));
}
}
}
@@ -219,7 +219,8 @@
* EPRs now to be used later, especially when we generate the WSDL.
*/
private void initURLResolving() {
- Parameter restPathParam = axisService.getParameter(org.apache.axis2.Constants.PARAM_REST_PATH);
+ Parameter restPathParam =
+ axisService.getParameter(org.apache.axis2.Constants.PARAM_REST_PATH);
if (restPathParam != null) {
restPath = ((String) restPathParam.getValue()).trim();
if (restPath.length() <= 0) {
@@ -301,12 +302,12 @@
for (int i = 0; i < extList.size(); i++) {
SOAPHeaderMessage header = (SOAPHeaderMessage) extList.get(i);
OMElement messageElement = fac.createOMElement(MESSAGE_LOCAL_NAME,
- wsdl);
+ wsdl);
messageElement.addAttribute(ATTRIBUTE_NAME, header.getMessage()
.getLocalPart(), null);
defintions.addChild(messageElement);
OMElement messagePart = fac.createOMElement(PART_ATTRIBUTE_NAME,
- wsdl);
+ wsdl);
messageElement.addChild(messagePart);
messagePart.addAttribute(ATTRIBUTE_NAME, header.part(), null);
if (header.getElement() == null) {
@@ -325,9 +326,9 @@
messagesMap.put(axismessage.getName(), axismessage);
QName schemaElementName = axismessage.getElementQName();
OMElement messageElement = fac.createOMElement(MESSAGE_LOCAL_NAME,
- wsdl);
+ wsdl);
messageElement.addAttribute(ATTRIBUTE_NAME, axismessage.getName(),
- null);
+ null);
defintions.addChild(messageElement);
if (schemaElementName != null) {
OMElement messagePart = fac.createOMElement(
@@ -335,8 +336,8 @@
messageElement.addChild(messagePart);
messagePart.addAttribute(ATTRIBUTE_NAME, "part1", null);
messagePart.addAttribute(ELEMENT_ATTRIBUTE_NAME,
- getPrefix(schemaElementName.getNamespaceURI()) + ":"
- + schemaElementName.getLocalPart(), null);
+ getPrefix(schemaElementName.getNamespaceURI()) + ":"
+ + schemaElementName.getLocalPart(), null);
}
}
@@ -362,7 +363,7 @@
}
String operationName = axisOperation.getName().getLocalPart();
OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
- wsdl);
+ wsdl);
portType.addChild(operation);
operation.addAttribute(ATTRIBUTE_NAME, operationName, null);
addPolicyAsExtElement(PolicyInclude.OPERATION_POLICY, axisOperation
@@ -384,11 +385,11 @@
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (inaxisMessage != null) {
OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
- wsdl);
+ wsdl);
input.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ ":" + inaxisMessage.getName(), null);
addPolicyAsExtElement(PolicyInclude.INPUT_POLICY,
- inaxisMessage.getPolicyInclude(), input, fac);
+ inaxisMessage.getPolicyInclude(), input, fac);
addWSAWActionAttribute(input, axisOperation
.getInputAction());
operation.addChild(input);
@@ -408,11 +409,11 @@
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outAxisMessage != null) {
OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
- wsdl);
+ wsdl);
output.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ ":" + outAxisMessage.getName(), null);
addPolicyAsExtElement(PolicyInclude.OUTPUT_POLICY,
- outAxisMessage.getPolicyInclude(), output, fac);
+ outAxisMessage.getPolicyInclude(), output, fac);
addWSAWActionAttribute(output, axisOperation
.getOutputAction());
operation.addChild(output);
@@ -426,11 +427,11 @@
AxisMessage faultyMessage = (AxisMessage) faultyMessages
.get(i);
OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME,
- wsdl);
+ wsdl);
fault.addAttribute(MESSAGE_LOCAL_NAME, tns.getPrefix()
+ ":" + faultyMessage.getName(), null);
fault.addAttribute(ATTRIBUTE_NAME, faultyMessage.getName(),
- null);
+ null);
addWSAWActionAttribute(fault, axisOperation
.getFaultAction(faultyMessage.getName()));
// TODO add policies for fault messages
@@ -482,7 +483,7 @@
port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":"
+ axisService.getName() + BINDING_NAME_SUFFIX, null);
addExtensionElement(fac, port, SOAP_ADDRESS, LOCATION, urlString,
- soap);
+ soap);
addPolicyAsExtElement(PolicyInclude.PORT_POLICY, axisService
.getPolicyInclude(), port, fac);
@@ -496,7 +497,8 @@
String[] exposedEPRs = axisService.getEPRs();
for (int i = 0; i < exposedEPRs.length; i++) {
String urlString = serviceEndpointURLs[i];
- if (urlString != null && urlString.startsWith("http") && (urlString.indexOf(restPath) > -1)) {
+ if (urlString != null && urlString.startsWith("http") &&
+ (urlString.indexOf(restPath) > -1)) {
OMElement port = fac.createOMElement(PORT, wsdl);
service.addChild(port);
String name = axisService.getName() + HTTP_PORT;
@@ -535,7 +537,7 @@
port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":"
+ axisService.getName() + SOAP12BINDING_NAME_SUFFIX, null);
addExtensionElement(fac, port, SOAP_ADDRESS, LOCATION, urlString,
- soap12);
+ soap12);
addPolicyAsExtElement(PolicyInclude.PORT_POLICY, axisService
.getPolicyInclude(), port, fac);
@@ -562,7 +564,7 @@
// Adding ext elements
addExtensionElement(fac, binding, BINDING_LOCAL_NAME, TRANSPORT,
- TRANSPORT_URI, STYLE, style, soap);
+ TRANSPORT_URI, STYLE, style, soap);
// Add WS-Addressing UsingAddressing element if appropriate
// SHOULD be on the binding element per the specification
@@ -571,17 +573,17 @@
OMNamespace wsawNamespace = fac.createOMNamespace(
AddressingConstants.Final.WSAW_NAMESPACE, "wsaw");
addExtensionElement(fac, binding,
- AddressingConstants.USING_ADDRESSING,
- DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true",
- wsawNamespace);
+ AddressingConstants.USING_ADDRESSING,
+ DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true",
+ wsawNamespace);
} else if (axisService.getWSAddressingFlag().equals(
AddressingConstants.ADDRESSING_REQUIRED)) {
OMNamespace wsawNamespace = fac.createOMNamespace(
AddressingConstants.Final.WSAW_NAMESPACE, "wsaw");
addExtensionElement(fac, binding,
- AddressingConstants.USING_ADDRESSING,
- DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true",
- wsawNamespace);
+ AddressingConstants.USING_ADDRESSING,
+ DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true",
+ wsawNamespace);
}
for (Iterator operations = axisService.getOperations(); operations.hasNext();) {
@@ -591,19 +593,19 @@
}
String operationName = axisOperation.getName().getLocalPart();
OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
- wsdl);
+ wsdl);
binding.addChild(operation);
String soapAction = axisOperation.getInputAction();
if (soapAction == null) {
soapAction = "";
}
addExtensionElement(fac, operation, OPERATION_LOCAL_NAME,
- SOAP_ACTION, soapAction, STYLE, style, soap);
+ SOAP_ACTION, soapAction, STYLE, style, soap);
addPolicyAsExtElement(PolicyInclude.BINDING_OPERATION_POLICY,
- axisOperation.getPolicyInclude(), operation, fac);
+ axisOperation.getPolicyInclude(), operation, fac);
addPolicyAsExtElement(PolicyInclude.AXIS_OPERATION_POLICY,
- axisOperation.getPolicyInclude(), operation, fac);
+ axisOperation.getPolicyInclude(), operation, fac);
String MEP = axisOperation.getMessageExchangePattern();
@@ -623,11 +625,11 @@
if (inaxisMessage != null) {
operation.addAttribute(ATTRIBUTE_NAME, operationName, null);
OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
- wsdl);
+ wsdl);
addExtensionElement(fac, input, SOAP_BODY, SOAP_USE, use,
- null, targetNamespace, soap);
+ null, targetNamespace, soap);
addPolicyAsExtElement(PolicyInclude.BINDING_INPUT_POLICY,
- inaxisMessage.getPolicyInclude(), input, fac);
+ inaxisMessage.getPolicyInclude(), input, fac);
operation.addChild(input);
writeSoapHeaders(inaxisMessage, fac, input, soap);
}
@@ -646,11 +648,11 @@
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outAxisMessage != null) {
OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
- wsdl);
+ wsdl);
addExtensionElement(fac, output, SOAP_BODY, SOAP_USE, use,
- null, targetNamespace, soap);
+ null, targetNamespace, soap);
addPolicyAsExtElement(PolicyInclude.BINDING_OUTPUT_POLICY,
- outAxisMessage.getPolicyInclude(), output, fac);
+ outAxisMessage.getPolicyInclude(), output, fac);
operation.addChild(output);
writeSoapHeaders(outAxisMessage, fac, output, soap);
}
@@ -663,11 +665,11 @@
AxisMessage faultyMessage = (AxisMessage) faultyMessages
.get(i);
OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME,
- wsdl);
+ wsdl);
addExtensionElement(fac, fault, FAULT_LOCAL_NAME, SOAP_USE, use,
ATTRIBUTE_NAME, faultyMessage.getName(), soap12);
fault.addAttribute(ATTRIBUTE_NAME, faultyMessage.getName(),
- null);
+ null);
// TODO adding policies for fault messages
operation.addChild(fault);
writeSoapHeaders(faultyMessage, fac, fault, soap);
@@ -696,7 +698,7 @@
// Adding ext elements
addExtensionElement(fac, binding, BINDING_LOCAL_NAME, TRANSPORT,
- TRANSPORT_URI, STYLE, style, soap12);
+ TRANSPORT_URI, STYLE, style, soap12);
// Add WS-Addressing UsingAddressing element if appropriate
// SHOULD be on the binding element per the specification
@@ -705,17 +707,17 @@
OMNamespace wsawNamespace = fac.createOMNamespace(
AddressingConstants.Final.WSAW_NAMESPACE, "wsaw");
addExtensionElement(fac, binding,
- AddressingConstants.USING_ADDRESSING,
- DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true",
- wsawNamespace);
+ AddressingConstants.USING_ADDRESSING,
+ DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true",
+ wsawNamespace);
} else if (axisService.getWSAddressingFlag().equals(
AddressingConstants.ADDRESSING_REQUIRED)) {
OMNamespace wsawNamespace = fac.createOMNamespace(
AddressingConstants.Final.WSAW_NAMESPACE, "wsaw");
addExtensionElement(fac, binding,
- AddressingConstants.USING_ADDRESSING,
- DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true",
- wsawNamespace);
+ AddressingConstants.USING_ADDRESSING,
+ DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true",
+ wsawNamespace);
}
for (Iterator operations = axisService.getOperations(); operations.hasNext();) {
@@ -725,19 +727,19 @@
}
String opeartionName = axisOperation.getName().getLocalPart();
OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
- wsdl);
+ wsdl);
binding.addChild(operation);
String soapAction = axisOperation.getInputAction();
if (soapAction == null) {
soapAction = "";
}
addExtensionElement(fac, operation, OPERATION_LOCAL_NAME,
- SOAP_ACTION, soapAction, STYLE, style, soap12);
+ SOAP_ACTION, soapAction, STYLE, style, soap12);
addPolicyAsExtElement(PolicyInclude.BINDING_OPERATION_POLICY,
- axisOperation.getPolicyInclude(), operation, fac);
+ axisOperation.getPolicyInclude(), operation, fac);
addPolicyAsExtElement(PolicyInclude.AXIS_OPERATION_POLICY,
- axisOperation.getPolicyInclude(), operation, fac);
+ axisOperation.getPolicyInclude(), operation, fac);
String MEP = axisOperation.getMessageExchangePattern();
@@ -757,11 +759,11 @@
if (inaxisMessage != null) {
operation.addAttribute(ATTRIBUTE_NAME, opeartionName, null);
OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
- wsdl);
+ wsdl);
addExtensionElement(fac, input, SOAP_BODY, SOAP_USE, use,
- null, targetNamespace, soap12);
+ null, targetNamespace, soap12);
addPolicyAsExtElement(PolicyInclude.BINDING_INPUT_POLICY,
- inaxisMessage.getPolicyInclude(), input, fac);
+ inaxisMessage.getPolicyInclude(), input, fac);
operation.addChild(input);
writeSoapHeaders(inaxisMessage, fac, input, soap12);
}
@@ -780,11 +782,11 @@
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outAxisMessage != null) {
OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
- wsdl);
+ wsdl);
addExtensionElement(fac, output, SOAP_BODY, SOAP_USE, use,
- null, targetNamespace, soap12);
+ null, targetNamespace, soap12);
addPolicyAsExtElement(PolicyInclude.BINDING_OUTPUT_POLICY,
- outAxisMessage.getPolicyInclude(), output, fac);
+ outAxisMessage.getPolicyInclude(), output, fac);
operation.addChild(output);
writeSoapHeaders(outAxisMessage, fac, output, soap12);
}
@@ -797,11 +799,11 @@
AxisMessage faultyMessage = (AxisMessage) faultyMessages
.get(i);
OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME,
- wsdl);
+ wsdl);
addExtensionElement(fac, fault, FAULT_LOCAL_NAME, SOAP_USE, use,
ATTRIBUTE_NAME, faultyMessage.getName(), soap12);
fault.addAttribute(ATTRIBUTE_NAME, faultyMessage.getName(),
- null);
+ null);
// add policies for fault messages
operation.addChild(fault);
writeSoapHeaders(faultyMessage, fac, fault, soap12);
@@ -832,7 +834,7 @@
}
String opeartionName = axisOperation.getName().getLocalPart();
OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
- wsdl);
+ wsdl);
binding.addChild(operation);
OMElement httpOperation = fac.createOMElement("operation", http);
@@ -858,9 +860,9 @@
if (inaxisMessage != null) {
operation.addAttribute(ATTRIBUTE_NAME, opeartionName, null);
OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
- wsdl);
+ wsdl);
OMElement inputelement = fac.createOMElement("content",
- mime);
+ mime);
input.addChild(inputelement);
inputelement.addAttribute("type", "text/xml", null);
operation.addChild(input);
@@ -880,7 +882,7 @@
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outAxisMessage != null) {
OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
- wsdl);
+ wsdl);
OMElement outElement = fac.createOMElement("content", mime);
outElement.addChild(outElement);
outElement.addAttribute("type", "text/xml", null);
@@ -906,7 +908,8 @@
}
private void addExtensionElement(OMFactory fac, OMElement element,
- String name, String att1Name, String att1Value, String att2Name,
+ String name, String att1Name, String att1Value,
+ String att2Name,
String att2Value, OMNamespace soapNameSpace) {
OMElement soapbinding = fac.createOMElement(name, soapNameSpace);
element.addChild(soapbinding);
@@ -1061,7 +1064,7 @@
org.apache.neethi.Constants.URI_POLICY_NS,
org.apache.neethi.Constants.ATTR_WSP);
OMAttribute URIs = factory.createOMAttribute("PolicyURIs", ns,
- value);
+ value);
element.addAttribute(URIs);
}
}
@@ -1075,7 +1078,7 @@
for (; iterator.hasNext();) {
policy = (Policy) iterator.next();
policyElement = PolicyUtil.getPolicyComponentAsOMElement(policy,
- serializer);
+ serializer);
firstChild = definition.getFirstOMChild();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL2.java Sun Mar 4 10:16:54 2007
@@ -52,7 +52,7 @@
public OMElement generateOM() throws Exception {
OMFactory fac = OMAbstractFactory.getOMFactory();
fac.createOMNamespace(WSDL_NAMESPACE,
- DEFAULT_WSDL_NAMESPACE_PREFIX);
+ DEFAULT_WSDL_NAMESPACE_PREFIX);
OMElement description = fac.createOMElement(DESCRIPTION, null);
Map nameSpaceMap = axisService.getNameSpacesMap();
Iterator keys = nameSpaceMap.keySet().iterator();
@@ -71,11 +71,11 @@
prefix = DEFAULT_TARGET_NAMESPACE_PREFIX;
}
axisService.getNameSpacesMap().put(prefix,
- axisService.getTargetNamespace());
+ axisService.getTargetNamespace());
tns = description.declareNamespace(axisService.getTargetNamespace(), prefix);
description.addAttribute("targetNamespace", axisService.getTargetNamespace(),
- null);
+ null);
//adding service document
if (axisService.getServiceDescription() != null) {
addDocumentation(description, fac, axisService.getServiceDescription());
@@ -94,7 +94,8 @@
String schemaString = writer.toString();
if (!"".equals(schemaString)) {
- wsdlTypes.addChild(XMLUtils.toOM(new ByteArrayInputStream(schemaString.getBytes())));
+ wsdlTypes.addChild(
+ XMLUtils.toOM(new ByteArrayInputStream(schemaString.getBytes())));
}
}
}
@@ -142,7 +143,7 @@
String operationName = axisOperation.getName().getLocalPart();
OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
- null);
+ null);
interfaceElement.addChild(operation);
operation.addAttribute(ATTRIBUTE_NAME, operationName, null);
String MEP = axisOperation.getMessageExchangePattern();
@@ -159,8 +160,9 @@
.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (inaxisMessage != null) {
OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
- null);
- input.addAttribute(MESSAGE_LABEL, WSDLConstants.MESSAGE_LABEL_IN_VALUE, null);
+ null);
+ input.addAttribute(MESSAGE_LABEL, WSDLConstants.MESSAGE_LABEL_IN_VALUE,
+ null);
operation.addChild(input);
addMessageElementAtt(input, inaxisMessage);
}
@@ -176,9 +178,10 @@
.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outAxisMessage != null) {
OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
- null);
+ null);
operation.addChild(output);
- output.addAttribute(MESSAGE_LABEL, WSDLConstants.MESSAGE_LABEL_OUT_VALUE, null);
+ output.addAttribute(MESSAGE_LABEL, WSDLConstants.MESSAGE_LABEL_OUT_VALUE,
+ null);
addMessageElementAtt(output, outAxisMessage);
}
}
@@ -205,15 +208,16 @@
String direction = faultMessage.getDirection();
OMElement faultElement = null;
if (MESSAGE_LABEL_OUT.equalsIgnoreCase(direction)) {
- faultElement = fac.createOMElement(OUT_FAULT, null, operationElement);
- }else if (MESSAGE_LABEL_IN.equalsIgnoreCase(direction)) {
- faultElement = fac.createOMElement(IN_FAULT, null, operationElement);
+ faultElement = fac.createOMElement(OUT_FAULT, null, operationElement);
+ } else if (MESSAGE_LABEL_IN.equalsIgnoreCase(direction)) {
+ faultElement = fac.createOMElement(IN_FAULT, null, operationElement);
} else {
return;
}
faultElement.addAttribute(MESSAGE_LABEL, direction, null);
- faultElement.addAttribute(ATTRIBUTE_REF, elementQName.getPrefix() + ":" + elementQName.getLocalPart(), null);
+ faultElement.addAttribute(ATTRIBUTE_REF, elementQName.getPrefix() + ":" +
+ elementQName.getLocalPart(), null);
}
}
@@ -229,8 +233,9 @@
OMElement bindingElement = fac.createOMElement(BINDING_LOCAL_NAME, null);
description.addChild(bindingElement);
bindingElement.addAttribute("name", axisService.getName() + SOAP_BINDING_PREFIX, null);
- bindingElement.addAttribute(INTERFACE_LOCAL_NAME, tns.getPrefix() + ":" + axisService.getName() +
- INTERFACE_PREFIX, null);
+ bindingElement
+ .addAttribute(INTERFACE_LOCAL_NAME, tns.getPrefix() + ":" + axisService.getName() +
+ INTERFACE_PREFIX, null);
bindingElement.addAttribute("type", URI_WSDL2_SOAP, null);
bindingElement.addAttribute("protocol", HTTP_PROTOCAL, wsoap);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java Sun Mar 4 10:16:54 2007
@@ -36,7 +36,8 @@
public static synchronized TransportOutDescription inferOutTransport(AxisConfiguration ac,
EndpointReference epr,
- MessageContext msgctx) throws AxisFault {
+ MessageContext msgctx)
+ throws AxisFault {
String transportURI = (String) msgctx.getProperty(Constants.Configuration.TRANSPORT_URL);
if (transportURI != null && !"".equals(transportURI)) {
int index = transportURI.indexOf(':');
@@ -74,7 +75,8 @@
public static synchronized TransportInDescription inferInTransport(AxisConfiguration ac,
Options options,
- MessageContext msgCtxt) throws AxisFault {
+ MessageContext msgCtxt)
+ throws AxisFault {
String listenerTransportProtocol = options.getTransportInProtocol();
if (listenerTransportProtocol == null) {
EndpointReference replyTo = msgCtxt.getReplyTo();
@@ -102,7 +104,7 @@
// TODO : User should not be mandated to give an IN transport. If it is not given, we should
// ask from the ListenerManager to give any available transport for this client.
throw new AxisFault(Messages.getMessage("unknownTransport",
- listenerTransportProtocol));
+ listenerTransportProtocol));
}
if (!listenerManager.isListenerRunning(transportIn.getName().getLocalPart())) {
listenerManager.addListener(transportIn, false);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Flow.java Sun Mar 4 10:16:54 2007
@@ -23,7 +23,7 @@
/**
* Class FlowImpl
*/
-public class Flow {
+public class Flow {
/**
* Field list
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/FlowInclude.java Sun Mar 4 10:16:54 2007
@@ -20,7 +20,7 @@
/**
* Class FlowIncludeImpl
*/
-public class FlowInclude {
+public class FlowInclude {
/**
* Field fault
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java Sun Mar 4 10:16:54 2007
@@ -38,7 +38,7 @@
public InOnlyAxisOperation() {
super();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName()+"_"+UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" + UUIDGenerator.getUUID());
this.setName(tmpName);
createMessage();
setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_IN_ONLY);
@@ -69,7 +69,8 @@
}
}
- public void addFaultMessageContext(MessageContext msgContext, OperationContext opContext) throws AxisFault {
+ public void addFaultMessageContext(MessageContext msgContext, OperationContext opContext)
+ throws AxisFault {
HashMap mep = opContext.getMessageContexts();
MessageContext faultMessageCtxt = (MessageContext) mep.get(MESSAGE_LABEL_FAULT_VALUE);
if (faultMessageCtxt != null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java Sun Mar 4 10:16:54 2007
@@ -29,7 +29,7 @@
public InOutAxisOperation() {
super();
//setup a temporary name
- QName tmpName = new QName(this.getClass().getName()+"_"+UUIDGenerator.getUUID());
+ QName tmpName = new QName(this.getClass().getName() + "_" + UUIDGenerator.getUUID());
this.setName(tmpName);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org