You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/07/13 20:36:18 UTC
svn commit: r556094 - in
/incubator/tuscany/java/sca/itest/contribution-import-export:
contrib-wsdl/src/main/resources/ test-import-composite/src/main/resources/
test-import-composite/src/main/resources/wsdl/
test-import-composite/src/test/java/hellowo...
Author: lresende
Date: Fri Jul 13 11:36:17 2007
New Revision: 556094
URL: http://svn.apache.org/viewvc?view=rev&rev=556094
Log:
Properly activating the multiple contributions + minor refactoring/cleanup changes
Added:
incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/helloworld.wsdl
- copied unchanged from r555909, incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/wsdl/helloworld.wsdl
incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/helloworld.xsd
- copied unchanged from r555909, incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/wsdl/helloworld.xsd
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/main/resources/helloworld.wsdl
- copied unchanged from r555909, incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/main/resources/wsdl/helloworld.wsdl
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/main/resources/helloworld.xsd
- copied unchanged from r555909, incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/main/resources/wsdl/helloworld.xsd
Removed:
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/main/resources/wsdl/
Modified:
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=556094&r1=556093&r2=556094
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java Fri Jul 13 11:36:17 2007
@@ -54,18 +54,25 @@
File compositeContribLocation = new File("../contrib-composite/target/classes");
URL compositeContribURL = compositeContribLocation.toURL();
Contribution compositeContribution = contributionService.contribute("http://import-export/contrib-composite", compositeContribURL, compositeContributionResolver, false);
- Composite providerComposite = compositeContribution.getDeployables().get(0);
- domain.getDomainCompositeHelper().addComposite(providerComposite);
+ for (Composite deployable : compositeContribution.getDeployables() ) {
+ domain.getDomainCompositeHelper().addComposite(deployable);
+ }
- ModelResolver helloWorldResolver = new ModelResolverImpl(cl);
- File helloWorldContrib = new File("./target/classes/");
- URL helloWorldURL = helloWorldContrib.toURL();
- Contribution helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldURL, helloWorldResolver, false);
- Composite consumerComposite = helloWorldContribution.getDeployables().get(0);
- domain.getDomainCompositeHelper().addComposite(consumerComposite);
+ ModelResolver helloWorldContributionResolver = new ModelResolverImpl(cl);
+ File helloWorldContribLocation = new File("./target/classes/");
+ URL helloWorldContribURL = helloWorldContribLocation.toURL();
+ Contribution helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, helloWorldContributionResolver, false);
+ for (Composite deployable : helloWorldContribution.getDeployables() ) {
+ domain.getDomainCompositeHelper().addComposite(deployable);
+ }
//activate SCA Domain
domain.getDomainCompositeHelper().activateDomain();
+
+ //Start Components from my composite
+ domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("HelloServiceComponent"));
+ domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("SourceHelloServiceComponent"));
+ domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("HelloWorldServiceComponent"));
}
public void testPing() throws IOException {
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/main/resources/META-INF/sca-contribution.xml?view=diff&rev=556094&r1=556093&r2=556094
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/main/resources/META-INF/sca-contribution.xml Fri Jul 13 11:36:17 2007
@@ -18,8 +18,8 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://helloworld"
- xmlns:sample="http://helloworld">
- <deployable composite="sample:Consumer"/>
- <import namespace="http://helloworld" location="http://import-export/contrib-xsd"/>
+ targetNamespace="http://helloworld"
+ xmlns:helloworld="http://helloworld">
+ <deployable composite="helloworld:helloworldws"/>
+ <import namespace="http://helloworld" location="http://import-export/contrib-wsdl"/>
</contribution>
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=556094&r1=556093&r2=556094
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java Fri Jul 13 11:36:17 2007
@@ -31,9 +31,6 @@
import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
/**
* Tests that the helloworld server is available
@@ -53,36 +50,34 @@
// Contribute the SCA contribution
ContributionService contributionService = domain.getContributionService();
- ModelResolver providerResolver = new ModelResolverImpl(cl);
- File xsdContribLocation = new File("../contrib-wsdl/target/tuscany-itest-contribution-import-export-contrib-wsdl-1.0-incubating-SNAPSHOT.jar");
- URL xsdContribURL = xsdContribLocation.toURL();
- Contribution providerContribution = contributionService.contribute("http://import-export/contrib-wsdl", xsdContribURL, providerResolver, false);
- //Composite providerComposite = providerContribution.getDeployables().get(0);
- //domain.getDomainCompositeHelper().addComposite(providerComposite);
+ ModelResolver wsdlContributionResolver = new ModelResolverImpl(cl);
+ File wsdlContribLocation = new File("../contrib-wsdl/target/classes");
+ URL wsdlContribURL = wsdlContribLocation.toURL();
+ Contribution wsdlContribution = contributionService.contribute("http://import-export/contrib-wsdl", wsdlContribURL, wsdlContributionResolver, false);
+ for (Composite deployable : wsdlContribution.getDeployables() ) {
+ domain.getDomainCompositeHelper().addComposite(deployable);
+ }
- ModelResolver helloWorldResolver = new ModelResolverImpl(cl);
- File helloWorldContrib = new File("./target/classes/");
- URL helloWorldURL = helloWorldContrib.toURL();
- Contribution consumerContribution = contributionService.contribute("http://import-export/helloworld", helloWorldURL, helloWorldResolver, false);
- Composite consumerComposite = consumerContribution.getDeployables().get(0);
- domain.getDomainCompositeHelper().addComposite(consumerComposite);
+ ModelResolver helloWorldContributionResolver = new ModelResolverImpl(cl);
+ File helloWorldContribLocation = new File("./target/classes/");
+ URL helloWorldContribURL = helloWorldContribLocation.toURL();
+ Contribution consumerContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, helloWorldContributionResolver, false);
+ for (Composite deployable : consumerContribution.getDeployables() ) {
+ domain.getDomainCompositeHelper().addComposite(deployable);
+ }
//activate SCA Domain
domain.getDomainCompositeHelper().activateDomain();
+
+ //Start Components from my composite
+ domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("HelloWorldServiceComponent"));
}
- @Before
- public void startServer() throws Exception {
- //domain = SCADomain.newInstance("helloworldws.composite");
- }
-
- @Test
public void testPing() throws IOException {
new Socket("127.0.0.1", 8085);
}
- @After
- public void stopServer() throws Exception {
+ public void tearDown() throws Exception {
domain.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org