summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-14 07:15:02 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-14 07:15:02 +0000
commit0e043d02b6eb760a505f9a1dd89f32643bfe96e8 (patch)
treefa8748b92e6fe4982fa3556358fb1291f5706a0f /sca-java-2.x
parent86341a0d865276fac10d6d595cfa6361380559fe (diff)
Update to only treat .jar, .zip and folders that don't start with . as contributions (so the .svn folders are ignored)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1135392 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
index 3c34a24ca3..69d2d24840 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/TuscanyRuntime.java
@@ -187,7 +187,7 @@ public class TuscanyRuntime {
List<String> installed = new ArrayList<String>();
for (File f : directory.listFiles()) {
- if (!f.getName().endsWith(".xml") && !f.getName().endsWith(".composite")) {
+ if (f.getName().endsWith(".jar") || f.getName().endsWith(".zip") || (f.isDirectory() && !f.getName().startsWith("."))) {
String fn = f.getName().lastIndexOf('.') == -1 ? f.getName() : f.getName().substring(0, f.getName().lastIndexOf('.'));
String metaData = null;
for (File f2 : directory.listFiles()) {
@@ -197,7 +197,7 @@ public class TuscanyRuntime {
}
}
- List<String> dependencyURIs = new ArrayList();
+ List<String> dependencyURIs = new ArrayList<String>();
String dependencyURIprop = domainProps.getProperty(fn + ".dependencies");
if (dependencyURIprop != null && dependencyURIprop.length() > 0) {
dependencyURIs = Arrays.asList(dependencyURIprop.split(","));