Author: antelder
Date: Mon May 18 08:19:12 2009
New Revision: 775857
URL: http://svn.apache.org/viewvc?rev=775857&view=rev
Log:
Merge bin distro updates from 1.x trunk
Modified:
tuscany/branches/sca-java-1.5/distribution/ (props changed)
tuscany/branches/sca-java-1.5/distribution/bundle/ (props changed)
tuscany/branches/sca-java-1.5/distribution/src/main/assembly/ (props
changed)
tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
Propchange: tuscany/branches/sca-java-1.5/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 18 08:19:12 2009
@@ -1,2 +1,3 @@
/tuscany/branches/sca-java-1.3/distribution:671193
/tuscany/branches/sca-java-1.4/distribution:723286,723297
+/tuscany/branches/sca-java-1.x/distribution:775856
Propchange: tuscany/branches/sca-java-1.5/distribution/bundle/
('svn:mergeinfo' removed)
Propchange: tuscany/branches/sca-java-1.5/distribution/src/main/assembly/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 18 08:19:12 2009
@@ -1,3 +1,3 @@
/tuscany/branches/sca-java-1.3/distribution/src/main/assembly:671193
/tuscany/branches/sca-java-1.4/distribution/src/main/assembly:723286,723297,725042
-/tuscany/branches/sca-java-1.x/distribution/src/main/assembly:775819
+/tuscany/branches/sca-java-1.x/distribution/src/main/assembly:775819,775856
Modified: tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml?rev=775857&r1=775856&r2=775857&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
(original)
+++ tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml Mon
May 18 08:19:12 2009
@@ -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>
