summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java')
-rw-r--r--branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
index 32425e3299..64a8a92e01 100644
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
@@ -144,7 +144,11 @@ public class EarContributionProcessor implements PackageProcessor {
List<URI> artifacts = archiveProcessor.getArtifacts(packageSourceURL, bin);
bin.close();
for(URI artifact : artifacts) {
- names.add(entry.getName()+"!/"+artifact);
+ // don't add in nested application composites
+ if ((artifact.toString().endsWith("ejb-jar.composite") == false) &&
+ (artifact.toString().endsWith("web.composite") == false)) {
+ names.add(entry.getName()+"!/"+artifact);
+ }
}
}
}