You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2008/07/24 14:23:19 UTC
svn commit: r679385 - in /tuscany/branches/sca-java-1.3/itest/builder/src:
main/resources/scenario10/ main/resources/scenario11/
main/resources/scenario12/ main/resources/scenario9/
test/java/org/apache/tuscany/sca/itest/builder/
Author: nash
Date: Thu Jul 24 05:23:19 2008
New Revision: 679385
URL: http://svn.apache.org/viewvc?rev=679385&view=rev
Log:
Renumber scenarios and update CompositeBuilderImplNonWiring
Modified:
tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite
tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite
tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite
tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite
tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite
tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite
tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10.composite Thu Jul 24 05:23:19 2008
@@ -39,12 +39,16 @@
</service>
<service name="Service2a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws uri="http://foo.com/bar" />
</service>
- <reference name="reference2">
+ <reference name="reference2" target="ComponentB/Service2a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws />
</reference>
<reference name="reference2a" target="ComponentF">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
+ <binding.ws />
</reference>
</component>
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario10/scenario10a.composite Thu Jul 24 05:23:19 2008
@@ -33,8 +33,6 @@
</reference>
<reference name="reference2a" promote="ComponentD/reference3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
- <binding.ws />
</reference>
<component name="ComponentD">
@@ -44,11 +42,9 @@
</service>
<service name="Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
</service>
<reference name="reference3" target="ComponentD/Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws/>
</reference>
<reference name="reference3a" target="ComponentE">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11.composite Thu Jul 24 05:23:19 2008
@@ -39,14 +39,13 @@
</service>
<service name="Service2a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws uri="http://foo.com/bar" />
</service>
<reference name="reference2">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
</reference>
<reference name="reference2a" target="ComponentF">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
- <binding.ws />
</reference>
</component>
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario11/scenario11a.composite Thu Jul 24 05:23:19 2008
@@ -28,11 +28,14 @@
<service name="Service2a" promote="ComponentD/Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
</service>
- <reference name="reference2" promote="ComponentD/reference3">
+ <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws />
</reference>
<reference name="reference2a" promote="ComponentD/reference3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" />
+ <binding.ws />
</reference>
<component name="ComponentD">
@@ -42,11 +45,9 @@
</service>
<service name="Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
</service>
<reference name="reference3" target="ComponentD/Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws/>
</reference>
<reference name="reference3a" target="ComponentE">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12.composite Thu Jul 24 05:23:19 2008
@@ -30,7 +30,6 @@
</reference>
<reference name="reference1a" promote="ComponentB/reference2a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar"/>
</reference>
<component name="ComponentB">
@@ -44,7 +43,7 @@
<reference name="reference2">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
</reference>
- <reference name="reference2a">
+ <reference name="reference2a" target="ComponentF">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
</reference>
</component>
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario12/scenario12a.composite Thu Jul 24 05:23:19 2008
@@ -42,12 +42,15 @@
</service>
<service name="Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws uri="http://foo.com/bar" />
</service>
<reference name="reference3" target="ComponentD/Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws/>
</reference>
<reference name="reference3a" target="ComponentE">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws />
</reference>
</component>
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9.composite Thu Jul 24 05:23:19 2008
@@ -27,9 +27,11 @@
</service>
<reference name="reference1" promote="ComponentB/reference2">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws uri="http://foo.com/bar"/>
</reference>
<reference name="reference1a" promote="ComponentB/reference2a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
+ <binding.ws uri="http://foo.com/bar"/>
</reference>
<component name="ComponentB">
@@ -43,7 +45,7 @@
<reference name="reference2">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
</reference>
- <reference name="reference2a" target="ComponentF">
+ <reference name="reference2a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
</reference>
</component>
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/main/resources/scenario9/scenario9a.composite Thu Jul 24 05:23:19 2008
@@ -42,15 +42,12 @@
</service>
<service name="Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws uri="http://foo.com/bar" />
</service>
<reference name="reference3" target="ComponentD/Service3a">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws/>
</reference>
<reference name="reference3a" target="ComponentE">
<!-- bindings and/or interfaces may or may not be specified explicitly here -->
- <binding.ws />
</reference>
</component>
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java Thu Jul 24 05:23:19 2008
@@ -167,9 +167,7 @@
assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
Component componentD = TestUtils.getComponent(domainComposite, "ComponentD");
- /*
if (!nonWiring) {
- */
// Should create component service $promoted$.ComponentB.Service2 on innermost component
// ComponentD, with <binding.ws> and uri="/ComponentB/Service2"
wsBinding = null;
@@ -185,14 +183,12 @@
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
for (ComponentService service : componentD.getServices()) {
assert !"$promoted$.ComponentB.Service2".equals(service.getName());
}
}
- */
// Should add <binding.ws> to outer composite service CompositeA/Service1
wsBinding = null;
@@ -337,9 +333,7 @@
port = svc.getPort("Service3Port");
assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port));
- /*
if (!nonWiring) {
- */
// Should create component service $promoted$.ComponentB.Service2 on innermost component
// ComponentD, with <binding.ws> and uri="/ComponentB/Service2"
wsBinding = null;
@@ -355,14 +349,12 @@
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
for (ComponentService service : componentD.getServices()) {
assert !"$promoted$.ComponentB.Service2".equals(service.getName());
}
}
- */
// Should add <binding.ws> to outer composite service CompositeA/Service1
wsBinding = null;
@@ -693,7 +685,7 @@
assert wsBinding.getWSDLDocument() == null;
}
- // Scenario 9: targets in references CBR2A and CDR3A and binding.ws at CDR3A
+ // Scenario 9: target in reference CDR3A and binding.ws uri= at CAR1A
public void testScenario9() throws Exception {
System.out.println("====>Running testScenario9");
customBuilder = new CustomCompositeBuilder(false);
@@ -701,7 +693,7 @@
//TestUtils.printResults(customBuilder);
TestUtils.checkProblems(customBuilder);
checkScenario9Results();
- }
+ }
private void checkScenario9Results() {
Composite domainComposite = customBuilder.getDomainComposite();
@@ -712,14 +704,14 @@
if ("reference3a".equals(reference.getName())) {
componentRef = reference;
assertTrue(reference.getBindings().size() == 2);
- assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding);
+ assertTrue(reference.getBindings().get(0) instanceof SCABinding);
assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);
}
}
assertTrue(componentRef != null);
- }
+ }
- // Scenario 10: targets in references CBR2A and CDR3A and binding.ws at CCR2A
+ // Scenario 10: targets in references CBR2A and CDR3A and binding.ws at CBR2A
public void testScenario10() throws Exception {
System.out.println("====>Running testScenario10");
customBuilder = new CustomCompositeBuilder(false);
@@ -727,9 +719,9 @@
//TestUtils.printResults(customBuilder);
TestUtils.checkProblems(customBuilder);
checkScenario10And11Results();
- }
+ }
- // Scenario 11: targets in references CBR2A and CDR3A and binding.ws at CBR2A
+ // Scenario 11: targets in references CBR2A and CDR3A and binding.ws at CCR2A
public void testScenario11() throws Exception {
System.out.println("====>Running testScenario11");
customBuilder = new CustomCompositeBuilder(false);
@@ -737,7 +729,7 @@
//TestUtils.printResults(customBuilder);
TestUtils.checkProblems(customBuilder);
checkScenario10And11Results();
- }
+ }
private void checkScenario10And11Results() {
Composite domainComposite = customBuilder.getDomainComposite();
@@ -759,7 +751,7 @@
assertTrue(componentRef != null);
}
- // Scenario 12: target in reference CDR3A and binding.ws uri= at CAR1A
+ // Scenario 12: targets in references CBR2A and CDR3A and binding.ws at CDR3A
public void testScenario12() throws Exception {
System.out.println("====>Running testScenario12");
customBuilder = new CustomCompositeBuilder(false);
@@ -767,7 +759,7 @@
//TestUtils.printResults(customBuilder);
TestUtils.checkProblems(customBuilder);
checkScenario12Results();
- }
+ }
private void checkScenario12Results() {
Composite domainComposite = customBuilder.getDomainComposite();
@@ -778,12 +770,12 @@
if ("reference3a".equals(reference.getName())) {
componentRef = reference;
assertTrue(reference.getBindings().size() == 2);
- assertTrue(reference.getBindings().get(0) instanceof SCABinding);
+ assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding);
assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding);
}
}
assertTrue(componentRef != null);
- }
+ }
// Scenario 13: target in reference CDR3A
public void testScenario13() throws Exception {
Modified: tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java?rev=679385&r1=679384&r2=679385&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java (original)
+++ tuscany/branches/sca-java-1.3/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java Thu Jul 24 05:23:19 2008
@@ -106,14 +106,14 @@
compositeIncludeBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl(monitor);
//componentReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceWireBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
- //componentReferencePromotionWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferencePromotionWireBuilderImpl(assemblyFactory, monitor);
- //compositeReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceWireBuilderImpl(assemblyFactory, monitor);
+ //componentReferencePromotionWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferencePromotionWireBuilderImpl(assemblyFactory, endpointFactory, monitor);
+ //compositeReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceWireBuilderImpl(assemblyFactory, endpointFactory, monitor);
compositeCloneBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeCloneBuilderImpl(monitor);
componentConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
compositeServiceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServiceConfigurationBuilderImpl(assemblyFactory);
compositeReferenceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceConfigurationBuilderImpl(assemblyFactory);
compositeBindingURIBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeBindingURIBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor);
- componentServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServicePromotionBuilderImpl(assemblyFactory);
+ //componentServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServicePromotionBuilderImpl(assemblyFactory);
//compositeServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServicePromotionBuilderImpl(assemblyFactory);
compositePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePromotionBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
compositePolicyBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePolicyBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor);
@@ -148,7 +148,7 @@
compositeBindingURIBuilder.build(composite);
// Create promoted component services
- componentServicePromotionBuilder.build(composite);
+// componentServicePromotionBuilder.build(composite);
// Create promoted composite services
// compositeServicePromotionBuilder.build(composite);