Author: rfeng
Date: Tue Feb 17 19:16:15 2009
New Revision: 745197
URL: http://svn.apache.org/viewvc?rev=745197&view=rev
Log:
Fix for TUSCANY-2854: remove the use of "tempuri.org"
Modified:
tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
tuscany/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
tuscany/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/resources/EchoBinding.composite
tuscany/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
Modified:
tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
Tue Feb 17 19:16:15 2009
@@ -229,7 +229,7 @@
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");
Modified:
tuscany/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
Tue Feb 17 19:16:15 2009
@@ -110,7 +110,7 @@
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 @@
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) {
Modified:
tuscany/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
Tue Feb 17 19:16:15 2009
@@ -110,7 +110,7 @@
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 @@
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) {
Modified:
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Tue Feb 17 19:16:15 2009
@@ -578,8 +578,8 @@
// 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 @@
// 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;
}
Modified:
tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
Tue Feb 17 19:16:15 2009
@@ -42,7 +42,7 @@
}
public void testEchoBinding() throws Exception {
- String result =
EchoServer.getServer().sendReceive("http://tempuri.org";, "foo");
+ String result =
EchoServer.getServer().sendReceive("http://example.com/temp";, "foo");
assertEquals(result, "oof");
}
Modified:
tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
(original)
+++
tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
Tue Feb 17 19:16:15 2009
@@ -28,7 +28,7 @@
<service name="EchoService" promote="EchoComponent">
<interface.java interface="echo.Echo"/>
- <e:binding.echo uri="http://tempuri.org"; />
+ <e:binding.echo uri="http://example.com/temp"; />
</service>
<component name="EchoComponent">
@@ -37,7 +37,7 @@
<reference name="EchoReference" promote="EchoComponent/echoReference">
<interface.java interface="echo.Echo"/>
- <e:binding.echo uri="http://tempuri.org";
policySets="t:EncryptionPolicy" />
+ <e:binding.echo uri="http://example.com/temp";
policySets="t:EncryptionPolicy" />
</reference>
</composite>
Modified:
tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
(original)
+++
tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
Tue Feb 17 19:16:15 2009
@@ -41,7 +41,7 @@
// Call the echo server. This will dispatch the call to a service with
an
// echo binding. The echo binding will pass the call to the echo
component.
- echoString = EchoServer.getServer().sendReceive("http://tempuri.org";,
"bar");
+ echoString =
EchoServer.getServer().sendReceive("http://example.com/temp";, "bar");
System.out.println("Echo service = " + echoString );
scaDomain.close();
Modified:
tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/resources/EchoBinding.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/resources/EchoBinding.composite?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/resources/EchoBinding.composite
(original)
+++
tuscany/branches/sca-java-1.x/samples/binding-echo/src/main/resources/EchoBinding.composite
Tue Feb 17 19:16:15 2009
@@ -25,7 +25,7 @@
<service name="EchoService" promote="EchoComponent">
<interface.java interface="echo.Echo"/>
- <e:binding.echo uri="http://tempuri.org"; />
+ <e:binding.echo uri="http://example.com/temp"; />
</service>
<component name="EchoComponent">
@@ -34,7 +34,7 @@
<reference name="EchoReference" promote="EchoComponent/echoReference">
<interface.java interface="echo.Echo"/>
- <e:binding.echo uri="http://tempuri.org"; />
+ <e:binding.echo uri="http://example.com/temp"; />
</reference>
</composite>
Modified:
tuscany/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java?rev=745197&r1=745196&r2=745197&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
Tue Feb 17 19:16:15 2009
@@ -51,7 +51,7 @@
public void testService() throws Exception {
// Call the echo server. This will dispatch the call to a service with
an
// echo binding. The echo binding will pass the call to the echo
component.
- String echoString =
EchoServer.getServer().sendReceive("http://tempuri.org";, "bar");
+ String echoString =
EchoServer.getServer().sendReceive("http://example.com/temp";, "bar");
assertEquals(echoString, "bar");
}
}
