You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/08/08 00:53:00 UTC
svn commit: r429505 - in /incubator/tuscany/java/sca:
core/src/main/java/org/apache/tuscany/core/implementation/composite/
core/src/main/java/org/apache/tuscany/core/launcher/
spi/src/main/java/org/apache/tuscany/spi/model/
Author: jboynes
Date: Mon Aug 7 15:52:59 2006
New Revision: 429505
URL: http://svn.apache.org/viewvc?rev=429505&view=rev
Log:
application should be loaded as a normal composite not a system one
have normal composites pick up the classloader from the composite implementation
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeImplementation.java
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java?rev=429505&r1=429504&r2=429505&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java Mon Aug 7 15:52:59 2006
@@ -32,8 +32,7 @@
DeploymentContext deploymentContext)
throws LoaderException {
URL scdlLocation = implementation.getScdlLocation();
- //FIXME classloader below
- ClassLoader cl = implementation.getClass().getClassLoader();
+ ClassLoader cl = implementation.getClassLoader();
deploymentContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation);
CompositeComponentType componentType = loadFromSidefile(parent, scdlLocation, deploymentContext);
implementation.setComponentType(componentType);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java?rev=429505&r1=429504&r2=429505&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java Mon Aug 7 15:52:59 2006
@@ -25,6 +25,7 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.CompositeImplementation;
import org.apache.tuscany.spi.bootstrap.ComponentNames;
import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
import org.apache.tuscany.spi.services.info.RuntimeInfo;
@@ -152,11 +153,11 @@
ClassLoader applicationLoader = getApplicationLoader();
// create a ComponentDefinition to represent the component we are going to deploy
- SystemCompositeImplementation impl = new SystemCompositeImplementation();
+ CompositeImplementation impl = new CompositeImplementation();
impl.setScdlLocation(appScdl);
impl.setClassLoader(applicationLoader);
- ComponentDefinition<SystemCompositeImplementation> moduleDefinition =
- new ComponentDefinition<SystemCompositeImplementation>(ComponentNames.TUSCANY_SYSTEM, impl);
+ ComponentDefinition<CompositeImplementation> moduleDefinition =
+ new ComponentDefinition<CompositeImplementation>(ComponentNames.TUSCANY_SYSTEM, impl);
// deploy the component into the runtime under the system parent
CompositeComponent parent = runtime.getRootComponent();
Modified: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeImplementation.java?rev=429505&r1=429504&r2=429505&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeImplementation.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeImplementation.java Mon Aug 7 15:52:59 2006
@@ -26,6 +26,7 @@
public class CompositeImplementation extends Implementation<CompositeComponentType> {
private String name;
private URL scdlLocation;
+ private ClassLoader classLoader;
public String getName() {
return name;
@@ -41,5 +42,13 @@
public void setScdlLocation(URL scdlLocation) {
this.scdlLocation = scdlLocation;
+ }
+
+ public ClassLoader getClassLoader() {
+ return classLoader;
+ }
+
+ public void setClassLoader(ClassLoader classLoader) {
+ this.classLoader = classLoader;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org