You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/02/14 23:36:26 UTC
svn commit: r507727 -
/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java
Author: rfeng
Date: Wed Feb 14 14:36:26 2007
New Revision: 507727
URL: http://svn.apache.org/viewvc?view=rev&rev=507727
Log:
[sca-integration-branch] Merge extensions from discovery and parameters
Modified:
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java?view=diff&rev=507727&r1=507726&r2=507727
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java Wed Feb 14 14:36:26 2007
@@ -20,8 +20,11 @@
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.tuscany.api.TuscanyContainer;
import org.apache.tuscany.api.TuscanyException;
@@ -72,12 +75,15 @@
try {
CompositeComponent composite = launcher.bootRuntime(system, monitorFactory);
- if (exts == null) {
- Enumeration<URL> urls = cl.getResources(TuscanyContainer.EXTENSION_SCDL);
- exts = Collections.list(urls).toArray(new URL[0]);
+ Set<URL> extensions = new HashSet<URL>();
+ if (exts != null) {
+ extensions.addAll(Arrays.asList(exts));
}
- for (int i = 0; i < exts.length; i++) {
- deployExtension(composite, "tuscany.extension." + i, exts[i]);
+ Enumeration<URL> urls = cl.getResources(TuscanyContainer.EXTENSION_SCDL);
+ extensions.addAll(Collections.list(urls));
+ int i = 0;
+ for (URL ext : extensions) {
+ deployExtension(composite, "tuscany.extension." + (i++), ext);
}
SCAObject wireServiceComponent = composite.getSystemChild(ComponentNames.TUSCANY_WIRE_SERVICE);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org