From 7ebdb8f218e5c2dbdda0201a9941b79af667103e Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 4 Mar 2009 23:56:41 +0000
Subject: Updates to binding-ws to use OASIS namespaces/schema and some minor
 cleanups

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@750242 13f79535-47bb-0310-9956-ffa450edef68
---
 .../configuration/Axis2ConfigParamPolicy.java      |  4 +--
 ...ca.contribution.processor.StAXArtifactProcessor |  6 ++---
 .../axis2/policy/configuration/mock_policies.xml   |  2 +-
 .../tuscany/sca/binding/ws/axis2/definitions.xml   |  2 +-
 .../binding/ws/xml/WebServiceBindingProcessor.java | 10 +++----
 .../sca/binding/ws/xml/WebServiceConstants.java    | 13 +++++----
 ...ca.contribution.processor.StAXArtifactProcessor |  2 +-
 .../ws/xml/Calculator-bad-wsdlElement.composite    |  2 +-
 .../sca/binding/ws/xml/Calculator.composite        |  2 +-
 .../binding/ws/xml/CalculatorImpl.componentType    |  2 +-
 .../binding/ws/xml/PoliciedCalculator.composite    |  2 +-
 .../ws/DefaultWebServiceBindingFactory.java        | 31 ----------------------
 .../sca/interfacedef/wsdl/xml/Calculator.composite |  2 +-
 .../wsdl/xml/CalculatorComponent.constrainingType  |  2 +-
 .../wsdl/xml/CalculatorImpl.componentType          |  2 +-
 15 files changed, 27 insertions(+), 57 deletions(-)
 delete mode 100644 java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java

(limited to 'java/sca')

diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
index 43b6162bd0..ded09392ec 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
@@ -32,8 +32,8 @@ import org.apache.axiom.om.OMElement;
  * @version $Rev$ $Date$
  */
 public class Axis2ConfigParamPolicy {
-    private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
-    public static final QName NAME = new QName(SCA10_TUSCANY_NS, "wsConfigParam");
+    private static final String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
+    public static final QName NAME = new QName(SCA11_TUSCANY_NS, "wsConfigParam");
     private Map<String, OMElement> paramElements = new Hashtable<String, OMElement>();
     
     public Map<String, OMElement> getParamElements() {
diff --git a/java/sca/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 96782b74bf..8dd9f200d8 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,6 +16,6 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wsConfigParam,model=org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicy
-org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token.Axis2TokenAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#axis2TokenAuthentication,model=org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token.Axis2TokenAuthenticationPolicy
-org.apache.tuscany.sca.binding.ws.axis2.policy.header.Axis2HeaderPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#axis2Header,model=org.apache.tuscany.sca.binding.ws.axis2.policy.header.Axis2HeaderPolicy
+org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#wsConfigParam,model=org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicy
+org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token.Axis2TokenAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#axis2TokenAuthentication,model=org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token.Axis2TokenAuthenticationPolicy
+org.apache.tuscany.sca.binding.ws.axis2.policy.header.Axis2HeaderPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#axis2Header,model=org.apache.tuscany.sca.binding.ws.axis2.policy.header.Axis2HeaderPolicy
diff --git a/java/sca/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml b/java/sca/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
index 77f750cd0d..cc84a83a47 100644
--- a/java/sca/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
+++ b/java/sca/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<tuscany:wsConfigParam xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+<tuscany:wsConfigParam xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
  		<parameter name="InflowSecurity">
 		    <action>
 		        <items>Timestamp Signature</items>
diff --git a/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index 88c0ef14d1..b98780d221 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
@@ -23,7 +23,7 @@
 <sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
             targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
             xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
-            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
             
     <sca:bindingType type="sca:binding.ws"  mayProvide="SOAP SOAP.1_1 SOAP.1_2 MTOM" alwaysProvides=""/>
 
diff --git a/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index f2a1d5a15d..3e9b07c4be 100644
--- a/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
@@ -33,9 +33,7 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
-import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
@@ -70,17 +68,17 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ
     private WebServiceBindingFactory wsFactory;
     private PolicyFactory policyFactory;
     private PolicySubjectProcessor policyProcessor;
-    private PolicyFactory intentAttachPointTypeFactory;
+    //private PolicyFactory intentAttachPointTypeFactory;
     private Monitor monitor;
     
     public WebServiceBindingProcessor(ExtensionPointRegistry extensionPoints) {
         this.extensionPoints = extensionPoints;
         FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
         this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.wsFactory = new DefaultWebServiceBindingFactory();
+        this.wsFactory = modelFactories.getFactory(WebServiceBindingFactory.class);
         this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
         this.policyProcessor = new PolicySubjectProcessor(policyFactory);
-        this.intentAttachPointTypeFactory = modelFactories.getFactory(PolicyFactory.class);
+        //this.intentAttachPointTypeFactory = modelFactories.getFactory(PolicyFactory.class);
         UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
         MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
         if (monitorFactory != null) {
@@ -235,7 +233,7 @@ public class WebServiceBindingProcessor implements StAXArtifactProcessor<WebServ
 
         // Write a <binding.ws>
         policyProcessor.writePolicyPrefixes(wsBinding, writer);
-        writer.writeStartElement(Constants.SCA10_NS, BINDING_WS);
+        writer.writeStartElement(SCA11_NS, BINDING_WS);
         policyProcessor.writePolicyAttributes(wsBinding, writer);
 
         // Write binding name
diff --git a/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index 03c84a6b41..9706ef1771 100644
--- a/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
@@ -20,22 +20,25 @@ package org.apache.tuscany.sca.binding.ws.xml;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
 /**
  * Constants for the Web Services Binding.
  *
  * @version $Rev$ $Date$
  */
 public interface WebServiceConstants {
-
+	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
+	
     String BINDING_WS = "binding.ws";
-    QName BINDING_WS_QNAME = new QName(Constants.SCA10_NS, BINDING_WS);
+    QName BINDING_WS_QNAME = new QName(SCA11_NS, BINDING_WS);
+    
     String WSDL_ELEMENT = "wsdlElement";
-    QName WSDL_ELEMENT_QNAME = new QName(Constants.SCA10_NS, WSDL_ELEMENT);
+    QName WSDL_ELEMENT_QNAME = new QName(SCA11_NS, WSDL_ELEMENT);
+    
     String WSDL_LOCATION = "wsdlLocation";
     String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance";
+    
     QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION); 
+    
     String NAME = "name"; 
     String URI = "uri"; 
     String END_POINT_REFERENCE = "EndpointReference";
diff --git a/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cb982e8647..6f5623f543 100644
--- a/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding
+org.apache.tuscany.sca.binding.ws.xml.WebServiceBindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#binding.ws,model=org.apache.tuscany.sca.binding.ws.WebServiceBinding
diff --git a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
index d8d1b3401e..0d337c7eb3 100644
--- a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
+++ b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
     xmlns:calc="http://sample.calculator"
     targetNamespace="http://calc"
     xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index f7460813cd..a4d05cc0ec 100644
--- a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
 	xmlns:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index 959802af43..09410fdc37 100644
--- a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">
 
   <service name="CalculatorService">
diff --git a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
index 37c80aa910..da55dfc7b9 100644
--- a/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
+++ b/java/sca/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
 	xmlns:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
deleted file mode 100644
index 2ccaa5dc58..0000000000
--- a/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.sca.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.impl.WebServiceBindingFactoryImpl;
-
-/**
- * A factory for the Web Service binding model.
- * 
- * @version $Rev$ $Date$
- */
-@Deprecated
-public class DefaultWebServiceBindingFactory extends WebServiceBindingFactoryImpl implements WebServiceBindingFactory {
-
-}
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index 875fdf35d2..2301e1ae2d 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
 	xmlns:calc="http://sample.calculator"
 	targetNamespace="http://calc"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
index 3eb81b61bd..7c4c33922e 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
+++ b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<constrainingType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
 	xmlns:calc="http://calc"
     targetNamespace="http://calc"
     xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
diff --git a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index aea7046a3d..2f961caa09 100644
--- a/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/java/sca/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
 	xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance">
 
   <service name="CalculatorService">
-- 
cgit v1.2.3