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 [9/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/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Sun Mar 4 10:16:54 2007
@@ -47,7 +47,7 @@
public OutInAxisOperation() {
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);
setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_OUT_IN);
}
@@ -100,7 +100,7 @@
class OutInAxisOperationClient extends OperationClient {
private static Log log = LogFactory.getLog(OutInAxisOperationClient.class);
-
+
OutInAxisOperationClient(OutInAxisOperation axisOp, ServiceContext sc,
Options options) {
super(axisOp, sc, options);
@@ -184,23 +184,26 @@
* async calls alone.
*/
boolean useAsync = false;
- if(!options.isUseSeparateListener()) {
- Boolean useAsyncOption = (Boolean) mc.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
+ if (!options.isUseSeparateListener()) {
+ Boolean useAsyncOption =
+ (Boolean) mc.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS);
if (useAsyncOption != null) {
useAsync = useAsyncOption.booleanValue();
}
}
-
+
if (useAsync || options.isUseSeparateListener()) {
if (log.isDebugEnabled()) {
- log.debug("useAsync=" + useAsync + ", seperateListener=" + options.isUseSeparateListener());
+ log.debug("useAsync=" + useAsync + ", seperateListener=" +
+ options.isUseSeparateListener());
}
/**
* We are following the async path. If the user hasn't set a callback object then we must
* block until the whole MEP is complete, as they have no other way to get their reply message.
*/
CallbackReceiver callbackReceiver = null;
- if(axisOp.getMessageReceiver() != null && axisOp.getMessageReceiver() instanceof CallbackReceiver) {
+ if (axisOp.getMessageReceiver() != null &&
+ axisOp.getMessageReceiver() instanceof CallbackReceiver) {
callbackReceiver = (CallbackReceiver) axisOp.getMessageReceiver();
} else {
if (log.isDebugEnabled()) {
@@ -209,9 +212,9 @@
callbackReceiver = new CallbackReceiver();
axisOp.setMessageReceiver(callbackReceiver);
}
-
+
SyncCallBack internalCallback = null;
- if(callback != null) {
+ if (callback != null) {
callbackReceiver.addCallback(mc.getMessageID(), callback);
} else {
if (log.isDebugEnabled()) {
@@ -220,41 +223,44 @@
internalCallback = new SyncCallBack();
callbackReceiver.addCallback(mc.getMessageID(), internalCallback);
}
-
+
/**
* If USE_CUSTOM_LISTENER is set to 'true' the replyTo value will not be replaced and Axis2 will not
* start its internal listner. Some other enntity (e.g. a module) should take care of obtaining the
* response message.
*/
- Boolean useCustomListener = (Boolean) options.getProperty(Constants.Configuration.USE_CUSTOM_LISTENER);
+ Boolean useCustomListener =
+ (Boolean) options.getProperty(Constants.Configuration.USE_CUSTOM_LISTENER);
if (useAsync) {
useCustomListener = Boolean.TRUE;
}
- if (useCustomListener==null || !useCustomListener.booleanValue()) {
+ if (useCustomListener == null || !useCustomListener.booleanValue()) {
+
+ EndpointReference replyToFromTransport =
+ mc.getConfigurationContext().getListenerManager().
+ getEPRforService(sc.getAxisService().getName(),
+ axisOp.getName().getLocalPart(), mc
+ .getTransportIn().getName()
+ .getLocalPart());
- EndpointReference replyToFromTransport = mc.getConfigurationContext().getListenerManager().
- getEPRforService(sc.getAxisService().getName(), axisOp.getName().getLocalPart(), mc
- .getTransportIn().getName()
- .getLocalPart());
-
if (mc.getReplyTo() == null) {
mc.setReplyTo(replyToFromTransport);
} else {
mc.getReplyTo().setAddress(replyToFromTransport.getAddress());
}
}
-
+
//if we don't do this , this guy will wait till it gets HTTP 202 in the HTTP case
mc.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.TRUE);
AxisEngine engine = new AxisEngine(cc);
mc.getConfigurationContext().registerOperationContext(mc.getMessageID(), oc);
engine.send(mc);
-
- if(internalCallback != null) {
+
+ if (internalCallback != null) {
long timeout = options.getTimeOutInMilliSeconds();
long waitTime = timeout;
long startTime = System.currentTimeMillis();
-
+
synchronized (internalCallback) {
while (! internalCallback.isComplete() && waitTime >= 0) {
try {
@@ -280,14 +286,14 @@
throw new AxisFault(Messages.getMessage("responseTimeOut"));
} else {
throw new AxisFault(Messages.getMessage("callBackCompletedWithError"));
+ }
}
}
- }
} else {
if (block) {
// Send the SOAP Message and receive a response
- send(mc);
- completed = true;
+ send(mc);
+ completed = true;
} else {
sc.getConfigurationContext().getThreadPool().execute(
new NonBlockingInvocationWorker(callback, mc));
@@ -303,7 +309,7 @@
*/
protected MessageContext send(MessageContext msgctx) throws AxisFault {
- AxisEngine engine = new AxisEngine(msgctx.getConfigurationContext());
+ AxisEngine engine = new AxisEngine(msgctx.getConfigurationContext());
// create the responseMessageContext
@@ -349,7 +355,7 @@
* createSOAPMessage take care of figuring out what the SOAP namespace is.
*/
SOAPEnvelope resenvelope = TransportUtils.createSOAPMessage(responseMessageContext);
- if (resenvelope != null) {
+ if (resenvelope != null) {
responseMessageContext.setEnvelope(resenvelope);
} else {
throw new AxisFault(Messages
@@ -420,7 +426,7 @@
}
}
}
-
+
/**
* This class acts as a callback that allows users to wait on the result.
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java Sun Mar 4 10:16:54 2007
@@ -47,7 +47,7 @@
public OutOnlyAxisOperation() {
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_OUT_ONLY);
@@ -71,14 +71,15 @@
OperationContext opContext) throws AxisFault {
if (!opContext.isComplete()) {
opContext.getMessageContexts().put(MESSAGE_LABEL_OUT_VALUE,
- msgContext);
+ msgContext);
opContext.setComplete(true);
} else {
throw new AxisFault(Messages.getMessage("mepcompleted"));
}
}
- 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);
@@ -241,7 +242,7 @@
// setting message ID if it null
// create the operation context for myself
- OperationContext oc = ContextFactory.createOperationContext(axisOp,sc);
+ OperationContext oc = ContextFactory.createOperationContext(axisOp, sc);
oc.addMessageContext(mc);
// ship it out
AxisEngine engine = new AxisEngine(cc);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/Parameter.java Sun Mar 4 10:16:54 2007
@@ -55,10 +55,10 @@
private static final long serialVersionUID = -6601664200673063531L;
/**
- * @serial Tracks the revision level of a class to identify changes to the
+ * @serial Tracks the revision level of a class to identify changes to the
* class definition that are compatible to serialization/externalization.
* If a class definition changes, then the serialization/externalization
- * of the class is affected.
+ * of the class is affected.
* Refer to the writeExternal() and readExternal() methods.
*/
// supported revision levels, add a new level to manage compatible changes
@@ -67,7 +67,6 @@
private static final int revisionID = REVISION_1;
-
/**
* Field TEXT_PARAMETER
*/
@@ -202,10 +201,10 @@
}
public boolean equals(Object obj) {
- if(this == obj){
+ if (this == obj) {
return true;
}
- if(obj instanceof Parameter){
+ if (obj instanceof Parameter) {
return ((Parameter) obj).name.equals(name);
}
return false;
@@ -215,31 +214,30 @@
return name.hashCode();
}
-
/* ===============================================================
- * Externalizable support
- * ===============================================================
- */
-
+ * Externalizable support
+ * ===============================================================
+ */
+
/**
* Save the contents of this object.
* <p/>
* NOTE: Transient fields and static fields are not saved.
- * Also, objects that represent "static" data are
- * not saved, except for enough information to be
- * able to find matching objects when the message
- * context is re-constituted.
+ * Also, objects that represent "static" data are
+ * not saved, except for enough information to be
+ * able to find matching objects when the message
+ * context is re-constituted.
*
- * @param out The stream to write the object contents to
+ * @param out The stream to write the object contents to
* @throws IOException
*/
public void writeExternal(ObjectOutput out) throws IOException {
// write out contents of this object
//---------------------------------------------------------
- // in order to handle future changes to the message
- // context definition, be sure to maintain the
+ // in order to handle future changes to the message
+ // context definition, be sure to maintain the
// object level identifiers
//---------------------------------------------------------
// serialization version ID
@@ -257,7 +255,6 @@
ObjectStateUtils.writeString(out, name, "Parameter.name");
-
//---------------------------------------------------------
// object fields
//---------------------------------------------------------
@@ -275,7 +272,6 @@
// treat as an object, don't do UTF
ObjectStateUtils.writeObject(out, tmp, "Parameter.parameterElement");
-
// TODO: error handling if this can't be serialized
ObjectStateUtils.writeObject(out, value, "Parameter.value");
@@ -286,24 +282,25 @@
* Restore the contents of the object that was previously saved.
* <p/>
* NOTE: The field data must read back in the same order and type
- * as it was written. Some data will need to be validated when
+ * as it was written. Some data will need to be validated when
* resurrected.
*
- * @param in The stream to read the object contents from
+ * @param in The stream to read the object contents from
* @throws IOException
* @throws ClassNotFoundException
*/
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// trace point
if (log.isTraceEnabled()) {
- log.trace(myClassName+":readExternal(): BEGIN bytes available in stream ["+in.available()+"] ");
+ log.trace(myClassName + ":readExternal(): BEGIN bytes available in stream [" +
+ in.available() + "] ");
}
// serialization version ID
long suid = in.readLong();
// revision ID
- int revID = in.readInt();
+ int revID = in.readInt();
// make sure the object data is in a version we can handle
if (suid != serialVersionUID) {
@@ -324,7 +321,6 @@
name = ObjectStateUtils.readString(in, "Parameter.name");
-
//---------------------------------------------------------
// object fields
//---------------------------------------------------------
@@ -344,7 +340,7 @@
XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(bais);
// TODO: the StAXOMBuilder is an impl class - is there a better mechanism rather than an impl class ?
- StAXOMBuilder builder = new StAXOMBuilder(OMAbstractFactory.getOMFactory(), parser);
+ StAXOMBuilder builder = new StAXOMBuilder(OMAbstractFactory.getOMFactory(), parser);
OMElement docElement = builder.getDocumentElement();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ParameterIncludeImpl.java Sun Mar 4 10:16:54 2007
@@ -237,7 +237,8 @@
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// trace point
if (log.isTraceEnabled()) {
- log.trace(myClassName + ":readExternal(): BEGIN bytes available in stream [" + in.available() + "] ");
+ log.trace(myClassName + ":readExternal(): BEGIN bytes available in stream [" +
+ in.available() + "] ");
}
// serialization version ID
@@ -267,7 +268,8 @@
parameters.putAll(tmp);
} else {
if (log.isTraceEnabled()) {
- log.trace(myClassName + ":readExternal(): WARNING: parameters doesnot have a defined HashMap ");
+ log.trace(myClassName +
+ ":readExternal(): WARNING: parameters doesnot have a defined HashMap ");
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/PolicyInclude.java Sun Mar 4 10:16:54 2007
@@ -31,7 +31,7 @@
public static final int ANON_POLICY = 100;
public static final int AXIS_POLICY = 1;
-
+
public static final int AXIS_MODULE_POLICY = 2;
public static final int AXIS_SERVICE_POLICY = 3;
@@ -65,19 +65,19 @@
private Policy policy = null;
private Policy effectivePolicy = null;
-
+
private PolicyRegistry reg;
private AxisDescription description;
-
+
private Hashtable wrapperElements = new Hashtable();
public PolicyInclude() {
reg = new PolicyRegistryImpl();
}
-
+
public PolicyInclude(AxisDescription axisDescription) {
-
+
if (axisDescription.getParent() != null) {
PolicyInclude parentPolicyInclude = axisDescription.getParent().getPolicyInclude();
reg = new PolicyRegistryImpl(parentPolicyInclude.getPolicyRegistry());
@@ -90,18 +90,18 @@
public void setPolicyRegistry(PolicyRegistry reg) {
this.reg = reg;
}
-
+
public PolicyRegistry getPolicyRegistry() {
return reg;
}
public void setPolicy(Policy policy) {
wrapperElements.clear();
-
+
if (policy.getName() == null && policy.getId() == null) {
policy.setId(UUIDGenerator.getUUID());
}
-
+
Wrapper wrapper = new Wrapper(PolicyInclude.ANON_POLICY, policy);
if (policy.getName() != null) {
wrapperElements.put(policy.getName(), wrapper);
@@ -109,31 +109,31 @@
wrapperElements.put(policy.getId(), wrapper);
}
}
-
+
public void updatePolicy(Policy policy) {
String key;
-
+
if ((key = policy.getName()) == null && (key = policy.getId()) == null) {
// TODO throw more meaningful exception ..
- throw new RuntimeException("policy doesn't have a name or an id ");
+ throw new RuntimeException("policy doesn't have a name or an id ");
}
-
+
Wrapper wrapper = (Wrapper) wrapperElements.get(key);
wrapper.value = policy;
}
-
+
public void setEffectivePolicy(Policy effectivePolicy) {
this.effectivePolicy = effectivePolicy;
}
-
+
public void setDescription(AxisDescription description) {
this.description = description;
}
-
+
public AxisDescription getDescription() {
return description;
}
-
+
private PolicyInclude getParent() {
if (description != null && description.getParent() != null) {
@@ -163,38 +163,38 @@
// TODO AxisFault?
throw new RuntimeException();
}
-
+
result = (result == null) ? (Policy) p : (Policy) result.merge(p);
}
-
+
this.policy = result;
}
private void calculateEffectivePolicy() {
- Policy result ;
-
+ Policy result;
+
if (getParent() != null) {
Policy parentPolicy = getParent().getEffectivePolicy();
-
+
if (parentPolicy == null) {
result = getPolicy();
-
+
} else {
-
+
if (getPolicy() != null) {
result = (Policy) parentPolicy.merge(getPolicy());
-
+
} else {
result = parentPolicy;
}
}
-
+
} else {
result = getPolicy();
}
setEffectivePolicy(result);
}
-
+
public Policy getPolicy() {
calculatePolicy();
return policy;
@@ -240,15 +240,15 @@
}
public void addPolicyElement(int type, Policy policy) {
-
+
String key;
-
+
if ((key = policy.getName()) == null && (key = policy.getId()) == null) {
policy.setId(UUIDGenerator.getUUID());
}
-
+
key = (policy.getName() != null) ? policy.getName() : policy.getId();
-
+
Wrapper wrapper = new Wrapper(type, policy);
wrapperElements.put(key, wrapper);
reg.register(key, policy);
@@ -262,35 +262,35 @@
class Wrapper {
private int type;
private Object value;
-
+
Wrapper(int type, Object value) {
setType(type);
setValue(value);
}
-
+
void setType(int type) {
this.type = type;
}
-
+
int getType() {
return type;
}
-
+
void setValue(Object value) {
this.value = value;
}
-
+
Object getValue() {
return value;
}
}
-
+
public void removePolicyElement(String policyURI) {
wrapperElements.remove(policyURI);
reg.remove(policyURI);
}
- public void removeAllPolicyElements(){
+ public void removeAllPolicyElements() {
wrapperElements.clear();
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Sun Mar 4 10:16:54 2007
@@ -37,7 +37,7 @@
public RobustOutOnlyAxisOperation() {
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);
setMessageExchangePattern(WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY);
}
@@ -53,7 +53,8 @@
class RobustOutOnlyOperationClient extends OutInAxisOperationClient {
- public RobustOutOnlyOperationClient(OutInAxisOperation axisOp, ServiceContext sc, Options options) {
+ public RobustOutOnlyOperationClient(OutInAxisOperation axisOp, ServiceContext sc,
+ Options options) {
super(axisOp, sc, options);
}
@@ -84,7 +85,8 @@
responseMessageContext.setTransportIn(msgctx.getTransportIn());
responseMessageContext.setTransportOut(msgctx.getTransportOut());
responseMessageContext.setProperty(MessageContext.TRANSPORT_HEADERS,
- msgctx.getProperty(MessageContext.TRANSPORT_HEADERS));
+ msgctx.getProperty(
+ MessageContext.TRANSPORT_HEADERS));
SOAPEnvelope envelope = responseMessageContext.getEnvelope();
if (envelope == null) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java Sun Mar 4 10:16:54 2007
@@ -41,7 +41,7 @@
public TwoChannelAxisOperation() {
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);
createMessages();
}
@@ -70,16 +70,16 @@
}
public void addMessage(AxisMessage message, String label) {
- if (WSDLConstants.MESSAGE_LABEL_OUT_VALUE.equals(label)) {
- addChild("outMessage", message);
- } else if (WSDLConstants.MESSAGE_LABEL_IN_VALUE.equals(label)) {
- addChild("inMessage", message);
- } else if (WSDLConstants.MESSAGE_LABEL_FAULT_VALUE.equals(label)) {
- addChild("faultMessage", message);
- } else {
- throw new UnsupportedOperationException("Not yet implemented");
- }
- }
+ if (WSDLConstants.MESSAGE_LABEL_OUT_VALUE.equals(label)) {
+ addChild("outMessage", message);
+ } else if (WSDLConstants.MESSAGE_LABEL_IN_VALUE.equals(label)) {
+ addChild("inMessage", message);
+ } else if (WSDLConstants.MESSAGE_LABEL_FAULT_VALUE.equals(label)) {
+ addChild("faultMessage", message);
+ } else {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+ }
public AxisMessage getMessage(String label) {
@@ -92,7 +92,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);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java Sun Mar 4 10:16:54 2007
@@ -35,33 +35,33 @@
*/
public class WSDL11ToAllAxisServicesBuilder extends WSDL11ToAxisServiceBuilder {
protected static final Log log =
- LogFactory.getLog(WSDL11ToAllAxisServicesBuilder.class);
+ LogFactory.getLog(WSDL11ToAllAxisServicesBuilder.class);
public static final String WSDL_SERVICE_QNAME = "WSDL_SERVICE_QNAME";
public static final String WSDL_PORT = "WSDL_PORT";
private ArrayList axisServices = null;
-
+
/**
- * Class constructor.
+ * Class constructor.
*
- * @param in - Contains the wsdl 1.1 file
+ * @param in - Contains the wsdl 1.1 file
*/
public WSDL11ToAllAxisServicesBuilder(InputStream in) {
super(in);
axisServices = new ArrayList(); // create an empty ArrayList
}
-
+
/**
* Public method to access the wsdl 1.1 file and create a List of AxisService objects.
* For each port on each service in the wsdl, an AxisService object is created and
* added to the List. The name of the AxisService is changed from the service name
- * to the port name, since port names are unique to the wsdl.
+ * to the port name, since port names are 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 from the service name to the port name.
- * @throws AxisFault
+ * The name of the AxisService is modified from the service name to the port name.
+ * @throws AxisFault
*/
public List populateAllServices() throws AxisFault {
try {
@@ -70,8 +70,8 @@
}
setup(); // setup contains code with gathers non-service specific info
- // from the WSDL. This only needs to be done once per WSDL.
- if (wsdl4jDefinition == null) {
+ // from the WSDL. This only needs to be done once per WSDL.
+ if (wsdl4jDefinition == null) {
if (log.isDebugEnabled()) {
log.debug("Exit: populateAllServices. wsdl definition is null!");
}
@@ -105,7 +105,7 @@
Parameter portParameter = new Parameter();
portParameter.setName(WSDL_PORT);
portParameter.setValue(port);
- retAxisService.addParameter(portParameter);
+ retAxisService.addParameter(portParameter);
// since this AxisService really represents the wsdl
// port, change the name
// from wsdl service name to port name.
@@ -115,7 +115,7 @@
} // end if axisService was returned
} // end for all ports of a service
} // end for all services in the wsdl
-
+
if (log.isDebugEnabled()) {
log.debug("Exit: populateAllServices.");
}
@@ -124,7 +124,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/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=514453&r1=514452&r2=514453
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Sun Mar 4 10:16:54 2007
@@ -1,17 +1,19 @@
package org.apache.axis2.description;
-import java.io.IOException;
-import java.io.InputStream;
import com.ibm.wsdl.util.xml.DOM2Writer;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.transport.http.util.RESTUtil;
-import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.addressing.wsdl.WSDL11ActionHelper;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.util.RESTUtil;
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.util.XMLUtils;
-import org.apache.axis2.wsdl.*;
+import org.apache.axis2.wsdl.HttpAddress;
+import org.apache.axis2.wsdl.SOAPHeaderMessage;
+import org.apache.axis2.wsdl.SoapAddress;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.wsdl.WSDLUtil;
import org.apache.axis2.wsdl.util.WSDL4JImportedWSDLHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,9 +46,9 @@
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.UnknownExtensibilityElement;
+import javax.wsdl.extensions.http.HTTPAddress;
import javax.wsdl.extensions.http.HTTPBinding;
import javax.wsdl.extensions.http.HTTPOperation;
-import javax.wsdl.extensions.http.HTTPAddress;
import javax.wsdl.extensions.schema.Schema;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.extensions.soap.SOAPBinding;
@@ -70,7 +72,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.*;
+import java.util.TreeMap;
/*
* Copyright 2004,2005 The Apache Software Foundation.
@@ -255,7 +257,7 @@
if (null != wsdl4jTypes) {
this.copyExtensibleElements(wsdl4jTypes
.getExtensibilityElements(), wsdl4jDefinition,
- axisService, TYPES);
+ axisService, TYPES);
}
// add the newly created schemas
@@ -323,15 +325,18 @@
axisEndpoint = new AxisEndpoint();
axisEndpoint.setName(port.getName());
- if (axisService.getEndpointName() == null && bindingName.equals(port.getBinding().getQName())) {
+ if (axisService.getEndpointName() == null &&
+ bindingName.equals(port.getBinding().getQName())) {
populateEndpoint(axisEndpoint, port, true);
axisService.setEndpointName(axisEndpoint.getName());
axisService.setBindingName(axisEndpoint.getBinding().getName().getLocalPart());
- if (BINDING_TYPE_SOAP.equals(this.bindingType)){
- SoapAddress soapAddress = (SoapAddress) axisEndpoint.getProperty(WSDL2Constants.ATTR_WSOAP_ADDRESS);
+ if (BINDING_TYPE_SOAP.equals(this.bindingType)) {
+ SoapAddress soapAddress = (SoapAddress) axisEndpoint
+ .getProperty(WSDL2Constants.ATTR_WSOAP_ADDRESS);
axisService.setEndpointURL(soapAddress.getLocation());
- } else if (BINDING_TYPE_HTTP.equals(this.bindingType)){
- HttpAddress httpAddress = (HttpAddress) axisEndpoint.getProperty(WSDL2Constants.ATTR_WHTTP_LOCATION);
+ } else if (BINDING_TYPE_HTTP.equals(this.bindingType)) {
+ HttpAddress httpAddress = (HttpAddress) axisEndpoint
+ .getProperty(WSDL2Constants.ATTR_WHTTP_LOCATION);
axisService.setEndpointURL(httpAddress.getLocation());
}
@@ -356,11 +361,12 @@
* @param isSetMessageQNames
* @throws AxisFault
*/
- private void populateEndpoint(AxisEndpoint axisEndpoint, Port wsdl4jPort, boolean isSetMessageQNames)
+ private void populateEndpoint(AxisEndpoint axisEndpoint, Port wsdl4jPort,
+ boolean isSetMessageQNames)
throws AxisFault {
copyExtensibleElements(wsdl4jPort.getExtensibilityElements(), wsdl4jDefinition,
- axisEndpoint, BINDING);
+ axisEndpoint, BINDING);
AxisBinding axisBinding = new AxisBinding();
Binding wsdl4jBinding = wsdl4jDefinition.getBinding(wsdl4jPort.getBinding().getQName());
@@ -402,11 +408,12 @@
}
- private void populateBinding(AxisBinding axisBinding, Binding wsdl4jBinding, boolean isSetMessageQNames)
+ private void populateBinding(AxisBinding axisBinding, Binding wsdl4jBinding,
+ boolean isSetMessageQNames)
throws AxisFault {
copyExtensibleElements(wsdl4jBinding.getExtensibilityElements(), wsdl4jDefinition,
- axisBinding, BINDING);
+ axisBinding, BINDING);
List wsdl4jBidingOperations = wsdl4jBinding.getBindingOperations();
@@ -438,13 +445,14 @@
// process ExtensibilityElements of the wsdl4jBinding
copyExtensibleElements(wsdl4jBindingOperation.getExtensibilityElements(),
- wsdl4jDefinition, axisBindingOperation, BINDING_OPERATION);
+ wsdl4jDefinition, axisBindingOperation, BINDING_OPERATION);
- httpLocation = (String) axisBindingOperation.getProperty(WSDL2Constants.ATTR_WHTTP_LOCATION);
- if (httpLocation != null){
- httpLocationMap.put(RESTUtil.getConstantFromHTTPLocation(httpLocation),
- axisBindingOperation.getAxisOperation());
- }
+ httpLocation =
+ (String) axisBindingOperation.getProperty(WSDL2Constants.ATTR_WHTTP_LOCATION);
+ if (httpLocation != null) {
+ httpLocationMap.put(RESTUtil.getConstantFromHTTPLocation(httpLocation),
+ axisBindingOperation.getAxisOperation());
+ }
BindingInput wsdl4jBindingInput = wsdl4jBindingOperation.getBindingInput();
@@ -452,21 +460,24 @@
WSDLUtil.isInputPresentForMEP(axisOperation.getMessageExchangePattern())) {
AxisBindingMessage axisBindingInMessage = new AxisBindingMessage();
- copyExtensibleElements(wsdl4jBindingInput.getExtensibilityElements(), wsdl4jDefinition,
- axisBindingInMessage, BINDING_OPERATION_INPUT);
+ copyExtensibleElements(wsdl4jBindingInput.getExtensibilityElements(),
+ wsdl4jDefinition,
+ axisBindingInMessage, BINDING_OPERATION_INPUT);
AxisMessage axisInMessage =
axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (isSetMessageQNames) {
addQNameReference(axisInMessage, wsdl4jBindingOperation.getOperation(),
- wsdl4jBindingInput, wrappableOperations.contains(wsdl4jBindingOperation));
+ wsdl4jBindingInput,
+ wrappableOperations.contains(wsdl4jBindingOperation));
}
axisBindingInMessage.setAxisMessage(axisInMessage);
axisBindingInMessage.setDirection(axisInMessage.getDirection());
- axisBindingOperation.addChild(axisBindingInMessage.getDirection(), axisBindingInMessage);
+ axisBindingOperation
+ .addChild(axisBindingInMessage.getDirection(), axisBindingInMessage);
}
BindingOutput wsdl4jBindingOutput = wsdl4jBindingOperation.getBindingOutput();
@@ -477,12 +488,14 @@
AxisMessage axisOutMessage =
axisOperation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- copyExtensibleElements(wsdl4jBindingOutput.getExtensibilityElements(), wsdl4jDefinition,
- axisBindingOutMessage, BINDING_OPERATION_OUTPUT);
+ copyExtensibleElements(wsdl4jBindingOutput.getExtensibilityElements(),
+ wsdl4jDefinition,
+ axisBindingOutMessage, BINDING_OPERATION_OUTPUT);
if (isSetMessageQNames) {
addQNameReference(axisOutMessage, wsdl4jBindingOperation.getOperation(),
- wsdl4jBindingOutput, wrappableOperations.contains(wsdl4jBindingOperation));
+ wsdl4jBindingOutput,
+ wrappableOperations.contains(wsdl4jBindingOperation));
}
@@ -519,7 +532,7 @@
axisBinding.addChild(axisBindingOperation.getName(), axisBindingOperation);
}
- axisBinding.setProperty(WSDL2Constants.HTTP_LOCATION_TABLE,httpLocationMap);
+ axisBinding.setProperty(WSDL2Constants.HTTP_LOCATION_TABLE, httpLocationMap);
}
/**
@@ -589,7 +602,6 @@
* if user has specified we check whether it exists
* else pick a random service and throws an exception if not found any thing
*
- *
* @param definition
* @return service to process
* @throws AxisFault
@@ -665,7 +677,7 @@
if (port != null) {
copyExtensibleElements(port.getExtensibilityElements(), dif,
- axisService, PORT);
+ axisService, PORT);
binding = dif.getBinding(port.getBinding().getQName());
if (binding == null) {
binding = port.getBinding();
@@ -759,11 +771,11 @@
Message wsdl4jMessage = wsdl4jOperation.getInput().getMessage();
addQNameReference(inMessage,
- wsdl4jOperation,
- isWrapped,
- extensibilityElements,
- wsdl4jMessage,
- wsdl4jOperation.getName());
+ wsdl4jOperation,
+ isWrapped,
+ extensibilityElements,
+ wsdl4jMessage,
+ wsdl4jOperation.getName());
}
/**
@@ -785,11 +797,11 @@
Message wsdl4jMessage = wsdl4jOperation.getOutput().getMessage();
addQNameReference(outMessage,
- wsdl4jOperation,
- isWrapped,
- extensibilityElements,
- wsdl4jMessage,
- wsdl4jOperation.getName() + WRAPPED_OUTPUTNAME_SUFFIX);
+ wsdl4jOperation,
+ isWrapped,
+ extensibilityElements,
+ wsdl4jMessage,
+ wsdl4jOperation.getName() + WRAPPED_OUTPUTNAME_SUFFIX);
}
}
@@ -819,10 +831,14 @@
QName elementName = part.getElementName();
if (elementName != null) {
message.setElementQName(elementName);
- ((AxisService)message.getParent().getParent()).addMessageElementQNameToOperationMapping(elementName, (AxisOperation)message.getParent());
+ ((AxisService) message.getParent().getParent())
+ .addMessageElementQNameToOperationMapping(elementName,
+ (AxisOperation) message
+ .getParent());
} else {
- throw new WSDLProcessingException("No element type is defined for message " +
- wsdl4jMessage.getQName().getLocalPart());
+ throw new WSDLProcessingException(
+ "No element type is defined for message " +
+ wsdl4jMessage.getQName().getLocalPart());
}
} else {
// user has specified more than one parts with out specifing a part in
@@ -845,10 +861,14 @@
QName elementName = part.getElementName();
if (elementName != null) {
message.setElementQName(elementName);
- ((AxisService)message.getParent().getParent()).addMessageElementQNameToOperationMapping(elementName, (AxisOperation)message.getParent());
+ ((AxisService) message.getParent().getParent())
+ .addMessageElementQNameToOperationMapping(elementName,
+ (AxisOperation) message
+ .getParent());
} else {
- throw new WSDLProcessingException("No element type is defined for message" +
- wsdl4jMessage.getQName().getLocalPart());
+ throw new WSDLProcessingException(
+ "No element type is defined for message" +
+ wsdl4jMessage.getQName().getLocalPart());
}
} else {
throw new WSDLProcessingException("Missing part named "
@@ -858,8 +878,9 @@
} else {
// i.e more than one part specified in this case we have
// to send an exception
- throw new WSDLProcessingException("More than one element part is not allwed in document literal " +
- " type binding operation " + wsdl4jOperation.getName());
+ throw new WSDLProcessingException(
+ "More than one element part is not allwed in document literal " +
+ " type binding operation " + wsdl4jOperation.getName());
}
}
@@ -928,7 +949,7 @@
throws Exception {
copyExtensionAttributes(wsdl4jPortType.getExtensionAttributes(),
- axisService, PORT_TYPE);
+ axisService, PORT_TYPE);
// set port the type name
axisService.setEndpointName(wsdl4jPortType.getQName().getLocalPart());
@@ -939,7 +960,7 @@
while (wsdl4JOperationsIterator.hasNext()) {
wsdl4jOperation = (Operation) wsdl4JOperationsIterator.next();
axisService.addOperation(populateOperations(wsdl4jOperation,
- wsdl4jPortType, dif));
+ wsdl4jPortType, dif));
}
}
@@ -951,7 +972,8 @@
* @throws AxisFault
*/
private AxisOperation populateOperations(Operation wsdl4jOperation,
- PortType wsdl4jPortType, Definition dif) throws AxisFault {
+ PortType wsdl4jPortType, Definition dif)
+ throws AxisFault {
QName opName = new QName(wsdl4jOperation.getName());
// Copy Name Attribute
AxisOperation axisOperation = axisService.getOperation(opName);
@@ -966,7 +988,7 @@
}
copyExtensibleElements(wsdl4jOperation.getExtensibilityElements(), dif,
- axisOperation, PORT_TYPE_OPERATION);
+ axisOperation, PORT_TYPE_OPERATION);
Input wsdl4jInputMessage = wsdl4jOperation.getInput();
@@ -978,7 +1000,7 @@
if (null != message) {
inMessage.setName(message.getQName().getLocalPart());
copyExtensibleElements(message.getExtensibilityElements(),
- dif, inMessage, PORT_TYPE_OPERATION_INPUT);
+ dif, inMessage, PORT_TYPE_OPERATION_INPUT);
}
// Check if the action is already set as we don't want to
@@ -989,7 +1011,7 @@
if (inputActions == null || inputActions.size() == 0) {
action = WSDL11ActionHelper
.getActionFromInputElement(dif, wsdl4jPortType,
- wsdl4jOperation, wsdl4jInputMessage);
+ wsdl4jOperation, wsdl4jInputMessage);
}
if (action != null) {
if (inputActions == null) {
@@ -1010,7 +1032,7 @@
outMessage.setName(message.getQName().getLocalPart());
copyExtensibleElements(message.getExtensibilityElements(),
- dif, outMessage, PORT_TYPE_OPERATION_OUTPUT);
+ dif, outMessage, PORT_TYPE_OPERATION_OUTPUT);
// wsdl:portType -> wsdl:operation -> wsdl:output
}
@@ -1020,8 +1042,9 @@
String action = axisOperation.getOutputAction();
if (action == null) {
action = WSDL11ActionHelper.getActionFromOutputElement(dif,
- wsdl4jPortType, wsdl4jOperation,
- wsdl4jOutputMessage);
+ wsdl4jPortType,
+ wsdl4jOperation,
+ wsdl4jOutputMessage);
}
if (action != null) {
axisOperation.setOutputAction(action);
@@ -1041,7 +1064,7 @@
inMessage.setName(message.getQName().getLocalPart());
copyExtensibleElements(message.getExtensibilityElements(),
- dif, inMessage, PORT_TYPE_OPERATION_OUTPUT);
+ dif, inMessage, PORT_TYPE_OPERATION_OUTPUT);
}
// Check if the action is already set as we don't want to
@@ -1051,7 +1074,7 @@
if (action == null) {
action = WSDL11ActionHelper
.getActionFromInputElement(dif, wsdl4jPortType,
- wsdl4jOperation, wsdl4jInputMessage);
+ wsdl4jOperation, wsdl4jInputMessage);
}
if (action != null) {
axisOperation.setOutputAction(action);
@@ -1067,7 +1090,7 @@
outMessage.setName(message.getQName().getLocalPart());
copyExtensibleElements(message.getExtensibilityElements(),
- dif, outMessage, PORT_TYPE_OPERATION_INPUT);
+ dif, outMessage, PORT_TYPE_OPERATION_INPUT);
// wsdl:portType -> wsdl:operation -> wsdl:output
}
@@ -1078,8 +1101,9 @@
String action = null;
if (inputActions == null || inputActions.size() == 0) {
action = WSDL11ActionHelper.getActionFromOutputElement(dif,
- wsdl4jPortType, wsdl4jOperation,
- wsdl4jOutputMessage);
+ wsdl4jPortType,
+ wsdl4jOperation,
+ wsdl4jOutputMessage);
}
if (action != null) {
if (inputActions == null) {
@@ -1103,7 +1127,7 @@
.setName(faultMessage.getQName().getLocalPart());
copyExtensibleElements(faultMessage.getExtensibilityElements(),
- dif, axisFaultMessage, PORT_TYPE_OPERATION_FAULT);
+ dif, axisFaultMessage, PORT_TYPE_OPERATION_FAULT);
}
@@ -1113,7 +1137,8 @@
String action = axisOperation.getFaultAction(fault.getName());
if (action == null) {
action = WSDL11ActionHelper.getActionFromFaultElement(dif,
- wsdl4jPortType, wsdl4jOperation, fault);
+ wsdl4jPortType,
+ wsdl4jOperation, fault);
}
if (action != null) {
axisOperation.addFaultAction(fault.getName(), action);
@@ -1128,7 +1153,7 @@
*
* @param wsdl4jBinding
*/
- private Element[] generateWrapperSchema(Map schemaMap, Binding wsdl4jBinding){
+ private Element[] generateWrapperSchema(Map schemaMap, Binding wsdl4jBinding) {
List schemaElementList = new ArrayList();
// target namespace for this should be the namespace URI for
@@ -1151,9 +1176,9 @@
// this method returns all the new schemas created when processing the rpc messages
Map newSchemaMap = createSchemaForPorttype(porttypeNamespaceURI,
- wrappableBindingOperationsList, schemaMap);
+ wrappableBindingOperationsList, schemaMap);
- schemaElementList.addAll(newSchemaMap.values());
+ schemaElementList.addAll(newSchemaMap.values());
return (Element[]) schemaElementList
.toArray(new Element[schemaElementList.size()]);
}
@@ -1162,7 +1187,7 @@
* Create a schema by looking at the port type
*
* @param namespaceURI - namespace of the porttype uri we use this only if a user has not specified
- * a namespace in soap:body
+ * a namespace in soap:body
* @return null if there is no element
*/
private Map createSchemaForPorttype(String namespaceURI,
@@ -1228,7 +1253,8 @@
//loop through the input op map and generate the elements
BindingOperation operation;
- for (Iterator operationsIter = operationToInputMessageMap.keySet().iterator(); operationsIter.hasNext();) {
+ for (Iterator operationsIter = operationToInputMessageMap.keySet().iterator();
+ operationsIter.hasNext();) {
operation = (BindingOperation) operationsIter.next();
elementDeclaration = document.createElementNS(
@@ -1243,9 +1269,10 @@
if (bindingInput != null) {
Iterator partsIterator = null;
- if(BINDING_TYPE_SOAP.equals(this.bindingType)){
- // first see the body parts list
- List bodyPartsList = getPartsListFromSoapBody(bindingInput.getExtensibilityElements());
+ if (BINDING_TYPE_SOAP.equals(this.bindingType)) {
+ // first see the body parts list
+ List bodyPartsList =
+ getPartsListFromSoapBody(bindingInput.getExtensibilityElements());
if (bodyPartsList != null) {
partsIterator = message.getOrderedParts(bodyPartsList).iterator();
} else {
@@ -1269,50 +1296,52 @@
namespacePrefixMap = new HashMap();
Node newComplexType = getNewComplextType(document,
- xsdPrefix,
- partsIterator,
- namespaceImportsMap,
- namespacePrefixMap);
+ xsdPrefix,
+ partsIterator,
+ namespaceImportsMap,
+ namespacePrefixMap);
elementDeclaration.appendChild(newComplexType);
String namespaceToUse = namespaceURI;
- if (BINDING_TYPE_SOAP.equals(this.bindingType)){
- String bodyNamespace = getNamespaceFromSoapBody(bindingInput.getExtensibilityElements());
- namespaceToUse = bodyNamespace != null? bodyNamespace: namespaceURI;
+ if (BINDING_TYPE_SOAP.equals(this.bindingType)) {
+ String bodyNamespace =
+ getNamespaceFromSoapBody(bindingInput.getExtensibilityElements());
+ namespaceToUse = bodyNamespace != null ? bodyNamespace : namespaceURI;
}
- if (existingSchemaMap.containsKey(namespaceToUse)){
+ if (existingSchemaMap.containsKey(namespaceToUse)) {
// i.e this namespace is already exists with the original wsdl schemas
- addElementToAnExistingSchema((Element)existingSchemaMap.get(namespaceToUse),
- elementDeclaration,
- namespacePrefixMap,
- namespaceImportsMap,
- namespaceToUse);
- } else if (newSchemaMap.containsKey(namespaceToUse)){
- // i.e this namespace is with a newly created scheam
- addElementToAnExistingSchema((Element)newSchemaMap.get(namespaceToUse),
- elementDeclaration,
- namespacePrefixMap,
- namespaceImportsMap,
- namespaceToUse);
+ addElementToAnExistingSchema((Element) existingSchemaMap.get(namespaceToUse),
+ elementDeclaration,
+ namespacePrefixMap,
+ namespaceImportsMap,
+ namespaceToUse);
+ } else if (newSchemaMap.containsKey(namespaceToUse)) {
+ // i.e this namespace is with a newly created scheam
+ addElementToAnExistingSchema((Element) newSchemaMap.get(namespaceToUse),
+ elementDeclaration,
+ namespacePrefixMap,
+ namespaceImportsMap,
+ namespaceToUse);
} else {
// i.e this element namespace has not found yet so
// we have to create new schema for it
Element newSchema = createNewSchemaWithElemet(elementDeclaration,
- namespacePrefixMap,
- namespaceImportsMap,
- namespaceToUse,
- document,
- xsdPrefix);
- newSchemaMap.put(namespaceToUse,newSchema);
+ namespacePrefixMap,
+ namespaceImportsMap,
+ namespaceToUse,
+ document,
+ xsdPrefix);
+ newSchemaMap.put(namespaceToUse, newSchema);
}
resolvedRpcWrappedElementMap.put(operation.getName(), new QName(
namespaceToUse, operation.getName(), AXIS2WRAPPED));
} else {
- throw new WSDLProcessingException("No binding input is defiend for binding operation ==> "
- + operation.getName());
+ throw new WSDLProcessingException(
+ "No binding input is defiend for binding operation ==> "
+ + operation.getName());
}
}
@@ -1334,9 +1363,10 @@
if (bindingOutput != null) {
Iterator partsIterator = null;
- if (BINDING_TYPE_SOAP.equals(this.bindingType)){
+ if (BINDING_TYPE_SOAP.equals(this.bindingType)) {
// first see the body parts list
- List bodyPartsList = getPartsListFromSoapBody(bindingOutput.getExtensibilityElements());
+ List bodyPartsList =
+ getPartsListFromSoapBody(bindingOutput.getExtensibilityElements());
if (bodyPartsList != null) {
bodyPartsList.add("result");
partsIterator = message.getOrderedParts(bodyPartsList).iterator();
@@ -1357,68 +1387,69 @@
partsIterator = message.getParts().values().iterator();
}
-
// we have to initialize the hash maps always since we add the elements onece we
// generate it
namespacePrefixMap = new HashMap();
namespaceImportsMap = new HashMap();
Node newComplexType = getNewComplextType(document,
- xsdPrefix,
- partsIterator,
- namespaceImportsMap,
- namespacePrefixMap);
+ xsdPrefix,
+ partsIterator,
+ namespaceImportsMap,
+ namespacePrefixMap);
elementDeclaration.appendChild(newComplexType);
String namespaceToUse = namespaceURI;
- if (BINDING_TYPE_SOAP.equals(this.bindingType)){
- String bodyNamespace = getNamespaceFromSoapBody(bindingOutput.getExtensibilityElements());
- namespaceToUse = bodyNamespace != null? bodyNamespace: namespaceURI;
+ if (BINDING_TYPE_SOAP.equals(this.bindingType)) {
+ String bodyNamespace =
+ getNamespaceFromSoapBody(bindingOutput.getExtensibilityElements());
+ namespaceToUse = bodyNamespace != null ? bodyNamespace : namespaceURI;
}
- if (existingSchemaMap.containsKey(namespaceToUse)){
+ if (existingSchemaMap.containsKey(namespaceToUse)) {
// i.e this namespace is already exists with the original wsdl schemas
- addElementToAnExistingSchema((Element)existingSchemaMap.get(namespaceToUse),
- elementDeclaration,
- namespacePrefixMap,
- namespaceImportsMap,
- namespaceToUse);
- } else if (newSchemaMap.containsKey(namespaceToUse)){
- // i.e this namespace is with a newly created scheam
- addElementToAnExistingSchema((Element)newSchemaMap.get(namespaceToUse),
- elementDeclaration,
- namespacePrefixMap,
- namespaceImportsMap,
- namespaceToUse);
+ addElementToAnExistingSchema((Element) existingSchemaMap.get(namespaceToUse),
+ elementDeclaration,
+ namespacePrefixMap,
+ namespaceImportsMap,
+ namespaceToUse);
+ } else if (newSchemaMap.containsKey(namespaceToUse)) {
+ // i.e this namespace is with a newly created scheam
+ addElementToAnExistingSchema((Element) newSchemaMap.get(namespaceToUse),
+ elementDeclaration,
+ namespacePrefixMap,
+ namespaceImportsMap,
+ namespaceToUse);
} else {
// i.e this element namespace has not found yet so
// we have to create new schema for it
Element newSchema = createNewSchemaWithElemet(elementDeclaration,
- namespacePrefixMap,
- namespaceImportsMap,
- namespaceToUse,
- document,
- xsdPrefix);
- newSchemaMap.put(namespaceToUse,newSchema);
+ namespacePrefixMap,
+ namespaceImportsMap,
+ namespaceToUse,
+ document,
+ xsdPrefix);
+ newSchemaMap.put(namespaceToUse, newSchema);
}
resolvedRpcWrappedElementMap.put(outputOpName, new QName(
namespaceToUse, outputOpName, AXIS2WRAPPED));
} else {
- throw new WSDLProcessingException("No binding out put is defined for binding operation ==>" +
- operation.getName());
+ throw new WSDLProcessingException(
+ "No binding out put is defined for binding operation ==>" +
+ operation.getName());
}
}
- return newSchemaMap;
+ return newSchemaMap;
}
private void addElementToAnExistingSchema(Element schemaElement,
Element newElement,
Map namespacePrefixMap,
Map namespaceImportsMap,
- String targetNamespace){
+ String targetNamespace) {
Document ownerDocument = schemaElement.getOwnerDocument();
@@ -1428,7 +1459,7 @@
for (int i = 0; i < nameSpaceDeclarationArray.length; i++) {
String s = nameSpaceDeclarationArray[i];
checkAndAddNamespaceDeclarations(s, namespacePrefixMap,
- schemaElement);
+ schemaElement);
}
// add imports - check whether it is the targetnamespace before
@@ -1452,43 +1483,43 @@
Map namespaceImportsMap,
String targetNamespace,
Document document,
- String xsdPrefix){
+ String xsdPrefix) {
- Element schemaElement = document.createElementNS(
- XMLSCHEMA_NAMESPACE_URI, xsdPrefix + ":"
- + XML_SCHEMA_LOCAL_NAME);
+ Element schemaElement = document.createElementNS(
+ XMLSCHEMA_NAMESPACE_URI, xsdPrefix + ":"
+ + XML_SCHEMA_LOCAL_NAME);
- // loop through the namespace declarations first
- String[] nameSpaceDeclarationArray = (String[]) namespacePrefixMap
- .keySet().toArray(new String[namespacePrefixMap.size()]);
- for (int i = 0; i < nameSpaceDeclarationArray.length; i++) {
- String s = nameSpaceDeclarationArray[i];
- schemaElement.setAttributeNS(XML_NAMESPACE_URI,
- NAMESPACE_DECLARATION_PREFIX
- + namespacePrefixMap.get(s).toString(), s);
- }
+ // loop through the namespace declarations first
+ String[] nameSpaceDeclarationArray = (String[]) namespacePrefixMap
+ .keySet().toArray(new String[namespacePrefixMap.size()]);
+ for (int i = 0; i < nameSpaceDeclarationArray.length; i++) {
+ String s = nameSpaceDeclarationArray[i];
+ schemaElement.setAttributeNS(XML_NAMESPACE_URI,
+ NAMESPACE_DECLARATION_PREFIX
+ + namespacePrefixMap.get(s).toString(), s);
+ }
- if (schemaElement.getAttributeNS(XML_NAMESPACE_URI, xsdPrefix).length() == 0) {
- schemaElement.setAttributeNS(XML_NAMESPACE_URI,
- NAMESPACE_DECLARATION_PREFIX + xsdPrefix,
- XMLSCHEMA_NAMESPACE_URI);
- }
+ if (schemaElement.getAttributeNS(XML_NAMESPACE_URI, xsdPrefix).length() == 0) {
+ schemaElement.setAttributeNS(XML_NAMESPACE_URI,
+ NAMESPACE_DECLARATION_PREFIX + xsdPrefix,
+ XMLSCHEMA_NAMESPACE_URI);
+ }
- // add the targetNamespace
- schemaElement.setAttributeNS(XML_NAMESPACE_URI, XMLNS_AXIS2WRAPPED,targetNamespace);
- schemaElement.setAttribute(XSD_TARGETNAMESPACE, targetNamespace);
- schemaElement.setAttribute(XSD_ELEMENT_FORM_DEFAULT, XSD_UNQUALIFIED);
+ // add the targetNamespace
+ schemaElement.setAttributeNS(XML_NAMESPACE_URI, XMLNS_AXIS2WRAPPED, targetNamespace);
+ schemaElement.setAttribute(XSD_TARGETNAMESPACE, targetNamespace);
+ schemaElement.setAttribute(XSD_ELEMENT_FORM_DEFAULT, XSD_UNQUALIFIED);
- // add imports
- Element[] namespaceImports = (Element[]) namespaceImportsMap
- .values().toArray(new Element[namespaceImportsMap.size()]);
- for (int i = 0; i < namespaceImports.length; i++) {
- schemaElement.appendChild(namespaceImports[i]);
+ // add imports
+ Element[] namespaceImports = (Element[]) namespaceImportsMap
+ .values().toArray(new Element[namespaceImportsMap.size()]);
+ for (int i = 0; i < namespaceImports.length; i++) {
+ schemaElement.appendChild(namespaceImports[i]);
- }
+ }
- schemaElement.appendChild(newElement);
- return schemaElement;
+ schemaElement.appendChild(newElement);
+ return schemaElement;
}
private List getPartsListFromSoapBody(List extensibilityElements) {
@@ -1514,12 +1545,12 @@
return partsList;
}
- private String getNamespaceFromSoapBody(List extensibilityElements){
+ private String getNamespaceFromSoapBody(List extensibilityElements) {
ExtensibilityElement extElement;
String namespace = null;
- for (Iterator iter = extensibilityElements.iterator();iter.hasNext();){
- extElement = (ExtensibilityElement) iter.next();
+ for (Iterator iter = extensibilityElements.iterator(); iter.hasNext();) {
+ extElement = (ExtensibilityElement) iter.next();
// SOAP 1.1 body element found!
if (extElement instanceof SOAPBody) {
SOAPBody soapBody = (SOAPBody) extElement;
@@ -1549,7 +1580,7 @@
String xsdPrefix,
Iterator partsIterator,
Map namespaceImportsMap,
- Map namespacePrefixMap){
+ Map namespacePrefixMap) {
// add the complex type
Element newComplexType = document.createElementNS(
XMLSCHEMA_NAMESPACE_URI, xsdPrefix + ":"
@@ -1572,9 +1603,9 @@
if (schemaTypeName != null) {
child = document.createElementNS(XMLSCHEMA_NAMESPACE_URI,
- xsdPrefix + ":" + XML_SCHEMA_ELEMENT_LOCAL_NAME);
+ xsdPrefix + ":" + XML_SCHEMA_ELEMENT_LOCAL_NAME);
// always child attribute should be in no namespace
- child.setAttribute("form","unqualified");
+ child.setAttribute("form", "unqualified");
String prefix;
if (XMLSCHEMA_NAMESPACE_URI.equals(schemaTypeName.getNamespaceURI())) {
@@ -1632,11 +1663,11 @@
String prefix = (String) prefixMap.get(namespace);
// A prefix must be found at this point!
String existingURL = schemaElement.getAttributeNS(XML_NAMESPACE_URI,
- NAMESPACE_DECLARATION_PREFIX + prefix);
+ NAMESPACE_DECLARATION_PREFIX + prefix);
if (existingURL == null) {
// there is no existing URL by that prefix - declare a new namespace
schemaElement.setAttributeNS(XML_NAMESPACE_URI,
- NAMESPACE_DECLARATION_PREFIX + prefix, namespace);
+ NAMESPACE_DECLARATION_PREFIX + prefix, namespace);
} else if (existingURL.equals(namespace)) {
// this namespace declaration is already there with the same prefix
// ignore it
@@ -1650,7 +1681,7 @@
generatedPrefix = "ns" + prefixCounter++;
}
schemaElement.setAttributeNS(XML_NAMESPACE_URI,
- NAMESPACE_DECLARATION_PREFIX + generatedPrefix, namespace);
+ NAMESPACE_DECLARATION_PREFIX + generatedPrefix, namespace);
// add to the map
prefixMap.put(generatedPrefix, namespace);
}
@@ -1679,14 +1710,14 @@
doc = XMLUtils.newDocument(in);
} catch (ParserConfigurationException e) {
throw new WSDLException(WSDLException.PARSER_ERROR,
- "Parser Configuration Error", e);
+ "Parser Configuration Error", e);
} catch (SAXException e) {
throw new WSDLException(WSDLException.PARSER_ERROR,
- "Parser SAX Error", e);
+ "Parser SAX Error", e);
} catch (IOException e) {
throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error",
- e);
+ e);
}
return reader.readWSDL(getBaseUri(), doc);
}
@@ -1716,7 +1747,8 @@
if (wsdl4jExtensibilityElement instanceof UnknownExtensibilityElement) {
- UnknownExtensibilityElement unknown = (UnknownExtensibilityElement) (wsdl4jExtensibilityElement);
+ UnknownExtensibilityElement unknown =
+ (UnknownExtensibilityElement) (wsdl4jExtensibilityElement);
QName type = unknown.getElementType();
// <wsp:Policy>
@@ -1725,8 +1757,9 @@
log.trace("copyExtensibleElements:: PolicyElement found " + unknown);
}
Policy policy = (Policy) PolicyUtil.getPolicyComponent(unknown.getElement());
- int attachmentScope = getPolicyAttachmentPoint(description, originOfExtensibilityElements);
- if(attachmentScope > -1){
+ int attachmentScope =
+ getPolicyAttachmentPoint(description, originOfExtensibilityElements);
+ if (attachmentScope > -1) {
description.getPolicyInclude().addPolicyElement(
attachmentScope, policy);
}
@@ -1738,8 +1771,9 @@
}
PolicyReference policyReference = (PolicyReference) PolicyUtil
.getPolicyComponent(unknown.getElement());
- int attachmentScope = getPolicyAttachmentPoint(description, originOfExtensibilityElements);
- if(attachmentScope > -1){
+ int attachmentScope =
+ getPolicyAttachmentPoint(description, originOfExtensibilityElements);
+ if (attachmentScope > -1) {
description.getPolicyInclude().addPolicyRefElement(
attachmentScope, policyReference);
}
@@ -1780,7 +1814,8 @@
} else {
// Ignore this element - it is a totally unknown element
if (isTraceEnabled) {
- log.trace("copyExtensibleElements:: Unknown Extensibility Element found " + unknown);
+ log.trace("copyExtensibleElements:: Unknown Extensibility Element found " +
+ unknown);
}
}
@@ -1789,7 +1824,8 @@
SoapAddress address = new SoapAddress();
address.setLocation(soapAddress.getLocationURI());
if (description instanceof AxisEndpoint) {
- ((AxisEndpoint) description).setProperty(WSDL2Constants.ATTR_WSOAP_ADDRESS, address);
+ ((AxisEndpoint) description)
+ .setProperty(WSDL2Constants.ATTR_WSOAP_ADDRESS, address);
}
} else if (wsdl4jExtensibilityElement instanceof SOAPAddress) {
@@ -1797,14 +1833,16 @@
SoapAddress address = new SoapAddress();
address.setLocation(soapAddress.getLocationURI());
if (description instanceof AxisEndpoint) {
- ((AxisEndpoint) description).setProperty(WSDL2Constants.ATTR_WSOAP_ADDRESS, address);
+ ((AxisEndpoint) description)
+ .setProperty(WSDL2Constants.ATTR_WSOAP_ADDRESS, address);
}
- } else if (wsdl4jExtensibilityElement instanceof HTTPAddress){
+ } else if (wsdl4jExtensibilityElement instanceof HTTPAddress) {
HTTPAddress httpAddress = (HTTPAddress) wsdl4jExtensibilityElement;
HttpAddress address = new HttpAddress();
address.setLocation(httpAddress.getLocationURI());
if (description instanceof AxisEndpoint) {
- ((AxisEndpoint) description).setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, address);
+ ((AxisEndpoint) description)
+ .setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, address);
}
} else if (wsdl4jExtensibilityElement instanceof Schema) {
@@ -1824,9 +1862,11 @@
String soapActionURI = soapOperation.getSoapActionURI();
if (soapActionURI != null) {
- axisBindingOperation.setProperty(WSDL2Constants.ATTR_WSOAP_ACTION, soapActionURI);
+ axisBindingOperation
+ .setProperty(WSDL2Constants.ATTR_WSOAP_ACTION, soapActionURI);
axisBindingOperation.getAxisOperation().setSoapAction(soapActionURI);
- axisService.mapActionToOperation(soapActionURI, axisBindingOperation.getAxisOperation());
+ axisService.mapActionToOperation(soapActionURI,
+ axisBindingOperation.getAxisOperation());
}
} else if (wsdl4jExtensibilityElement instanceof SOAPOperation) {
@@ -1842,22 +1882,24 @@
if (soapAction != null) {
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WSOAP_ACTION, soapAction);
axisBindingOperation.getAxisOperation().setSoapAction(soapAction);
- axisService.mapActionToOperation(soapAction, axisBindingOperation.getAxisOperation());
+ axisService.mapActionToOperation(soapAction,
+ axisBindingOperation.getAxisOperation());
}
- } else if (wsdl4jExtensibilityElement instanceof HTTPOperation){
+ } else if (wsdl4jExtensibilityElement instanceof HTTPOperation) {
HTTPOperation httpOperation = (HTTPOperation) wsdl4jExtensibilityElement;
AxisBindingOperation axisBindingOperation = (AxisBindingOperation) description;
String httpLocation = httpOperation.getLocationURI();
if (httpLocation != null) {
// change the template to make it same as WSDL 2 template
- httpLocation = httpLocation.replaceAll("\\(","{");
- httpLocation = httpLocation.replaceAll("\\)","}");
- axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, httpLocation);
+ httpLocation = httpLocation.replaceAll("\\(", "{");
+ httpLocation = httpLocation.replaceAll("\\)", "}");
+ axisBindingOperation
+ .setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, httpLocation);
}
axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_INPUT_SERIALIZATION,
- HTTPConstants.MEDIA_TYPE_X_WWW_FORM);
+ HTTPConstants.MEDIA_TYPE_X_WWW_FORM);
} else if (wsdl4jExtensibilityElement instanceof SOAP12Header) {
@@ -1903,7 +1945,8 @@
if (description instanceof AxisBindingMessage) {
AxisBindingMessage bindingMessage = (AxisBindingMessage) description;
- List soapHeaders = (List) bindingMessage.getProperty(WSDL2Constants.ATTR_WSOAP_HEADER);
+ List soapHeaders =
+ (List) bindingMessage.getProperty(WSDL2Constants.ATTR_WSOAP_HEADER);
if (soapHeaders == null) {
soapHeaders = new ArrayList();
bindingMessage.setProperty(WSDL2Constants.ATTR_WSOAP_HEADER, soapHeaders);
@@ -1946,7 +1989,8 @@
if (description instanceof AxisBindingMessage) {
AxisBindingMessage bindingMessage = (AxisBindingMessage) description;
- List soapHeaders = (List) bindingMessage.getProperty(WSDL2Constants.ATTR_WSOAP_HEADER);
+ List soapHeaders =
+ (List) bindingMessage.getProperty(WSDL2Constants.ATTR_WSOAP_HEADER);
if (soapHeaders == null) {
soapHeaders = new ArrayList();
bindingMessage.setProperty(WSDL2Constants.ATTR_WSOAP_HEADER, soapHeaders);
@@ -1986,7 +2030,7 @@
String transportURI = soapBinding.getTransportURI();
axisBinding.setType(transportURI);
- } else if (wsdl4jExtensibilityElement instanceof HTTPBinding){
+ } else if (wsdl4jExtensibilityElement instanceof HTTPBinding) {
HTTPBinding httpBinding = (HTTPBinding) wsdl4jExtensibilityElement;
AxisBinding axisBinding = (AxisBinding) description;
// set the binding style same as the wsd2 to process smoothly
@@ -1997,16 +2041,16 @@
}
private int getPolicyAttachmentPoint(AxisDescription description,
- String originOfExtensibilityElements) {
+ String originOfExtensibilityElements) {
int result = -1; // Attachment Point Not Identified
if (description instanceof AxisService) {
// wsdl:service
if (SERVICE.equals(originOfExtensibilityElements)) {
result = PolicyInclude.SERVICE_POLICY;
- // wsdl:service -> wsdl:port
+ // wsdl:service -> wsdl:port
} else if (PORT.equals(originOfExtensibilityElements)) {
- result =PolicyInclude.PORT_POLICY;
- // wsdl:binding
+ result = PolicyInclude.PORT_POLICY;
+ // wsdl:binding
} else if (BINDING.equals(originOfExtensibilityElements)) {
result = PolicyInclude.BINDING_POLICY;
}
@@ -2015,7 +2059,7 @@
// wsdl:portType -> wsdl:operation
if (PORT_TYPE_OPERATION.equals(originOfExtensibilityElements)) {
result = PolicyInclude.OPERATION_POLICY;
- // wsdl:binding -> wsdl:operation
+ // wsdl:binding -> wsdl:operation
} else {
result = PolicyInclude.BINDING_POLICY;
}
@@ -2024,23 +2068,24 @@
if (PORT_TYPE_OPERATION_INPUT.equals(originOfExtensibilityElements)) {
result = PolicyInclude.INPUT_POLICY;
- // wsdl:binding -> wsdl:operation -> wsdl:input
+ // wsdl:binding -> wsdl:operation -> wsdl:input
} else if (BINDING_OPERATION_INPUT
.equals(originOfExtensibilityElements)) {
result = PolicyInclude.BINDING_INPUT_POLICY;
- // wsdl:portType -> wsdl:operation -> wsdl:put
+ // wsdl:portType -> wsdl:operation -> wsdl:put
} else if (PORT_TYPE_OPERATION_OUTPUT
.equals(originOfExtensibilityElements)) {
result = PolicyInclude.OUTPUT_POLICY;
- // wsdl:binding -> wsdl:operation -> wsdl:output
+ // wsdl:binding -> wsdl:operation -> wsdl:output
} else if (BINDING_OPERATION_OUTPUT
.equals(originOfExtensibilityElements)) {
result = PolicyInclude.BINDING_OUTPUT_POLICY;
}
- // TODO Faults ..
+ // TODO Faults ..
}
- if(isTraceEnabled){
- log.trace("getPolicyAttachmentPoint:: axisDescription="+description+" extensibilityPoint="+originOfExtensibilityElements+" result="+result);
+ if (isTraceEnabled) {
+ log.trace("getPolicyAttachmentPoint:: axisDescription=" + description +
+ " extensibilityPoint=" + originOfExtensibilityElements + " result=" + result);
}
return result;
}
@@ -2088,7 +2133,8 @@
isHttpBinding = true;
this.bindingType = BINDING_TYPE_HTTP;
} else {
- throw new WSDLProcessingException("Not supported binding type " + binding.getQName().getLocalPart());
+ throw new WSDLProcessingException(
+ "Not supported binding type " + binding.getQName().getLocalPart());
}
}
@@ -2098,13 +2144,14 @@
// to the return list
List returnList = new ArrayList();
- if (isHttpBinding || isSOAPBinding){
+ if (isHttpBinding || isSOAPBinding) {
BindingOperation bindingOp;
for (Iterator bindingOperationsIterator =
- binding.getBindingOperations().iterator(); bindingOperationsIterator.hasNext();) {
+ binding.getBindingOperations().iterator(); bindingOperationsIterator.hasNext();)
+ {
bindingOp = (BindingOperation) bindingOperationsIterator.next();
- if (isSOAPBinding){
- String style = getSOAPStyle(bindingOp);
+ if (isSOAPBinding) {
+ String style = getSOAPStyle(bindingOp);
if (style == null) {
// no style specified
// use the global style to determine whether to put this one or
@@ -2118,8 +2165,8 @@
}
// if not RPC we just leave it - default is doc
} else {
- // i.e an http binding then we have to add the operation any way
- returnList.add(bindingOp);
+ // i.e an http binding then we have to add the operation any way
+ returnList.add(bindingOp);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org