summaryrefslogtreecommitdiffstats
path: root/java/sca/distribution/all/src/main
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-02-05 09:41:39 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-02-05 09:41:39 +0000
commita7621ae2165cc951c45fd44c56df260c9157b849 (patch)
tree99edfb780fdcb2052beabecf5768cfb4ff8961c7 /java/sca/distribution/all/src/main
parentebb89430400c2cb1d1c74ca18927375ff41601cc (diff)
Fix the problem with the distributions overwriting each other by merging the two assembly plugin configs in to one. That has some implications - the itests need the dir distribution so the distributions need to be built all the time not just with the distribution profile, so the assembly builds are moved to the default profile. To get it to work had to change appendAssemblyId to true so the dir distribution folder name changed again and the samples using that updated to match
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741059 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/distribution/all/src/main')
-rw-r--r--java/sca/distribution/all/src/main/assembly/bin.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/sca/distribution/all/src/main/assembly/bin.xml b/java/sca/distribution/all/src/main/assembly/bin.xml
index 4c204a0412..350948cb6f 100644
--- a/java/sca/distribution/all/src/main/assembly/bin.xml
+++ b/java/sca/distribution/all/src/main/assembly/bin.xml
@@ -19,7 +19,7 @@
-->
<assembly>
<!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
- <id>bin</id>
+ <id></id>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>tuscany-sca-2.0-SNAPSHOT</baseDirectory>
<formats>