Author: slaws
Date: Wed Jan 2 08:34:30 2008
New Revision: 608139
URL: http://svn.apache.org/viewvc?rev=608139&view=rev
Log:
change domain.getCompositeBuilder.build() to domain.buildComposite() to match
Venkat's other code changes.
Modified:
incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
Modified:
incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
(original)
+++
incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
Wed Jan 2 08:34:30 2008
@@ -171,7 +171,7 @@
for (Composite deployable : c.getDeployables()) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
}
Modified:
incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCase.java
Wed Jan 2 08:34:30 2008
@@ -434,11 +434,11 @@
Object domainComposite = invokeNoArgsMethod(domain,
"getDomainComposite");
List includes = (List)invokeNoArgsMethod(domainComposite,
"getIncludes");
includes.add(composite);
- Object compositeBuilder = invokeNoArgsMethod(domain,
"getCompositeBuilder");
+ //Object compositeBuilder = invokeNoArgsMethod(domain,
"getCompositeBuilder");
Object compositeActivator = invokeNoArgsMethod(domain,
"getCompositeActivator");
Class compositeClass =
embeddedDomainClass.getClassLoader().loadClass(Composite.class.getName());
- invokeOneArgMethod(compositeBuilder, "build", compositeClass,
composite);
+ invokeOneArgMethod(domain, "buildComposite", compositeClass, composite);
invokeOneArgMethod(compositeActivator, "activate", compositeClass,
composite);
invokeOneArgMethod(compositeActivator, "start", compositeClass,
composite);
Modified:
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
Wed Jan 2 08:34:30 2008
@@ -59,7 +59,7 @@
contributionService.contribute("http://import-export/hello";,
helloURL, helloResolver, false);
Composite consumerComposite =
consumerContribution.getDeployables().get(0);
domain.getDomainComposite().getIncludes().add(consumerComposite);
- domain.getCompositeBuilder().build(consumerComposite);
+ domain.buildComposite(consumerComposite);
// Start Components from my composite
domain.getCompositeActivator().activate(consumerComposite);
Modified:
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
Wed Jan 2 08:34:30 2008
@@ -59,7 +59,7 @@
contributionService.contribute("http://import-export/export-composite";,
compositeContribURL, false);
for (Composite deployable : compositeContribution.getDeployables()) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
File helloWorldContribLocation = new File("./target/classes/");
@@ -68,7 +68,7 @@
contributionService.contribute("http://import-export/helloworld";,
helloWorldContribURL, false);
for (Composite deployable : helloWorldContribution.getDeployables()) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
// Start Components from my composite
Modified:
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
Wed Jan 2 08:34:30 2008
@@ -57,7 +57,7 @@
javaContribution =
contributionService.contribute("http://import-export/export-java";,
javaContribURL, false);
for (Composite deployable : javaContribution.getDeployables() ) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
File helloWorldContribLocation = new File("./target/classes/");
@@ -65,7 +65,7 @@
helloWorldContribution =
contributionService.contribute("http://import-export/helloworld";,
helloWorldContribURL, false);
for (Composite deployable : helloWorldContribution.getDeployables() ) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
// Start Components from my composite
Modified:
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
Wed Jan 2 08:34:30 2008
@@ -58,7 +58,7 @@
wsdlContribution =
contributionService.contribute("http://import-export/export-wsdl";,
wsdlContribURL, false);
for (Composite deployable : wsdlContribution.getDeployables() ) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
File helloWorldContribLocation = new File("./target/classes/");
@@ -66,7 +66,7 @@
consumerContribution =
contributionService.contribute("http://import-export/helloworld";,
helloWorldContribURL, false);
for (Composite deployable : consumerContribution.getDeployables() ) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
// Start Components from my composite
Modified:
incubator/tuscany/java/sca/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
Wed Jan 2 08:34:30 2008
@@ -63,7 +63,7 @@
for (Composite deployable : helloContribution.getDeployables()) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
for (Composite deployable : helloContribution.getDeployables()) {
domain.getCompositeActivator().activate(deployable);
@@ -74,7 +74,7 @@
contributionService.contribute("http://import-export/helloworld_one";,
helloWorldContribution_one_URL, false);
for (Composite deployable :
helloWorldContribution_one.getDeployables()) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
for (Composite deployable :
helloWorldContribution_one.getDeployables()) {
Modified:
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
Wed Jan 2 08:34:30 2008
@@ -155,7 +155,7 @@
for (Composite deployable :
supplychainContribution.getDeployables()) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
// Start Components from my composite
Modified:
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
Wed Jan 2 08:34:30 2008
@@ -210,23 +210,23 @@
for (Composite deployable : customerContribution.getDeployables())
{
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
for (Composite deployable : retailerContribution.getDeployables()
) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
for (Composite deployable : warehouseContribution.getDeployables()
) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
for (Composite deployable : shipperContribution.getDeployables() )
{
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
// Start Components from my composite
Modified:
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
Wed Jan 2 08:34:30 2008
@@ -193,23 +193,23 @@
for (Composite deployable : customerContribution.getDeployables())
{
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
for (Composite deployable : retailerContribution.getDeployables()
) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
for (Composite deployable : warehouseContribution.getDeployables()
) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
for (Composite deployable : shipperContribution.getDeployables() )
{
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
// Start Components from my composite
Modified:
incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java?rev=608139&r1=608138&r2=608139&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
Wed Jan 2 08:34:30 2008
@@ -51,7 +51,7 @@
contribution = contributionService.contribute("http://contribution";,
contributionURL, false);
for (Composite deployable : contribution.getDeployables()) {
domain.getDomainComposite().getIncludes().add(deployable);
- domain.getCompositeBuilder().build(deployable);
+ domain.buildComposite(deployable);
}
// Start Components from my composite
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
