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 2007/02/03 16:37:26 UTC
svn commit: r503219 -
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java
Author: jboynes
Date: Sat Feb 3 07:37:26 2007
New Revision: 503219
URL: http://svn.apache.org/viewvc?view=rev&rev=503219
Log:
use URI resolution to generation child component uri
avoids compilation problem in DirectoryScanExtender
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java?view=diff&rev=503219&r1=503218&r2=503219
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/AbstractExtensionDeployer.java Sat Feb 3 07:37:26 2007
@@ -22,7 +22,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URISyntaxException;
+
import java.net.URL;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -32,7 +32,6 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
import org.apache.tuscany.spi.deployer.Deployer;
-import org.apache.tuscany.spi.loader.IllegalSCDLNameException;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.ComponentDefinition;
@@ -55,7 +54,7 @@
this.parent = parent;
}
- protected void deployExtension(File file) throws IllegalSCDLNameException {
+ protected void deployExtension(File file) {
// extension name is file name less any extension
String name = file.getName();
int dot = name.lastIndexOf('.');
@@ -73,7 +72,7 @@
deployExtension(name, url);
}
- protected void deployExtension(String name, URL url) throws IllegalSCDLNameException {
+ protected void deployExtension(String name, URL url) {
// FIXME for now, assume this class's ClassLoader is the Tuscany system classloader
// FIXME we should really use the one associated with the parent composite
CompositeClassLoader extensionCL = new CompositeClassLoader(getClass().getClassLoader());
@@ -99,12 +98,7 @@
SystemCompositeImplementation implementation = new SystemCompositeImplementation();
implementation.setScdlLocation(scdlLocation);
implementation.setClassLoader(extensionCL);
- URI uri;
- try {
- uri = new URI(parent.getUri().toString() + "/" + name);
- } catch (URISyntaxException e) {
- throw new IllegalSCDLNameException(e);
- }
+ URI uri = parent.getUri().resolve(name);
ComponentDefinition<SystemCompositeImplementation> definition =
new ComponentDefinition<SystemCompositeImplementation>(uri, implementation);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org