You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/11/04 08:25:10 UTC
svn commit: r832673 - in /tuscany/branches/sca-java-2.0-M4:
distribution/all/src/main/components/bin-samples.xml samples/pom.xml
Author: antelder
Date: Wed Nov 4 07:25:10 2009
New Revision: 832673
URL: http://svn.apache.org/viewvc?rev=832673&view=rev
Log:
Merge missing samples fix from trunk to M4
Modified:
tuscany/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml (contents, props changed)
tuscany/branches/sca-java-2.0-M4/samples/pom.xml (contents, props changed)
Modified: tuscany/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml?rev=832673&r1=832672&r2=832673&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml Wed Nov 4 07:25:10 2009
@@ -32,9 +32,12 @@
<include>calculator-osgi/**/*</include>
<include>calculator-rmi-reference/**/*</include>
<include>calculator-rmi-service/**/*</include>
+ <include>helloworld-bpel/**/*</include>
<include>implementation-java-calculator/**/*</include>
<include>dosgi-calculator/**/*</include>
<include>dosgi-calculator-operations/**/*</include>
+ <include>dosgi-dynamic-calculator/**/*</include>
+ <include>dosgi-dynamic-calculator-operations/**/*</include>
<include>webapps/helloworld/**/*</include>
<include>webapps/helloworld-bpel/**/*</include>
<include>webapps/helloworld-jms/**/*</include>
Propchange: tuscany/branches/sca-java-2.0-M4/distribution/all/src/main/components/bin-samples.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 4 07:25:10 2009
@@ -1,4 +1,4 @@
/tuscany/branches/sca-equinox/distribution/core/src/main/components/bin-samples.xml:695308-714142
/tuscany/branches/sca-java-1.3/distribution/core/src/main/components/bin-samples.xml:671193,680620-680628
-/tuscany/java/sca/distribution/all/src/main/components/bin-samples.xml:831525
+/tuscany/java/sca/distribution/all/src/main/components/bin-samples.xml:831525,832483-832485
/tuscany/sandbox/ant/sca/branches/foo/distribution/all/src/main/components/bin-samples.xml:755273
Modified: tuscany/branches/sca-java-2.0-M4/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/pom.xml?rev=832673&r1=832672&r2=832673&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/pom.xml Wed Nov 4 07:25:10 2009
@@ -48,19 +48,20 @@
<module>calculator-osgi</module>
<module>calculator-rmi-reference</module>
<module>calculator-rmi-service</module>
-
<module>dosgi-calculator</module>
<module>dosgi-calculator-operations</module>
-
<module>dosgi-dynamic-calculator</module>
- <module>dosgi-dynamic-calculator-operations</module>
+<!-- *********
+ IF YOU ADD ANY SAMPLES THEN ALSO ADD THEM TO
+ distribution\all\src\main\components\bin-samples.xml
+ OR THEY WONT GET IN RELEASES
+ ********* -->
+ <module>dosgi-dynamic-calculator-operations</module>
<module>helloworld-bpel</module>
-
<module>implementation-java-calculator</module>
<module>binding-ws-calculator</module>
-
<module>webapps/helloworld</module>
<module>webapps/helloworld-bpel</module>
<module>webapps/helloworld-jms</module>
@@ -68,10 +69,6 @@
<module>webapps/helloworld-jsp</module>
<module>webapps/helloworld-stripes</module>
<module>webapps/helloworld-servlet</module>
-<!--
- <module>webapps/helloworld-rest</module>
- <module>webapps/helloworld-wicket</module>
--->
</modules>
</profile>
</profiles>
Propchange: tuscany/branches/sca-java-2.0-M4/samples/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 4 07:25:10 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/samples/pom.xml:671193
+/tuscany/java/sca/samples/pom.xml:832483