You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 17:20:22 UTC
svn commit: r1027592 - in /tuscany/sca-java-1.x/trunk:
distribution/src/main/assembly/bin.xml modules/implementation-jee/pom.xml
modules/pom.xml pom.xml samples/domain-webapp/ samples/pom-distribution.xml
samples/pom.xml tutorials/store/store-test/pom.xml
Author: nash
Date: Tue Oct 26 15:20:21 2010
New Revision: 1027592
URL: http://svn.apache.org/viewvc?rev=1027592&view=rev
Log:
TUSCANY-3729: Apply r1023208 changes to 1.x trunk except for deletion of unreleased modules and samples
Removed:
tuscany/sca-java-1.x/trunk/samples/domain-webapp/
tuscany/sca-java-1.x/trunk/samples/pom-distribution.xml
Modified:
tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
tuscany/sca-java-1.x/trunk/modules/implementation-jee/pom.xml
tuscany/sca-java-1.x/trunk/modules/pom.xml
tuscany/sca-java-1.x/trunk/pom.xml
tuscany/sca-java-1.x/trunk/samples/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml
Modified: tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml?rev=1027592&r1=1027591&r2=1027592&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml (original)
+++ tuscany/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml Tue Oct 26 15:20:21 2010
@@ -102,8 +102,6 @@
<exclude>*/target/wsdl2java-source/**/*</exclude>
<exclude>*/**/*.svg</exclude>
<!-- Sample specific work file/folders to exclude -->
- <exclude>pom.xml</exclude>
- <exclude>pom-distribution.xml</exclude>
<exclude>calculator-webapp/target/sample-calculator-webapp</exclude>
<exclude>calculator-webapp/target/sample-calculator-webapp/**/*</exclude>
<exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp</exclude>
@@ -112,8 +110,6 @@
<exclude>calculator-ws-secure-webapp/target/sample-calculator-ws-secure-webapp/**/*</exclude>
<exclude>chat-webapp/target/sample-chat-webapp</exclude>
<exclude>chat-webapp/target/sample-chat-webapp/**/*</exclude>
- <exclude>domain-webapp/target/sample-domain-webapp</exclude>
- <exclude>domain-webapp/target/sample-domain-webapp/**/*</exclude>
<exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp</exclude>
<exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp/**/*</exclude>
<exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
@@ -136,7 +132,6 @@
<exclude>calculator-ws-secure-webapp/target/sample-calculator-ws-secure-webapp.war</exclude>
<exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp.war</exclude>
<exclude>chat-webapp/target/sample-chat-webapp.war</exclude>
- <exclude>domain-webapp/target/sample-domain-webapp.war</exclude>
<exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp.war</exclude>
<exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp.war</exclude>
<exclude>helloworld-jms-webapp/target/sample-helloworld-jms-webapp.war</exclude>
@@ -145,49 +140,6 @@
<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-store-webapp.war</exclude>
- <!-- Modules excluded from distribution as work is in progress... -->
- <exclude>calculator2</exclude>
- <exclude>calculator2/**/*</exclude>
- <exclude>calculator-lean</exclude>
- <exclude>calculator-lean/**/*</exclude>
- <exclude>calculator-osgi</exclude>
- <exclude>calculator-osgi/**/*</exclude>
- <exclude>calculator-rcp</exclude>
- <exclude>calculator-rcp/**/*</exclude>
- <exclude>chat2-webapp</exclude>
- <exclude>chat2-webapp/**/*</exclude>
- <exclude>customer-dojo</exclude>
- <exclude>customer-dojo/**/*</exclude>
- <exclude>customer-dojo-webapp</exclude>
- <exclude>customer-dojo-webapp/**/*</exclude>
- <exclude>helloworld-distributed</exclude>
- <exclude>helloworld-distributed/**/*</exclude>
- <exclude>helloworld-jsp</exclude>
- <exclude>helloworld-jsp/**/*</exclude>
- <exclude>helloworld-servlet</exclude>
- <exclude>helloworld-servlet/**/*</exclude>
- <exclude>helloworld-web</exclude>
- <exclude>helloworld-web/**/*</exclude>
- <exclude>helloworld-web-callback</exclude>
- <exclude>helloworld-web-callback/**/*</exclude>
- <exclude>loanapplication</exclude>
- <exclude>loanapplication/**/*</exclude>
- <exclude>helloworld-ws-reference-lean</exclude>
- <exclude>helloworld-ws-reference-lean/**/*</exclude>
- <exclude>spi-implementation-pojo</exclude>
- <exclude>spi-implementation-pojo/**/*</exclude>
- <exclude>helloworld-jms-webapp</exclude>
- <exclude>helloworld-jms-webapp/**/*</exclude>
- <exclude>domain-webapp</exclude>
- <exclude>domain-webapp/**/*</exclude>
- <exclude>calculator-ws-secure-webapp</exclude>
- <exclude>calculator-ws-secure-webapp/**/*</exclude>
- <exclude>helloworld-ws-deep-webapp</exclude>
- <exclude>helloworld-ws-deep-webapp/**/*</exclude>
- <exclude>helloworld-ws-service-webapp</exclude>
- <exclude>helloworld-ws-service-webapp/**/*</exclude>
- <exclude>zipcode-jaxws/</exclude>
- <exclude>zipcode-jaxws/**/*</exclude>
</excludes>
</fileSet>
<!-- Add all the demos to the demos directory -->
@@ -274,14 +226,6 @@
<include>tuscany-sca-manifest.jar</include>
</includes>
</fileSet>
- <!-- Add the node launcher webapp to the modules directory -->
- <fileSet>
- <directory>../modules/node2-launcher-webapp/target</directory>
- <outputDirectory>tuscany-sca-${tuscany.version}/modules</outputDirectory>
- <includes>
- <include>*.war</include>
- </includes>
- </fileSet>
<!-- temporary fix since maven dependencies of rampart seems to refere to SNAPSHOT versions of the parent pom -->
<!--fileSet>
@@ -293,15 +237,6 @@
</fileSet-->
</fileSets>
- <files>
- <!-- Add the subsetted distribution pom.xml to the samples directory -->
- <file>
- <source>../samples/pom-distribution.xml</source>
- <outputDirectory>tuscany-sca-${tuscany.version}/samples</outputDirectory>
- <destName>pom.xml</destName>
- </file>
- </files>
-
<dependencySets>
<!-- Add all the Tuscany modules to the modules directory -->
<dependencySet>
Modified: tuscany/sca-java-1.x/trunk/modules/implementation-jee/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/implementation-jee/pom.xml?rev=1027592&r1=1027591&r2=1027592&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/implementation-jee/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/modules/implementation-jee/pom.xml Tue Oct 26 15:20:21 2010
@@ -51,14 +51,14 @@
<artifactId>tuscany-contribution-jee</artifactId>
<version>1.7-SNAPSHOT</version>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-jee-impl</artifactId>
<version>1.7-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
Modified: tuscany/sca-java-1.x/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/pom.xml?rev=1027592&r1=1027591&r2=1027592&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/modules/pom.xml Tue Oct 26 15:20:21 2010
@@ -50,9 +50,9 @@
<module>binding-ejb-runtime</module>
<module>binding-erlang</module>
<module>binding-erlang-runtime</module>
- <!-- obsolete -->
+<!-- obsolete and excluded from releases, should be archived or deleted
<module>binding-feed</module>
- <!-- new bindings -->
+-->
<module>binding-atom</module>
<module>binding-atom-js</module>
<module>binding-atom-js-dojo</module>
@@ -82,7 +82,7 @@
<module>binding-sca</module>
<module>binding-sca-axis2</module>
<module>binding-sca-corba</module>
- <module>binding-sca-jms</module>
+ <module>binding-sca-jms</module> <!-- not released in 1.6.1 -->
<module>binding-sca-xml</module>
<module>binding-ws</module>
<module>binding-ws-axis2</module>
@@ -98,7 +98,7 @@
<module>contribution-resource</module>
<module>contribution-xml</module>
<module>contribution-jee</module>
- <module>contribution-jee-impl</module>
+ <module>contribution-jee-impl</module> <!-- not released in 1.6.1 -->
<module>core</module>
<module>core-databinding</module>
<module>core-spi</module>
@@ -115,8 +115,8 @@
-->
<module>databinding-saxon</module>
<module>databinding-xmlbeans</module>
- <module>databinding-fastinfoset</module>
- <module>databinding-xstream</module>
+ <module>databinding-fastinfoset</module> <!-- not released in 1.6.1 -->
+ <module>databinding-xstream</module> <!-- not released in 1.6.1 -->
<module>definitions</module>
<module>definitions-xml</module>
<module>domain-manager</module>
@@ -124,20 +124,20 @@
<module>endpoint</module>
<module>extensibility</module>
<module>extensibility-osgi</module>
- <module>extensibility-equinox</module>
+ <module>extensibility-equinox</module> <!-- not released in 1.6.1 -->
<module>extension-helper</module>
- <module>host-android</module>
+ <module>host-android</module> <!-- not released in 1.6.1 -->
<module>host-corba</module>
<module>host-corba-jee</module>
<module>host-corba-jse</module>
<module>host-corba-jse-tns</module>
- <module>host-ejb</module>
+ <module>host-ejb</module> <!-- not released in 1.6.1 -->
<module>host-embedded</module>
<module>host-http</module>
<module>host-jetty</module>
<module>host-jms</module>
<module>host-jms-asf</module>
- <module>host-openejb</module>
+ <module>host-openejb</module> <!-- not released in 1.6.1 -->
<module>host-rmi</module>
<module>host-tomcat</module>
<module>host-webapp</module>
@@ -162,7 +162,7 @@
<module>implementation-resource-runtime</module>
<module>implementation-script</module>
<module>implementation-spring</module>
- <module>implementation-spring-runtime</module>
+ <module>implementation-spring-runtime</module>
<module>implementation-web</module>
<module>implementation-web-runtime</module>
<module>implementation-widget</module>
@@ -194,7 +194,7 @@
<module>workspace</module>
<module>workspace-impl</module>
<module>workspace-xml</module>
- <module>workspace-manager</module>
+ <module>workspace-manager</module> <!-- not released in 1.6.1 -->
<module>xsd</module>
<module>xsd-xml</module>
<module>tracing-aspectj</module>
Modified: tuscany/sca-java-1.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/pom.xml?rev=1027592&r1=1027591&r2=1027592&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/pom.xml Tue Oct 26 15:20:21 2010
@@ -301,7 +301,7 @@
</plugins>
</build>
</profile>
-
+<!--
<profile>
<id>osgi</id>
<activation>
@@ -332,7 +332,7 @@
</plugins>
</build>
</profile>
-
+-->
<profile>
<id>dependencies</id>
<modules>
Modified: tuscany/sca-java-1.x/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/samples/pom.xml?rev=1027592&r1=1027591&r2=1027592&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/samples/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/samples/pom.xml Tue Oct 26 15:20:21 2010
@@ -18,22 +18,6 @@
* under the License.
-->
<project>
- <!--
- The pom-distribution.xml file in this directory is a modified version
- of this pom.xml file and is used as the pom.xml for the samples
- directory of the binary distribution. Any updates to this pom.xml
- file must be applied to pom-distribution.xml to keep the two files
- in sync (except where marked).
-
- The samples directory of the binary distribution needs to contain
- a pom.xml so that users can run "mvn eclipse:eclipse" to generate
- Eclipse project files for all the samples. We can't just copy the
- samples pom.xml from the svn source tree to the binary distribution
- because there are 10 samples in the svn source tree (and the source
- distribution) that aren't included in the binary distribution. This
- mismatch is being tracked as issue TUSCANY-3678 and it should be
- possible to remove pom-distribution.xml when this issue is fixed.
- -->
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
@@ -67,27 +51,22 @@
<module>calculator</module>
<module>calculator-corba-reference</module>
<module>calculator-corba-service</module>
- <!-- the following is excluded from pom-distribution.xml -->
- <module>calculator-lean</module>
+ <module>calculator-lean</module> <!-- not released in 1.6.1 -->
<module>calculator-distributed</module>
<module>calculator-implementation-policies</module>
<module>calculator-rmi-reference</module>
<module>calculator-rmi-service</module>
<module>calculator-script</module>
<module>calculator-webapp</module>
- <!-- the following is excluded from pom-distribution.xml -->
- <module>calculator-ws-secure-webapp</module>
+ <module>calculator-ws-secure-webapp</module> <!-- not released in 1.6.1 -->
<module>calculator-ws-webapp</module>
<module>callback-ws-client</module>
<module>callback-ws-service</module>
<module>callbacks-jms</module>
<module>chat-webapp</module>
- <!-- the following is excluded from pom-distribution.xml -->
- <module>customer-dojo</module>
- <!-- the following is excluded from pom-distribution.xml -->
- <module>customer-dojo-webapp</module>
+ <module>customer-dojo</module> <!-- not released in 1.6.1 -->
+ <module>customer-dojo-webapp</module> <!-- not released in 1.6.1 -->
<module>databinding-echo</module>
- <!--module>domain-webapp</module-->
<module>domain-management</module>
<module>feed-aggregator</module>
<module>feed-aggregator-webapp</module>
@@ -95,8 +74,7 @@
<module>helloworld-dojo-webapp</module>
<module>helloworld-erlang-reference</module>
<module>helloworld-erlang-service</module>
- <!-- the following is excluded from pom-distribution.xml -->
- <module>helloworld-jms-webapp</module>
+ <module>helloworld-jms-webapp</module> <!-- not released in 1.6.1 -->
<module>helloworld-jsonrpc-webapp</module>
<module>helloworld-reference-jms</module>
<module>helloworld-service-jms</module>
@@ -104,8 +82,7 @@
<module>helloworld-ws-service-jms</module>
<module>helloworld-ws-service-secure</module>
<module>helloworld-ws-reference</module>
- <!-- the following is excluded from pom-distribution.xml -->
- <module>helloworld-ws-reference-lean</module>
+ <module>helloworld-ws-reference-lean</module> <!-- not released in 1.6.1 -->
<module>helloworld-ws-reference-jms</module>
<module>helloworld-ws-reference-secure</module>
<module>helloworld-ws-sdo</module>
@@ -116,8 +93,7 @@
<module>implementation-crud-extension</module>
<module>implementation-notification</module>
<module>implementation-pojo-extension</module>
- <!-- the following is excluded from pom-distribution.xml -->
- <module>loanapplication</module>
+ <module>loanapplication</module> <!-- not released in 1.6.1 -->
<module>osgi-supplychain</module>
<module>photo-gallery</module>
<module>quote-xquery</module>
@@ -132,10 +108,10 @@
<module>store-dojo</module>
<module>store-webapp</module>
<module>store-secure</module>
- <module>store-distributed</module>
+ <module>store-distributed</module> <!-- not released in 1.6.1 -->
<module>supplychain</module>
<module>web-resource</module>
- <module>zipcode-jaxws</module>
+ <module>zipcode-jaxws</module> <!-- not released in 1.6.1 -->
</modules>
</profile>
</profiles>
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml?rev=1027592&r1=1027591&r2=1027592&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml Tue Oct 26 15:20:21 2010
@@ -136,14 +136,14 @@
<version>1.7-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-jee-impl</artifactId>
<version>1.7-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-ejb</artifactId>