Fix for TUSCANY-2854: remove the use of "tempuri.org"

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

4 files changed, 9 insertions, 9 deletions

diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
index fee1efc37a..069cc9f5ae 100644
--- a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
+++ b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
@@ -229,7 +229,7 @@ public final class DomainManagerUtil {
         try {
     
             Composite composite = assemblyFactory.createComposite();
-            composite.setName(new QName("http://tempuri.org", "default"));
+            composite.setName(new QName("http://tuscany.apache.org/xmlns/sca/1.0", "default"));
             RuntimeComponent component = (RuntimeComponent)assemblyFactory.createComponent();
             component.setName("default");
             component.setURI("default");
diff --git a/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 1bca290c27..b76a248f5a 100644
--- a/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
@@ -110,7 +110,7 @@ public class DefaultSCADomain extends SCADomain {
         try {
             StringBuffer xml =
                 new StringBuffer("<sca:composite xmlns:sca=\"http://www.osoa.org/xmlns/sca/1.0\"")
-                    .append(" targetNamespace=\"http://tempuri.org\" name=\"aggregated\">\n");
+                    .append(" targetNamespace=\"http://tuscany.apache.org/xmlns/sca/1.0\" name=\"aggregated\">\n");
             XMLInputFactory factory = XMLInputFactory.newInstance();
             for (int i = 0; i < composites.length; i++) {
                 URL url = classLoader.getResource(composites[i]);
@@ -161,7 +161,7 @@ public class DefaultSCADomain extends SCADomain {
                 contributions.add(new SCAContribution(location, location));
             }
             node =
-                factory.createSCANode("http://tempuri.org/aggregated", content, contributions
+                factory.createSCANode("http://tuscany.apache.org/xmlns/sca/1.0/aggregated", content, contributions
                     .toArray(new SCAContribution[contributions.size()]));
         } else {
             for (String location : contributionURLs) {
diff --git a/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 1bca290c27..b76a248f5a 100644
--- a/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
@@ -110,7 +110,7 @@ public class DefaultSCADomain extends SCADomain {
         try {
             StringBuffer xml =
                 new StringBuffer("<sca:composite xmlns:sca=\"http://www.osoa.org/xmlns/sca/1.0\"")
-                    .append(" targetNamespace=\"http://tempuri.org\" name=\"aggregated\">\n");
+                    .append(" targetNamespace=\"http://tuscany.apache.org/xmlns/sca/1.0\" name=\"aggregated\">\n");
             XMLInputFactory factory = XMLInputFactory.newInstance();
             for (int i = 0; i < composites.length; i++) {
                 URL url = classLoader.getResource(composites[i]);
@@ -161,7 +161,7 @@ public class DefaultSCADomain extends SCADomain {
                 contributions.add(new SCAContribution(location, location));
             }
             node =
-                factory.createSCANode("http://tempuri.org/aggregated", content, contributions
+                factory.createSCANode("http://tuscany.apache.org/xmlns/sca/1.0/aggregated", content, contributions
                     .toArray(new SCAContribution[contributions.size()]));
         } else {
             for (String location : contributionURLs) {
diff --git a/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index 01887fcece..9ee03c2e46 100644
--- a/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
@@ -578,8 +578,8 @@ public class NodeImpl implements SCANode, SCAClient {
         // This is temporary to make the activator happy
         AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
         Composite tempComposite = assemblyFactory.createComposite();
-        tempComposite.setName(new QName("http://tempuri.org", "temp"));
-        tempComposite.setURI("http://tempuri.org");
+        tempComposite.setName(new QName("http://tuscany.apache.org/xmlns/sca/1.0", "temp"));
+        tempComposite.setURI("http://tuscany.apache.org/xmlns/sca/1.0");
 
         // Include the node composite in the top-level composite 
         tempComposite.getIncludes().add(composite);
@@ -608,8 +608,8 @@ public class NodeImpl implements SCANode, SCAClient {
             // Include all composites
             AssemblyFactory assemblyFactory = runtime.getAssemblyFactory();
             Composite aggregated = assemblyFactory.createComposite();
-            aggregated.setName(new QName("http://tempuri.org", "aggregated"));
-            aggregated.setURI("http://tempuri.org/aggregated");
+            aggregated.setName(new QName("http://tuscany.apache.org/xmlns/sca/1.0", "aggregated"));
+            aggregated.setURI("http://tuscany.apache.org/xmlns/sca/1.0/aggregated");
             aggregated.getIncludes().addAll(composites);
             composite = aggregated;
         }