From 9a1bdc5126ba8a7d5d54495f8d12f28946e8f140 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 18 May 2009 08:19:12 +0000
Subject: Merge bin distro updates from 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775857 13f79535-47bb-0310-9956-ffa450edef68
---
 branches/sca-java-1.5/distribution/src/main/assembly/bin.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'branches/sca-java-1.5/distribution/src/main/assembly')

diff --git a/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml b/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
index 22bdce9a33..041f853c78 100644
--- a/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
+++ b/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
@@ -66,6 +66,7 @@
                 <!-- General file/folders to exclude -->
                 <exclude>*/.classpath</exclude>
                 <exclude>*/.project</exclude>
+                <exclude>**/pom.transformed.xml</exclude>
                 <exclude>*/.settings</exclude>
                 <exclude>*/.settings/**/*</exclude>
                 <exclude>*/.externalToolBuilders</exclude>
@@ -120,6 +121,8 @@
                 <exclude>feed-aggregator-webapp/target/war</exclude>
                 <exclude>helloworld-bpel/target</exclude>
                 <exclude>helloworld-bpel/target/**/*</exclude>
+                <exclude>store-webapp/target</exclude>
+                <exclude>store-webapp/target/**/*</exclude>
                 <exclude>helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
                 <exclude>helloworld-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
                 <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
@@ -169,6 +172,8 @@
                 <exclude>helloworld-ws-deep-webapp/target/sample-helloworld-ws-deep-webapp.war</exclude>
                 <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp.war</exclude>
                 <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp.war</exclude>
+                <exclude>store-webapp/target/sample-helloworld-ws-sdo-webapp.war</exclude>
+                <exclude>store-webapp/target/sample-helloworld-ws-service-webapp.war</exclude>
                 <!-- Modules excluded from distribution as work is in progress... -->
                 <exclude>calculator2</exclude>
                 <exclude>calculator2/**/*</exclude>
@@ -231,6 +236,7 @@
             <excludes>
                 <exclude>*/.classpath</exclude>
                 <exclude>*/.project</exclude>
+                <exclude>**/pom.transformed.xml</exclude>
                 <exclude>*/.settings</exclude>
                 <exclude>*/.settings/**/*</exclude>
                 <exclude>*/work</exclude>
@@ -297,6 +303,7 @@
             <excludes>
                 <exclude>*/.classpath</exclude>
                 <exclude>*/.project</exclude>
+                <exclude>**/pom.transformed.xml</exclude>
                 <exclude>*/.settings</exclude>
                 <exclude>*/.settings/**/*</exclude>
                 <exclude>*/work</exclude>
-- 
cgit v1.2.3