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 di...@apache.org on 2008/04/03 17:29:35 UTC
svn commit: r644359 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Author: dims
Date: Thu Apr 3 08:29:34 2008
New Revision: 644359
URL: http://svn.apache.org/viewvc?rev=644359&view=rev
Log:
Remove ununsed private method
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=644359&r1=644358&r2=644359&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java Thu Apr 3 08:29:34 2008
@@ -498,411 +498,6 @@
}
}
- private void generateSOAP11Ports(OMFactory fac, OMElement service)
- throws Exception {
- for (int i = 0; i < serviceEndpointURLs.length; i++) {
- String urlString = serviceEndpointURLs[i];
- if (urlString != null) {
- String protocol = new URI(urlString).getScheme();
- OMElement port = fac.createOMElement(PORT, wsdl);
- service.addChild(port);
- String name = serviceName + SOAP11PORT
- + ((protocol == null) ? "" : "_" + protocol);
- if (i > 0) {
- name += i;
- }
- port.addAttribute(ATTRIBUTE_NAME, name, null);
- port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":"
- + serviceName + BINDING_NAME_SUFFIX, null);
- WSDLSerializationUtil.addExtensionElement(fac, port,
- SOAP_ADDRESS, LOCATION, urlString, soap);
-
- addPolicyAsExtElement(PolicyInclude.PORT_POLICY, axisService
- .getPolicyInclude(), port);
- }
- }
-
- }
-
- private void generateHTTPPorts(OMFactory fac, OMElement service)
- throws Exception {
- for (int i = 0; i < serviceEndpointURLs.length; i++) {
- String urlString = serviceEndpointURLs[i];
- if (urlString != null && urlString.startsWith("http")) {
- OMElement port = fac.createOMElement(PORT, wsdl);
- service.addChild(port);
- String name = serviceName + HTTP_PORT;
- if (i > 0) {
- name += i;
- }
- port.addAttribute(ATTRIBUTE_NAME, name, null);
- port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":"
- + serviceName + HTTP_BINDING, null);
- OMElement extElement = fac.createOMElement("address", http);
- port.addChild(extElement);
- // urlString = urlString.replaceAll(servicePath, "rest");
- extElement.addAttribute("location", urlString, null);
- }
- }
- }
-
- private void generateSOAP12Ports(OMFactory fac, OMElement service)
- throws Exception {
- for (int i = 0; i < serviceEndpointURLs.length; i++) {
- String urlString = serviceEndpointURLs[i];
- if (urlString != null) {
- String protocol = new URI(urlString).getScheme();
- OMElement port = fac.createOMElement(PORT, wsdl);
- service.addChild(port);
- String name = serviceName + SOAP12PORT
- + ((protocol == null) ? "" : "_" + protocol);
- if (i > 0) {
- name += i;
- }
- port.addAttribute(ATTRIBUTE_NAME, name, null);
- port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":"
- + serviceName + SOAP12BINDING_NAME_SUFFIX, null);
- WSDLSerializationUtil.addExtensionElement(fac, port,
- SOAP_ADDRESS, LOCATION, urlString, soap12);
-
- addPolicyAsExtElement(PolicyInclude.PORT_POLICY, axisService
- .getPolicyInclude(), port);
- }
- }
- }
-
- /**
- * Generate the <binding> for SOAP 1.1 underneath the passed
- * definitions
- *
- * @param fac
- * the active OMFactory
- * @param defintions
- * the WSDL <definitions> element under which to put the
- * binding
- * @throws Exception
- * if there's a problem
- */
- private void generateSOAP11Binding(OMFactory fac, OMElement defintions)
- throws Exception {
- OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
- defintions.addChild(binding);
- binding.addAttribute(ATTRIBUTE_NAME, serviceName + BINDING_NAME_SUFFIX,
- null);
- binding.addAttribute("type", tns.getPrefix() + ":" + serviceName
- + PORT_TYPE_SUFFIX, null);
-
- addPolicyAsExtElement(PolicyInclude.BINDING_POLICY, axisService
- .getPolicyInclude(), binding);
-
- // Adding ext elements
- addExtensionElement(fac, binding, BINDING_LOCAL_NAME, TRANSPORT,
- TRANSPORT_URI, STYLE, style, soap);
-
- // Add WS-Addressing UsingAddressing element if appropriate
- // SHOULD be on the binding element per the specification
- if (AddressingHelper
- .getAddressingRequirementParemeterValue(axisService).equals(
- AddressingConstants.ADDRESSING_OPTIONAL)) {
- WSDLSerializationUtil.addExtensionElement(fac, binding,
- AddressingConstants.USING_ADDRESSING,
- DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true", wsaw);
- } else if (AddressingHelper.getAddressingRequirementParemeterValue(
- axisService).equals(AddressingConstants.ADDRESSING_REQUIRED)) {
- WSDLSerializationUtil.addExtensionElement(fac, binding,
- AddressingConstants.USING_ADDRESSING,
- DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true", wsaw);
- }
-
- for (Iterator operations = axisService.getOperations(); operations
- .hasNext();) {
- AxisOperation axisOperation = (AxisOperation) operations.next();
- if (axisOperation.isControlOperation()
- || axisOperation.getName() == null) {
- continue;
- }
- String operationName = axisOperation.getName().getLocalPart();
- OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
- wsdl);
- binding.addChild(operation);
- String soapAction = axisOperation.getSoapAction();
- if (soapAction == null) {
- soapAction = "";
- }
- addExtensionElement(fac, operation, OPERATION_LOCAL_NAME,
- SOAP_ACTION, soapAction, STYLE, style, soap);
-
- addPolicyAsExtElement(PolicyInclude.BINDING_OPERATION_POLICY,
- axisOperation.getPolicyInclude(), operation);
-
- String MEP = axisOperation.getMessageExchangePattern();
-
- if (WSDL2Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
- || WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
- AxisMessage inaxisMessage = axisOperation
- .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- if (inaxisMessage != null) {
- operation.addAttribute(ATTRIBUTE_NAME, operationName, null);
- OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
- wsdl);
- addExtensionElement(fac, input, SOAP_BODY, SOAP_USE, use,
- null, targetNamespace, soap);
- addPolicyAsExtElement(PolicyInclude.BINDING_INPUT_POLICY,
- inaxisMessage.getPolicyInclude(), input);
- operation.addChild(input);
- writeSoapHeaders(inaxisMessage, fac, input, soap);
- }
- }
-
- if (WSDL2Constants.MEP_URI_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
- AxisMessage outAxisMessage = axisOperation
- .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- if (outAxisMessage != null) {
- OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
- wsdl);
- addExtensionElement(fac, output, SOAP_BODY, SOAP_USE, use,
- null, targetNamespace, soap);
- addPolicyAsExtElement(PolicyInclude.BINDING_OUTPUT_POLICY,
- outAxisMessage.getPolicyInclude(), output);
- operation.addChild(output);
- writeSoapHeaders(outAxisMessage, fac, output, soap);
- }
- }
-
- // generate fault Messages
- ArrayList faultyMessages = axisOperation.getFaultMessages();
- if (faultyMessages != null) {
- for (int i = 0; i < faultyMessages.size(); i++) {
- AxisMessage faultyMessage = (AxisMessage) faultyMessages
- .get(i);
- OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME,
- wsdl);
- addExtensionElement(fac, fault, FAULT_LOCAL_NAME, SOAP_USE,
- use, ATTRIBUTE_NAME, faultyMessage.getName(), soap);
- fault.addAttribute(ATTRIBUTE_NAME, faultyMessage.getName(),
- null);
- // TODO adding policies for fault messages
- operation.addChild(fault);
- writeSoapHeaders(faultyMessage, fac, fault, soap);
- }
- }
- }
-
- }
-
- /**
- * Generate the <binding> for SOAP 1.2 underneath the passed
- * definitions
- *
- * @param fac
- * the active OMFactory
- * @param defintions
- * the WSDL <definitions> element under which to put the
- * binding
- * @throws Exception
- * if there's a problem
- */
- private void generateSOAP12Binding(OMFactory fac, OMElement defintions)
- throws Exception {
- OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
- defintions.addChild(binding);
- binding.addAttribute(ATTRIBUTE_NAME, serviceName
- + SOAP12BINDING_NAME_SUFFIX, null);
- binding.addAttribute("type", tns.getPrefix() + ":" + serviceName
- + PORT_TYPE_SUFFIX, null);
-
- addPolicyAsExtElement(PolicyInclude.BINDING_POLICY, axisService
- .getPolicyInclude(), binding);
-
- // Adding ext elements
- addExtensionElement(fac, binding, BINDING_LOCAL_NAME, TRANSPORT,
- TRANSPORT_URI, STYLE, style, soap12);
-
- // Add WS-Addressing UsingAddressing element if appropriate
- // SHOULD be on the binding element per the specification
- if (AddressingHelper
- .getAddressingRequirementParemeterValue(axisService).equals(
- AddressingConstants.ADDRESSING_OPTIONAL)) {
- WSDLSerializationUtil.addExtensionElement(fac, binding,
- AddressingConstants.USING_ADDRESSING,
- DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true", wsaw);
- } else if (AddressingHelper.getAddressingRequirementParemeterValue(
- axisService).equals(AddressingConstants.ADDRESSING_REQUIRED)) {
- WSDLSerializationUtil.addExtensionElement(fac, binding,
- AddressingConstants.USING_ADDRESSING,
- DEFAULT_WSDL_NAMESPACE_PREFIX + ":required", "true", wsaw);
- }
-
- for (Iterator operations = axisService.getOperations(); operations
- .hasNext();) {
- AxisOperation axisOperation = (AxisOperation) operations.next();
- if (axisOperation.isControlOperation()
- || axisOperation.getName() == null) {
- continue;
- }
- String opeartionName = axisOperation.getName().getLocalPart();
- OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
- wsdl);
- binding.addChild(operation);
- String soapAction = axisOperation.getSoapAction();
- if (soapAction == null) {
- soapAction = "";
- }
- addExtensionElement(fac, operation, OPERATION_LOCAL_NAME,
- SOAP_ACTION, soapAction, STYLE, style, soap12);
-
- addPolicyAsExtElement(PolicyInclude.BINDING_OPERATION_POLICY,
- axisOperation.getPolicyInclude(), operation);
-
- String MEP = axisOperation.getMessageExchangePattern();
-
- if (WSDL2Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
- || WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
- AxisMessage inaxisMessage = axisOperation
- .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- if (inaxisMessage != null) {
- operation.addAttribute(ATTRIBUTE_NAME, opeartionName, null);
- OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
- wsdl);
- addExtensionElement(fac, input, SOAP_BODY, SOAP_USE, use,
- null, targetNamespace, soap12);
- addPolicyAsExtElement(PolicyInclude.BINDING_INPUT_POLICY,
- inaxisMessage.getPolicyInclude(), input);
- operation.addChild(input);
- writeSoapHeaders(inaxisMessage, fac, input, soap12);
- }
- }
-
- if (WSDL2Constants.MEP_URI_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
- AxisMessage outAxisMessage = axisOperation
- .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- if (outAxisMessage != null) {
- OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
- wsdl);
- addExtensionElement(fac, output, SOAP_BODY, SOAP_USE, use,
- null, targetNamespace, soap12);
- addPolicyAsExtElement(PolicyInclude.BINDING_OUTPUT_POLICY,
- outAxisMessage.getPolicyInclude(), output);
- operation.addChild(output);
- writeSoapHeaders(outAxisMessage, fac, output, soap12);
- }
- }
-
- // generate fault Messages
- ArrayList faultyMessages = axisOperation.getFaultMessages();
- if (faultyMessages != null) {
- for (int i = 0; i < faultyMessages.size(); i++) {
- AxisMessage faultyMessage = (AxisMessage) faultyMessages
- .get(i);
- OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME,
- wsdl);
- addExtensionElement(fac, fault, FAULT_LOCAL_NAME, SOAP_USE,
- use, ATTRIBUTE_NAME, faultyMessage.getName(),
- soap12);
- fault.addAttribute(ATTRIBUTE_NAME, faultyMessage.getName(),
- null);
- // add policies for fault messages
- operation.addChild(fault);
- writeSoapHeaders(faultyMessage, fac, fault, soap12);
- }
- }
- }
- }
-
- private void generateHTTPBinding(OMFactory fac, OMElement defintions)
- throws Exception {
- OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
- defintions.addChild(binding);
- binding.addAttribute(ATTRIBUTE_NAME, serviceName + HTTP_BINDING, null);
- binding.addAttribute("type", tns.getPrefix() + ":" + serviceName
- + PORT_TYPE_SUFFIX, null);
-
- // Adding ext elements
- OMElement httpBinding = fac.createOMElement("binding", http);
- binding.addChild(httpBinding);
- httpBinding.addAttribute("verb", "POST", null);
-
- for (Iterator operations = axisService.getOperations(); operations
- .hasNext();) {
- AxisOperation axisOperation = (AxisOperation) operations.next();
- if (axisOperation.isControlOperation()
- || axisOperation.getName() == null) {
- continue;
- }
- String opeartionName = axisOperation.getName().getLocalPart();
- OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME,
- wsdl);
- binding.addChild(operation);
-
- OMElement httpOperation = fac.createOMElement("operation", http);
- operation.addChild(httpOperation);
- httpOperation.addAttribute("location", serviceName + "/"
- + axisOperation.getName().getLocalPart(), null);
-
- String MEP = axisOperation.getMessageExchangePattern();
-
- if (WSDL2Constants.MEP_URI_IN_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
- || WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
- AxisMessage inaxisMessage = axisOperation
- .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
- if (inaxisMessage != null) {
- operation.addAttribute(ATTRIBUTE_NAME, opeartionName, null);
- OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME,
- wsdl);
- OMElement inputelement = fac.createOMElement("content",
- mime);
- input.addChild(inputelement);
- inputelement.addAttribute("type", "text/xml", null);
- inputelement.addAttribute("part", axisOperation.getName()
- .getLocalPart(), null);
- operation.addChild(input);
- }
- }
-
- if (WSDL2Constants.MEP_URI_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
- || WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
- || WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
- AxisMessage outAxisMessage = axisOperation
- .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- if (outAxisMessage != null) {
- OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME,
- wsdl);
- OMElement outElement = fac.createOMElement("content", mime);
- outElement.addChild(outElement);
- outElement.addAttribute("type", "text/xml", null);
- outElement.addAttribute("part", axisOperation.getName()
- .getLocalPart(), null);
- output.addChild(outElement);
- operation.addChild(output);
- }
- }
- }
- }
-
private void writeSoapHeaders(AxisMessage inaxisMessage, OMFactory fac,
OMElement input, OMNamespace soapNameSpace) throws Exception {
ArrayList extElementList;
@@ -1003,72 +598,6 @@
addPolicyToDefinitionElement(key, p);
}
- }
- }
-
- private void addPolicyAsExtAttribute(int type, PolicyInclude policyInclude,
- OMElement element, OMFactory factory) throws Exception {
-
- ArrayList elementList = policyInclude.getPolicyElements(type);
- ArrayList policyURIs = new ArrayList();
-
- for (Iterator iterator = elementList.iterator(); iterator.hasNext();) {
- Object policyElement = iterator.next();
- String key;
-
- if (policyElement instanceof Policy) {
- Policy p = (Policy) policyElement;
-
- if (p.getId() != null) {
- key = "#" + p.getId();
- } else if (p.getName() != null) {
- key = p.getName();
- } else {
- throw new RuntimeException(
- "Can't add the Policy as an extensibility attribute since it doesn't have a id or a name attribute");
- }
-
- policyURIs.add(key);
- addPolicyToDefinitionElement(key, p);
-
- } else {
- String uri = ((PolicyReference) policyElement).getURI();
- PolicyRegistry registry = policyInclude.getPolicyRegistry();
-
- if (uri.startsWith("#")) {
- key = uri.substring(uri.indexOf('#') + 1);
- } else {
- key = uri;
- }
-
- Policy p = registry.lookup(key);
-
- if (p == null) {
- throw new RuntimeException("Cannot resolve " + uri
- + " to a Policy");
- }
- addPolicyToDefinitionElement(key, p);
- }
- }
-
- if (!policyURIs.isEmpty()) {
- String value = null;
-
- /*
- * We need to create a String that is like 'uri1 uri2 .." to set as
- * the value of the wsp:PolicyURIs attribute.
- */
- for (Iterator iterator = policyURIs.iterator(); iterator.hasNext();) {
- String uri = (String) iterator.next();
- value = (value == null) ? uri : " " + uri;
- }
-
- OMNamespace ns = factory.createOMNamespace(
- org.apache.neethi.Constants.URI_POLICY_NS,
- org.apache.neethi.Constants.ATTR_WSP);
- OMAttribute URIs = factory.createOMAttribute("PolicyURIs", ns,
- value);
- element.addAttribute(URIs);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org