diff options
Diffstat (limited to 'java/sca')
9 files changed, 37 insertions, 37 deletions
diff --git a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java index 5f16bc0bea..1f45cb4a66 100644 --- a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java +++ b/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java @@ -75,13 +75,13 @@ public class BuilderTestCase extends TestCase { Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
if (!nonWiring) {
- // Should create component service $promoted$.Service1 on innermost component
+ // Should create component service $promoted$Service1 on innermost component
// ComponentD, with <binding.ws> and uri="/Service1"
// No other services on ComponentD should have <binding.ws>
WebServiceBinding wsBinding = null;
for (ComponentService service : componentD.getServices()) {
WebServiceBinding wsb = service.getBinding(WebServiceBinding.class);
- if ("$promoted$.Service1".equals(service.getName())) {
+ if ("$promoted$Service1".equals(service.getName())) {
wsBinding = wsb;
} else {
assert wsb == null;
@@ -89,16 +89,16 @@ public class BuilderTestCase extends TestCase { }
assert "/Service1".equals(wsBinding.getURI());
- // Should create WSDL document for ComponentD/$promoted$.Service1 with endpoint uri="/Service1"
+ // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"
Definition def = wsBinding.getWSDLDocument();
javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service"));
Port port = svc.getPort("Service3Port");
assert "/Service1".equals(TestUtils.getPortAddress(port));
} else {
- // Should not create component service $promoted$.Service1 on innermost component ComponentD
+ // Should not create component service $promoted$Service1 on innermost component ComponentD
// No component services on ComponentD should have <binding.ws>
for (ComponentService service : componentD.getServices()) {
- assert !"$promoted$.Service1".equals(service.getName());
+ assert !"$promoted$Service1".equals(service.getName());
assert service.getBinding(WebServiceBinding.class) == null;
}
}
@@ -168,25 +168,25 @@ public class BuilderTestCase extends TestCase { Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
if (!nonWiring) {
- // Should create component service $promoted$.ComponentB.Service2 on innermost component
+ // Should create component service $promoted$ComponentB$slash$Service2 on innermost component
// ComponentD, with <binding.ws> and uri="/ComponentB/Service2"
wsBinding = null;
for (ComponentService service : componentD.getServices()) {
- if ("$promoted$.ComponentB.Service2".equals(service.getName())) {
+ if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) {
wsBinding = service.getBinding(WebServiceBinding.class);
}
}
assert "/ComponentB/Service2".equals(wsBinding.getURI());
- // Should create WSDL document for ComponentD/$promoted$.ComponentB.Service2 with endpoint uri="/ComponentB/Service2"
+ // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2"
def = wsBinding.getWSDLDocument();
svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service"));
port = svc.getPort("Service3Port");
assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
} else {
- // Should not create component service $promoted$.ComponentB.Service2 on innermost component ComponentD
+ // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD
for (ComponentService service : componentD.getServices()) {
- assert !"$promoted$.ComponentB.Service2".equals(service.getName());
+ assert !"$promoted$ComponentB$slash$Service2".equals(service.getName());
}
}
@@ -204,17 +204,17 @@ public class BuilderTestCase extends TestCase { }
if (!nonWiring) {
- // Should create component service $promoted$.Service1 on innermost component
+ // Should create component service $promoted$Service1 on innermost component
// ComponentD, with <binding.ws> and uri="/Service1"
wsBinding = null;
for (ComponentService service : componentD.getServices()) {
- if ("$promoted$.Service1".equals(service.getName())) {
+ if ("$promoted$Service1".equals(service.getName())) {
wsBinding = service.getBinding(WebServiceBinding.class);
}
}
assert "/Service1".equals(wsBinding.getURI());
- // Should create WSDL document for ComponentD/$promoted$.Service1 with endpoint uri="/Service1"
+ // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"
def = wsBinding.getWSDLDocument();
svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service"));
port = svc.getPort("Service3Port");
@@ -222,15 +222,15 @@ public class BuilderTestCase extends TestCase { } else {
// Should not create component service $promoted$.Service1 on innermost component ComponentD
for (ComponentService service : componentD.getServices()) {
- assert !"$promoted$.Service1".equals(service.getName());
+ assert !"$promoted$Service1".equals(service.getName());
}
}
- // No services on ComponentD should have <binding.ws>, except for $promoted$.Service1
- // and $promoted$.ComponentB.Service2
+ // No services on ComponentD should have <binding.ws>, except for $promoted$Service1
+ // and $promoted$ComponentB$slash$Service2
for (ComponentService service : componentD.getServices()) {
- if (!"$promoted$.Service1".equals(service.getName()) &&
- !"$promoted$.ComponentB.Service2".equals(service.getName())) {
+ if (!"$promoted$Service1".equals(service.getName()) &&
+ !"$promoted$ComponentB$slash$Service2".equals(service.getName())) {
assert service.getBinding(WebServiceBinding.class) == null;
}
}
@@ -334,25 +334,25 @@ public class BuilderTestCase extends TestCase { assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
if (!nonWiring) {
- // Should create component service $promoted$.ComponentB.Service2 on innermost component
+ // Should create component service $promoted$ComponentB$slash$Service2 on innermost component
// ComponentD, with <binding.ws> and uri="/ComponentB/Service2"
wsBinding = null;
for (ComponentService service : componentD.getServices()) {
- if ("$promoted$.ComponentB.Service2".equals(service.getName())) {
+ if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) {
wsBinding = service.getBinding(WebServiceBinding.class);
}
}
assert "/ComponentB/Service2".equals(wsBinding.getURI());
- // Should create WSDL document for ComponentD/$promoted$.ComponentB.Service2 with endpoint uri="/ComponentB/Service2"
+ // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2"
def = wsBinding.getWSDLDocument();
svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service"));
port = svc.getPort("Service3Port");
assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
} else {
- // Should not create component service $promoted$.ComponentB.Service2 on innermost component ComponentD
+ // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD
for (ComponentService service : componentD.getServices()) {
- assert !"$promoted$.ComponentB.Service2".equals(service.getName());
+ assert !"$promoted$ComponentB$slash$Service2".equals(service.getName());
}
}
@@ -370,17 +370,17 @@ public class BuilderTestCase extends TestCase { }
if (!nonWiring) {
- // Should create component service $promoted$.Service1 on innermost component
+ // Should create component service $promoted$Service1 on innermost component
// ComponentD, with <binding.ws> and uri="/Service1"
wsBinding = null;
for (ComponentService service : componentD.getServices()) {
- if ("$promoted$.Service1".equals(service.getName())) {
+ if ("$promoted$Service1".equals(service.getName())) {
wsBinding = service.getBinding(WebServiceBinding.class);
}
}
assert "/Service1".equals(wsBinding.getURI());
- // Should create WSDL document for ComponentD/$promoted$.Service1 with endpoint uri="/Service1"
+ // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1"
def = wsBinding.getWSDLDocument();
svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service"));
port = svc.getPort("Service3Port");
@@ -388,7 +388,7 @@ public class BuilderTestCase extends TestCase { } else {
// Should not create component service $promoted$.Service1 on innermost component ComponentD
for (ComponentService service : componentD.getServices()) {
- assert !"$promoted$.Service1".equals(service.getName());
+ assert !"$promoted$Service1".equals(service.getName());
}
}
@@ -396,8 +396,8 @@ public class BuilderTestCase extends TestCase { // $promoted$.Service1 and $promoted$.ComponentB.Service2
for (ComponentService service : componentD.getServices()) {
if (!"Service3".equals(service.getName()) &&
- !"$promoted$.Service1".equals(service.getName()) &&
- !"$promoted$.ComponentB.Service2".equals(service.getName())) {
+ !"$promoted$Service1".equals(service.getName()) &&
+ !"$promoted$ComponentB$slash$Service2".equals(service.getName())) {
assert service.getBinding(WebServiceBinding.class) == null;
}
}
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java index 53e6eda1eb..d73286f7ab 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java @@ -72,7 +72,7 @@ public class ComponentServicePromotionBuilderImpl implements CompositeBuilder { // Create a new component service to represent this // component service on the promoted component ComponentService newComponentService = assemblyFactory.createComponentService(); - newComponentService.setName("$promoted$." + component.getName() + "." + componentService.getName()); + newComponentService.setName("$promoted$" + component.getName() + "$slash$" + componentService.getName()); promotedComponent.getServices().add(newComponentService); newComponentService.setService(promotedService.getService()); newComponentService.getBindings().addAll(componentService.getBindings()); diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java index 39d2cec396..ea0e88ac24 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java @@ -54,7 +54,7 @@ public class CompositeServicePromotionBuilderImpl implements CompositeBuilder { // Create a new component service to represent this composite // service on the promoted component ComponentService newComponentService = assemblyFactory.createComponentService(); - newComponentService.setName("$promoted$." + compositeService.getName()); + newComponentService.setName("$promoted$" + compositeService.getName()); promotedComponent.getServices().add(newComponentService); newComponentService.setService(promotedService.getService()); newComponentService.getBindings().addAll(compositeService.getBindings()); diff --git a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java index f28174c81d..e788526069 100644 --- a/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java +++ b/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java @@ -206,7 +206,7 @@ public class TestNode { CompositeService compositeService = (CompositeService)componentService.getService(); if (compositeService != null) { if (serviceName != null) { - serviceName = "$promoted$." + component.getName() + "." + serviceName; + serviceName = "$promoted$" + component.getName() + "$slash$" + serviceName; } componentContext = ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext(); diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java index bfccb62cc7..b276d8210f 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java @@ -65,7 +65,7 @@ public class QuestionMarkWSDLImportTestCase extends TestCase { Definition definition = wsdlReader.readWSDL("http://localhost:8086/AccountService?wsdl");
assertNotNull(definition);
- Service service = definition.getService(new QName("http://account2/AccountService/$promoted$.ep1", "AccountService"));
+ Service service = definition.getService(new QName("http://account2/AccountService/$promoted$ep1", "AccountService"));
Port port = service.getPort("AccountSoapPort");
String endpoint = getEndpoint(port);
diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java index aa54316660..59eb6164fa 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java @@ -65,7 +65,7 @@ public class QuestionMarkWSDLIncludeTestCase extends TestCase { Definition definition = wsdlReader.readWSDL("http://localhost:8085/AccountService?wsdl");
assertNotNull(definition);
- Service service = definition.getService(new QName("http://accounts/AccountService/$promoted$.ep1", "AccountService"));
+ Service service = definition.getService(new QName("http://accounts/AccountService/$promoted$ep1", "AccountService"));
Port port = service.getPort("AccountSoapPort");
String endpoint = getEndpoint(port);
diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java index ac9da19119..0508f28e11 100644 --- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java +++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java @@ -65,7 +65,7 @@ public class QuestionMarkWSDLTestCase extends TestCase { Definition definition = wsdlReader.readWSDL("http://localhost:8085/services/HelloWorldWebService?wsdl"); assertNotNull(definition); - Service service = definition.getService(new QName("http://helloworld/HelloWorldService/$promoted$.ep1", + Service service = definition.getService(new QName("http://helloworld/HelloWorldService/$promoted$ep1", "HelloWorldService")); Port port = service.getPort("HelloWorldSoapPort"); diff --git a/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java index 5ac2ae6498..519e76d0ae 100644 --- a/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java +++ b/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java @@ -204,7 +204,7 @@ public class EmbeddedSCADomain extends SCADomain { CompositeService compositeService = (CompositeService)componentService.getService(); if (compositeService != null) { if (serviceName != null) { - serviceName = "$promoted$." + component.getName() + "." + serviceName; + serviceName = "$promoted$" + component.getName() + "$slash$" + serviceName; } componentContext = ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext(); diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index e35203bc5b..36069bb7ee 100644 --- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -731,7 +731,7 @@ public class NodeImpl implements SCANode, SCAClient { CompositeService compositeService = (CompositeService)componentService.getService(); if (compositeService != null) { if (serviceName != null) { - serviceName = "$promoted$." + component.getName() + "." + serviceName; + serviceName = "$promoted$" + component.getName() + "$slash$" + serviceName; } componentContext = ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext(); |