From 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Oct 2009 23:44:59 +0000
Subject: Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
---
 .../distribution/src/main/assembly/src.xml             | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'branches/sca-java-1.x/distribution/src/main/assembly/src.xml')

diff --git a/branches/sca-java-1.x/distribution/src/main/assembly/src.xml b/branches/sca-java-1.x/distribution/src/main/assembly/src.xml
index e8b91dd83d..933af5652e 100644
--- a/branches/sca-java-1.x/distribution/src/main/assembly/src.xml
+++ b/branches/sca-java-1.x/distribution/src/main/assembly/src.xml
@@ -85,6 +85,8 @@
     		<exclude>distribution/target-last-successful</exclude>
     		<exclude>distribution/target-last-successful/**/*</exclude>
     		<exclude>itest/velocity.log</exclude>
+                <exclude>itest/atom/work</exclude>
+                <exclude>itest/atom/work/**/*</exclude>
                 <exclude>itest/bpel/helloworld-ws/work</exclude>
                 <exclude>itest/bpel/helloworld-ws/work/**/*</exclude>
                 <exclude>itest/callablereferences/work</exclude>
@@ -104,14 +106,20 @@
                 <exclude>itest/domain/work/**/*</exclude>
                 <exclude>itest/exceptions-simple-ws/work</exclude>
                 <exclude>itest/exceptions-simple-ws/work/**/*</exclude>
-                <exclude>itest/large-sdo-ws/</exclude>
-                <exclude>itest/large-sdo-ws/**/*</exclude>
+                <exclude>itest/late-reference-resolution/work</exclude>
+                <exclude>itest/late-reference-resolution/work/**/*</exclude>
                 <exclude>itest/policy/work</exclude>
                 <exclude>itest/policy/work/**/*</exclude>
+                <exclude>itest/policy-security-basicauth/work</exclude>
+                <exclude>itest/policy-security-basicauth/work/**/*</exclude>
+                <exclude>itest/spring/work</exclude>
+                <exclude>itest/spring/work/**/*</exclude>
                 <exclude>itest/transaction/derbydb</exclude>
                 <exclude>itest/transaction/derbydb/**/*</exclude>
                 <exclude>itest/ws-void-args-return/work</exclude>
                 <exclude>itest/ws-void-args-return/work/**/*</exclude>
+                <exclude>vtest/assembly/component/work</exclude>
+                <exclude>vtest/assembly/component/work/**/*</exclude>
                 <exclude>vtest/wsbinding/nowsdl/defaultbinding/work</exclude>
                 <exclude>vtest/wsbinding/nowsdl/defaultbinding/work/**/*</exclude>
                 <exclude>vtest/wsbinding/nowsdl/multisoapbindings/work</exclude>
@@ -120,6 +128,12 @@
                 <exclude>vtest/wsbinding/nowsdl/promoted/work/**/*</exclude>
                 <exclude>vtest/wsbinding/nowsdl/soapversion/work</exclude>
                 <exclude>vtest/wsbinding/nowsdl/soapversion/work/**/*</exclude>
+                <exclude>vtest/wsbinding/wsdlelement/binding/work</exclude>
+                <exclude>vtest/wsbinding/wsdlelement/binding/work/**/*</exclude>
+                <exclude>vtest/wsbinding/wsdlelement/port/work</exclude>
+                <exclude>vtest/wsbinding/wsdlelement/port/work/**/*</exclude>
+                <exclude>vtest/wsbinding/wsdlelement/service/work</exclude>
+                <exclude>vtest/wsbinding/wsdlelement/service/work/**/*</exclude>
                 <exclude>vtest/wsbinding/service/work</exclude>
                 <exclude>vtest/wsbinding/service/work/**/*</exclude>
                 <exclude>modules/domain-impl/work</exclude>
-- 
cgit v1.2.3