Fixing namespace issues that were automaticaly changed by ide refactoring tooling

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@750222 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 23 insertions, 23 deletions

diff --git a/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 4c00e8bc71..188603afeb 100644
--- a/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
@@ -28,7 +28,7 @@ import static org.apache.tuscany.sca.assembly.xml.Constants.MUST_SUPPLY;
 import static org.apache.tuscany.sca.assembly.xml.Constants.NAME;
 import static org.apache.tuscany.sca.assembly.xml.Constants.ONE_N;
 import static org.apache.tuscany.sca.assembly.xml.Constants.ONE_ONE;
-import static org.apache.tuscany.sca.assembly.xml.Constants.SCA11_NS;
+import static org.apache.tuscany.sca.assembly.xml.Constants.SCA10_NS;
 import static org.apache.tuscany.sca.assembly.xml.Constants.TARGET;
 import static org.apache.tuscany.sca.assembly.xml.Constants.TYPE;
 import static org.apache.tuscany.sca.assembly.xml.Constants.ZERO_N;
@@ -209,7 +209,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor {
      * @throws XMLStreamException
      */
     protected void writeStart(XMLStreamWriter writer, String name, XAttr... attrs) throws XMLStreamException {
-        writeStart(writer, SCA11_NS, name, attrs);
+        writeStart(writer, SCA10_NS, name, attrs);
     }
 
     /**
@@ -219,9 +219,9 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor {
      */
     protected void writeStartDocument(XMLStreamWriter writer, String name, XAttr... attrs) throws XMLStreamException {
         writer.writeStartDocument();
-        writer.setDefaultNamespace(SCA11_NS);
-        writeStart(writer, SCA11_NS, name, attrs);
-        writer.writeDefaultNamespace(SCA11_NS);
+        writer.setDefaultNamespace(SCA10_NS);
+        writeStart(writer, SCA10_NS, name, attrs);
+        writer.writeDefaultNamespace(SCA10_NS);
     }
 
     /**
diff --git a/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 7a503c9f86..6feadbd751 100644
--- a/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
@@ -43,7 +43,7 @@ import static org.apache.tuscany.sca.assembly.xml.Constants.PROPERTY;
 import static org.apache.tuscany.sca.assembly.xml.Constants.PROPERTY_QNAME;
 import static org.apache.tuscany.sca.assembly.xml.Constants.REFERENCE;
 import static org.apache.tuscany.sca.assembly.xml.Constants.REFERENCE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.Constants.SCA11_NS;
+import static org.apache.tuscany.sca.assembly.xml.Constants.SCA10_NS;
 import static org.apache.tuscany.sca.assembly.xml.Constants.SERVICE;
 import static org.apache.tuscany.sca.assembly.xml.Constants.SERVICE_QNAME;
 import static org.apache.tuscany.sca.assembly.xml.Constants.SOURCE;
@@ -448,7 +448,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                                     if (contract != null) {
                                         contract.setInterfaceContract((InterfaceContract)extension);
                                     } else {
-                                        if (name.getNamespaceURI().equals(SCA11_NS)) {
+                                        if (name.getNamespaceURI().equals(SCA10_NS)) {
                                         	error("UnexpectedInterfaceElement", extension);
                                             //throw new ContributionReadException("Unexpected <interface> element found. It should appear inside a <service> or <reference> element");
                                         } else {
@@ -470,7 +470,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                                         if (contract != null) {
                                             contract.getBindings().add((Binding)extension);
                                         } else {
-                                            if (name.getNamespaceURI().equals(SCA11_NS)) {
+                                            if (name.getNamespaceURI().equals(SCA10_NS)) {
                                             	error("UnexpectedBindingElement", extension);
                                                 //throw new ContributionReadException("Unexpected <binding> element found. It should appear inside a <service> or <reference> element");
                                             } else {
@@ -490,7 +490,7 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                                     if (component != null) {
                                         component.setImplementation((Implementation)extension);
                                     } else {
-                                        if (name.getNamespaceURI().equals(SCA11_NS)) {
+                                        if (name.getNamespaceURI().equals(SCA10_NS)) {
                                         	error("UnexpectedImplementationElement", extension);
                                             //throw new ContributionReadException("Unexpected <implementation> element found. It should appear inside a <component> element");
                                         } else {
diff --git a/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 6dceaaf832..3bf5a1173b 100644
--- a/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/java/sca/modules/assembly-xml-osoa/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
@@ -31,46 +31,46 @@ public interface Constants {
     String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
     
     String COMPONENT_TYPE = "componentType";
-    QName COMPONENT_TYPE_QNAME = new QName(SCA11_NS, COMPONENT_TYPE);
+    QName COMPONENT_TYPE_QNAME = new QName(SCA10_NS, COMPONENT_TYPE);
     
     String SERVICE = "service";
-    QName SERVICE_QNAME = new QName(SCA11_NS, SERVICE);
+    QName SERVICE_QNAME = new QName(SCA10_NS, SERVICE);
     
     String REFERENCE = "reference";
-    QName REFERENCE_QNAME = new QName(SCA11_NS, REFERENCE);
+    QName REFERENCE_QNAME = new QName(SCA10_NS, REFERENCE);
     
     String PROPERTY = "property";
-    QName PROPERTY_QNAME = new QName(SCA11_NS, PROPERTY);
+    QName PROPERTY_QNAME = new QName(SCA10_NS, PROPERTY);
     
     String CONSTRAINING_TYPE = "constrainingType";
-    QName CONSTRAINING_TYPE_QNAME = new QName(SCA11_NS, CONSTRAINING_TYPE);
+    QName CONSTRAINING_TYPE_QNAME = new QName(SCA10_NS, CONSTRAINING_TYPE);
     
     String COMPOSITE = "composite";
-    QName COMPOSITE_QNAME = new QName(SCA11_NS, COMPOSITE);
+    QName COMPOSITE_QNAME = new QName(SCA10_NS, COMPOSITE);
     
     String INCLUDE = "include";
-    QName INCLUDE_QNAME = new QName(SCA11_NS, INCLUDE); 
+    QName INCLUDE_QNAME = new QName(SCA10_NS, INCLUDE); 
     
     String COMPONENT = "component";
-    QName COMPONENT_QNAME = new QName(SCA11_NS, COMPONENT);
+    QName COMPONENT_QNAME = new QName(SCA10_NS, COMPONENT);
     
     String WIRE = "wire";
-    QName WIRE_QNAME = new QName(SCA11_NS, WIRE);
+    QName WIRE_QNAME = new QName(SCA10_NS, WIRE);
 
     String OPERATION = "operation";
-    QName OPERATION_QNAME = new QName(SCA11_NS, OPERATION);
+    QName OPERATION_QNAME = new QName(SCA10_NS, OPERATION);
     
     String CALLBACK = "callback";
-    QName CALLBACK_QNAME = new QName(SCA11_NS, CALLBACK);
+    QName CALLBACK_QNAME = new QName(SCA10_NS, CALLBACK);
 
     String IMPLEMENTATION_COMPOSITE = "implementation.composite";
-    QName IMPLEMENTATION_COMPOSITE_QNAME = new QName(SCA11_NS, IMPLEMENTATION_COMPOSITE);
+    QName IMPLEMENTATION_COMPOSITE_QNAME = new QName(SCA10_NS, IMPLEMENTATION_COMPOSITE);
     
     String IMPLEMENTATION = "implementation";
-    QName IMPLEMENTATION_QNAME = new QName(SCA11_NS, IMPLEMENTATION);
+    QName IMPLEMENTATION_QNAME = new QName(SCA10_NS, IMPLEMENTATION);
     
     String BINDING_SCA = "binding.sca";
-    QName BINDING_SCA_QNAME = new QName(Constants.SCA11_NS, BINDING_SCA);
+    QName BINDING_SCA_QNAME = new QName(Constants.SCA10_NS, BINDING_SCA);
     
     String NAME = "name";
     String TARGET_NAMESPACE = "targetNamespace";