diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-09-16 20:15:32 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-09-16 20:15:32 +0000 |
commit | 5fe8f1fb92a41ca0eda2914f89791f4ba4eb17ee (patch) | |
tree | b0139a973efb4c4517dc5a9d045fbb564276c292 /sca-java-1.x/trunk | |
parent | 4100cfc367e2825b82065c87cd4771ce2dcfbc4c (diff) |
Merge commit r997254 from 1.6.1 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997911 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk')
-rw-r--r-- | sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml | 2 | ||||
-rw-r--r-- | sca-java-1.x/trunk/distribution/src/main/assembly/src.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml b/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml index 71fc5a86f1..22bfba981f 100644 --- a/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml +++ b/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml @@ -349,6 +349,8 @@ <exclude>store/store-eu/target/cart-eu-db/**/*</exclude> <exclude>store/store-supplier/target/cart-db/</exclude> <exclude>store/store-supplier/target/cart-db/**/*</exclude> + <exclude>travelsample</exclude> + <exclude>travelsample/**/*</exclude> </excludes> </fileSet> <!-- Add the generated tuscany manifest classpath jar to the lib directory --> diff --git a/sca-java-1.x/trunk/distribution/src/main/assembly/src.xml b/sca-java-1.x/trunk/distribution/src/main/assembly/src.xml index decb7726fc..8cd1055342 100644 --- a/sca-java-1.x/trunk/distribution/src/main/assembly/src.xml +++ b/sca-java-1.x/trunk/distribution/src/main/assembly/src.xml @@ -206,6 +206,8 @@ <exclude>demos/bigbank-account/src/main/resources/web/dojo/**/*</exclude> <exclude>demos/secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo</exclude> <exclude>demos/secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo/**/*</exclude> + <exclude>tutorials/travelsample</exclude> + <exclude>tutorials/travelsample/**/*</exclude> <exclude>*/**/derby.log</exclude> <exclude>*/**/*.svg</exclude> <exclude>*/**/*.ruleset</exclude> |