Author: lresende
Date: Wed Feb 27 17:47:52 2008
New Revision: 631806
URL: http://svn.apache.org/viewvc?rev=631806&view=rev
Log:
Removing usage of ModelResolverImpl
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java?rev=631806&r1=631805&r2=631806&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
Wed Feb 27 17:47:52 2008
@@ -41,7 +41,6 @@
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.assembly.ActivationException;
import org.apache.tuscany.sca.core.context.CallableReferenceImpl;
@@ -196,14 +195,10 @@
if ( contributionURL != null ){
logger.log(Level.INFO, "Domain management configured from " +
contributionURL);
- // set up a model resolver with the classloader for this
domain/node
- ModelResolverImpl modelResolver = new
ModelResolverImpl(domainClassLoader);
-
// add node composite to the management domain
domainManagementContributionService =
domainManagementRuntime.getContributionService();
domainManagementContribution =
domainManagementContributionService.contribute("nodedomain",
contributionURL,
-
modelResolver,
false);
//update runtime with contribution sca definitions
Modified:
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java?rev=631806&r1=631805&r2=631806&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
Wed Feb 27 17:47:52 2008
@@ -51,7 +51,6 @@
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.assembly.ActivationException;
@@ -302,19 +301,13 @@
}
try {
- ModelResolver modelResolver = null;
-
- // if the contribution is to be resolved using a separate class
loader
- // then create a new model resolver
- if (contributionClassLoader != null) {
- modelResolver = new ModelResolverImpl(contributionClassLoader);
- }
+
+ //FIXME What to do when a contribution uses a separate class
loader ? (e.g contributionClassLoader != null)
// Add the contribution to the node
ContributionService contributionService =
nodeRuntime.getContributionService();
Contribution contribution =
contributionService.contribute(contributionURI,
contributionURL,
-
modelResolver,
false);
// remember the contribution
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
