Update the model namespaces

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

8 files changed, 13 insertions, 13 deletions

diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
index 1b393a5ac0..88181e2d91 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
@@ -31,13 +31,13 @@ import org.osgi.framework.Bundle;
  * @version $Rev$ $Date$
  */
 public interface OSGiImplementation extends Implementation, Extensible {
-    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+    // String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
     String SCA11_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1";
 
     String BUNDLE_SYMBOLICNAME = "bundleSymbolicName";
     String BUNDLE_VERSION = "bundleVersion";
     QName IMPLEMENTATION_OSGI = new QName(SCA11_TUSCANY_NS, "implementation.osgi");
-    QName PROPERTY_QNAME = new QName(SCA11_TUSCANY_NS, "osgi.property");
+    QName PROPERTY_QNAME = OSGiProperty.OSGI_PROPERTY_QNAME;
 
     String getBundleSymbolicName();
 
diff --git a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
index 9a000af031..6d33f66afc 100644
--- a/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
+++ b/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
  * <tuscany:osgi.property> 
  */
 public interface OSGiProperty {
-    QName OSGI_PROPERTY_QNAME = new QName(OSGiImplementation.SCA11_TUSCANY_NS, "property");
+    QName OSGI_PROPERTY_QNAME = new QName(OSGiImplementation.SCA11_TUSCANY_NS, "osgi.property");
 
     String getValue();
 
diff --git a/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b1b37932ab..31c557157a 100644
--- a/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -16,5 +16,5 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.osgi,model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementation
+org.apache.tuscany.sca.implementation.osgi.xml.OSGiImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#implementation.osgi,model=org.apache.tuscany.sca.implementation.osgi.OSGiImplementation
 org.apache.tuscany.sca.implementation.osgi.xml.ServiceDescriptionsProcessor;qname=http://www.osgi.org/xmlns/sd/v1.0.0#service-descriptions;model=org.apache.tuscany.sca.implementation.osgi.ServiceDescriptions
diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index a31842b6a3..31731a79d7 100644
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
@@ -84,7 +84,7 @@ public class OSGiReadImplTestCase extends TestCase {
         Composite composite = (Composite)staxProcessor.read(reader);
         assertNotNull(composite);
 
-        is = getClass().getClassLoader().getResourceAsStream("OSGiTestService.componentType");
+        is = getClass().getClassLoader().getResourceAsStream("bundle.componentType");
         reader = inputFactory.createXMLStreamReader(is);
         ComponentType componentType = (ComponentType)staxProcessor.read(reader);
 
@@ -100,7 +100,7 @@ public class OSGiReadImplTestCase extends TestCase {
     public void testReadOSGiImplementation() throws Exception {
 
         String str =
-            "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<implementation.osgi xmlns=\"http://tuscany.apache.org/xmlns/sca/1.0\" targetNamespace=\"http://osgi\" "
+            "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<implementation.osgi xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\" targetNamespace=\"http://osgi\" "
                 + "bundleSymbolicName=\"OSGiTestService\" "
                 + "bundleVersion=\"2.0.0\" "
                 + "imports=\"import1.jar import2.jar\""
diff --git a/java/sca/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/java/sca/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
index 63cc5e811f..7b790d9eed 100644
--- a/java/sca/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ b/java/sca/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <service name="OSGiTestService">
         <interface.java interface="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface"/>
     </service>
diff --git a/java/sca/modules/implementation-osgi/src/test/resources/bundle.componentType b/java/sca/modules/implementation-osgi/src/test/resources/bundle.componentType
index ab334d91a7..df2b34c8c3 100644
--- a/java/sca/modules/implementation-osgi/src/test/resources/bundle.componentType
+++ b/java/sca/modules/implementation-osgi/src/test/resources/bundle.componentType
@@ -17,10 +17,9 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" 

+<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

                xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-               xmlns:t = "http://tuscany.apache.org/xmlns/sca/1.1"

-               >

+               xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">

     <!-- The service elment defines an SCA view of the OSGi service -->

     <service name="Calculator">

         <!-- The interface will be mapped into the OSGi service class -->

diff --git a/java/sca/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/java/sca/modules/implementation-osgi/src/test/resources/osgiproptest.composite
index 35aa620fcd..ac94b71088 100644
--- a/java/sca/modules/implementation-osgi/src/test/resources/osgiproptest.composite
+++ b/java/sca/modules/implementation-osgi/src/test/resources/osgiproptest.composite
@@ -17,8 +17,8 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="OSGiTestComposite">

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test" name="OSGiTestComposite">

 

     <component name="OSGiTestServiceComponent">

         <tuscany:implementation.osgi bundle="OSGiTestService"

diff --git a/java/sca/modules/implementation-osgi/src/test/resources/osgitest.composite b/java/sca/modules/implementation-osgi/src/test/resources/osgitest.composite
index 5ea6fed96d..8bafd4a2c9 100644
--- a/java/sca/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/java/sca/modules/implementation-osgi/src/test/resources/osgitest.composite
@@ -17,9 +17,10 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" 

+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

            xmlns:xsd="http://www.w3.org/2001/XMLSchema"

+           tagetNamespace="http://test"

            name="OSGiTestComposite">

 

     <component name="OSGiTestServiceComponent">