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 2008/02/28 02:48:17 UTC
svn commit: r631807 -
/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
Author: lresende
Date: Wed Feb 27 17:48:16 2008
New Revision: 631807
URL: http://svn.apache.org/viewvc?rev=631807&view=rev
Log:
Removing usage of ModelResolverImpl
Modified:
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java?rev=631807&r1=631806&r2=631807&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java Wed Feb 27 17:48:16 2008
@@ -35,7 +35,7 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
+import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.contribution.service.util.FileHelper;
import org.apache.tuscany.sca.core.assembly.ActivationException;
@@ -165,13 +165,13 @@
* and ContributionService APIs should make all this easier?
*/
protected void initContributions(EmbeddedSCADomain scaDomain, ClassLoader cl, URL[] contributionJars) {
- ModelResolverImpl modelResolver = new ModelResolverImpl(cl);
+ Contribution contribution = null;
ContributionService contributionService = scaDomain.getContributionService();
for (URL jar : contributionJars) {
InputStream is = null;
try {
is = jar.openStream();
- contributionService.contribute(jar.toString(), jar, is , modelResolver);
+ contribution = contributionService.contribute(jar.toString(), jar, is);
} catch (Exception e) {
System.err.println("exception adding contribution: " + jar);
e.printStackTrace();
@@ -185,28 +185,24 @@
}
}
- try {
+ if (contribution != null ) {
+ try {
- for (Object m : modelResolver.getModels()) {
- if (m instanceof Composite) {
- Composite composite = (Composite)m;
+ for (Composite composite : contribution.getDeployables()) {
scaDomain.getDomainComposite().getIncludes().add(composite);
scaDomain.getCompositeBuilder().build(composite);
scaDomain.getCompositeActivator().activate(composite);
}
- }
- for (Object m : modelResolver.getModels()) {
- if (m instanceof Composite) {
- Composite composite = (Composite)m;
- scaDomain.getCompositeActivator().start(composite);
+ for (Composite composite : contribution.getDeployables()) {
+ scaDomain.getCompositeActivator().start(composite);
}
- }
- } catch (ActivationException e) {
- throw new RuntimeException(e);
- } catch (CompositeBuilderException e) {
- throw new RuntimeException(e);
+ } catch (ActivationException e) {
+ throw new RuntimeException(e);
+ } catch (CompositeBuilderException e) {
+ throw new RuntimeException(e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org