Merge commits r996988, r996991, r996994, r996998, r997259 and r997886 from 1.6.1 branch (TUSCANY-3676)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997908 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 249 insertions, 27 deletions

diff --git a/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml b/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
index 9e959d4bf1..71fc5a86f1 100644
--- a/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
+++ b/sca-java-1.x/trunk/distribution/src/main/assembly/bin.xml
@@ -101,6 +101,7 @@
                 <exclude>*/**/*.svg</exclude>
                 <!-- Sample specific work file/folders to exclude -->
                 <exclude>pom.xml</exclude>
+                <exclude>pom-distribution.xml</exclude>
                 <exclude>calculator-distributed/work</exclude>
                 <exclude>calculator-distributed/work/**/*</exclude>
                 <exclude>calculator-webapp/target/sample-calculator-webapp</exclude>
@@ -123,8 +124,6 @@
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp</exclude>
                 <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp/**/*</exclude>
                 <exclude>feed-aggregator-webapp/target/war</exclude>
-                <exclude>store-dojo</exclude>
-                <exclude>store-dojo/**/*</exclude>
                 <exclude>store-webapp/target</exclude>
                 <exclude>store-webapp/target/**/*</exclude>
                 <exclude>helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
@@ -227,6 +226,10 @@
                 <exclude>helloworld-ws-deep-webapp/work/**/*</exclude>
                 <exclude>helloworld-ws-service-webapp</exclude>
                 <exclude>helloworld-ws-service-webapp/**/*</exclude>
+                <exclude>store-dojo</exclude>
+                <exclude>store-dojo/**/*</exclude>
+                <exclude>zipcode-jaxws/</exclude>
+                <exclude>zipcode-jaxws/**/*</exclude>
             </excludes>
         </fileSet>
         <!-- Add all the demos to the demos directory -->
@@ -375,6 +378,15 @@
         </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>
diff --git a/sca-java-1.x/trunk/distribution/src/main/release/src/BUILDING b/sca-java-1.x/trunk/distribution/src/main/release/src/BUILDING
index 15ff808720..2a0730ad13 100644
--- a/sca-java-1.x/trunk/distribution/src/main/release/src/BUILDING
+++ b/sca-java-1.x/trunk/distribution/src/main/release/src/BUILDING
@@ -57,3 +57,35 @@ Building the distributions
    This will build the binary and source distributions with .zip and .gz 
    formats in the distribution/target directory.
 
+
+Using an IDE
+------------
+
+The easiest way to work with Apache Tuscany SCA in an IDE is to use Maven to
+generate all of the IDE project files for you automatically. This works best
+if you generate IDE projects for all of the Apache Tuscany modules. You can
+then include the ones you are interested in working with in your IDE. 
+
+To build IDE project files for all of the modules in Apache Tuscany SCA;
+
+cd <sca-dir>
+
+where <sca-dir> is the top-level directory containing the all the
+Apache Tuscany SCA source code.  
+
+If you are an Eclipse user do the following
+
+mvn eclipse:eclipse
+mvn -Declipse.workspace=<path-to-eclipse-workspace> eclipse:add-maven-repo
+
+If you are an IDEA user do the following 
+
+mvn idea:idea
+
+These commands generate project files for each module in Apache Tuscany SCA. 
+The modules you are interested in can now be included in your IDE.
+
+For example, in Eclipse, if you create a new Java project and use the option
+to "create a new project from existing source" you can specify an SCA module
+directory, which includes the generated project files, and Eclipse will treat
+it like any other Java project. 
diff --git a/sca-java-1.x/trunk/samples/README b/sca-java-1.x/trunk/samples/README
index 9d4bad1fc4..9fdbd78fdc 100644
--- a/sca-java-1.x/trunk/samples/README
+++ b/sca-java-1.x/trunk/samples/README
@@ -138,9 +138,9 @@ Getting Ready To Build
 ----------------------
 You will need to install the following software before you start. 
 
-J2SE Development Kit (JDK) 5.0
-Apache Ant 1.7.0                - if you are going to use Ant 
-Apache Maven 2.0.6              - if you are going to use Maven
+J2SE Development Kit (JDK) 5.0 or higher
+Apache Ant 1.7.1 or higher      - if you are going to use Ant 
+Apache Maven 2.0.10 or higher   - if you are going to use Maven
 
 Java and Ant and/or Maven binary directories must be present in your PATH so 
 that their executable programs are available in your environment. You may 
@@ -148,15 +148,15 @@ find it useful to use a script to set up your environment, for example;
 
 For UNIX:
   JAVA_HOME=/<installation_directory>
-  ANT_HOME=/<installation_directory>/apache-ant-1.7.0
-  MAVEN_HOME=/<installation_directory>/maven-2.0.6
-  export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$MAVEN_HOME/bin:$PATH
+  ANT_HOME=/<installation_directory>/apache-ant-1.7.1
+  M2_HOME=/<installation_directory>/maven-2.0.10
+  export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$M2_HOME/bin:$PATH
 
 For Windows:
   set JAVA_HOME=C:\<installation_directory>
-  set ANT_HOME=C:\<installation_directory>\apache-ant-1.7.0
-  set MAVEN_HOME=C:\<installation_directory>\maven-2.0.6
-  set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%MAVEN_HOME%\bin;%PATH%
+  set ANT_HOME=C:\<installation_directory>\apache-ant-1.7.1
+  set M2_HOME=C:\<installation_directory>\maven-2.0.10
+  set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%M2_HOME%\bin;%PATH%
 
 
 Building And Running The SCA Samples Using Ant
@@ -236,7 +236,7 @@ The Maven build process will work from both source and binary distributions.
 To build and test all of the Apache Tuscany SCA sources, including the samples,
 do the following.
 
-cd sca
+cd samples
 mvn
 
 This will take a little while to complete. Experience with Maven tells us that 
@@ -254,31 +254,38 @@ When using Maven the samples are run within JUnit test cases and so you will
 sometimes not see any test output. You will always see an indication of test 
 success or failure. 
 
+
 Using The Samples In An IDE
----------------------------------------------
+---------------------------
 The easiest way to use the samples in an IDE is to use Maven to generate all 
-of the IDE project files for you automatically. This works best if you 
-generate IDE projects for all of the Apache Tuscany modules. You can then 
-include the ones you are interested in working with in you IDE. 
+of the IDE project files for you automatically.
+
+If you are using the Apache Tuscany SCA source distribution, you can find
+details of how to generate IDE project files (including IDE project files
+for the samples) in the "Using an IDE" section of the BUILDING file.
 
-To build IDE project files for all of the modules in Apache Tuscany SCA;
+If you are using the Apache Tuscany SCA binary distribution, follow these
+steps to generate IDE project files for all of the samples;
 
-cd sca 
+cd samples
 
 If you are an Eclipse user do the following
 
-mvn -Peclipse eclipse:eclipse  
+mvn eclipse:eclipse
+mvn -Declipse.workspace=<path-to-eclipse-workspace> eclipse:add-maven-repo
 
 If you are an IDEA user do the following 
 
 mvn idea:idea
 
-These commands generate project files for each module in Apache Tuscany SCA. 
-The modules you are interested in can now be included in your IDE, for example,
-in Eclipse, if you create a new Java project and use the option to "create a 
-new project from existing source" you can specify an SCA module directory, 
-which includes the generated project files, and Eclipse will treat it like any
-other Java project. 
+These commands generate project files for each module in the samples directory. 
+The modules you are interested in can now be included in your IDE.
+
+For example, in Eclipse, if you create a new Java project and use the option
+to "create a new project from existing source" you can specify an SCA module
+directory, which includes the generated project files, and Eclipse will treat
+it like any other Java project. 
+
 
 Using The Samples In An IDE Without Maven
 -----------------------------------------
@@ -290,7 +297,7 @@ In a new or existing workspace
     Create a new java project to represent the sample you want to work on, e.g.
         calculator
     Import all of the sample code and resources into this project, e.g.
-        File, Import and then select tuscany-sca-1.0-incubating\samples\calculator from the filesystem
+        File, Import and then select samples/calculator from the filesystem
     Configure the source path to include
         src/main/java
         src/main/resources
diff --git a/sca-java-1.x/trunk/samples/pom-distribution.xml b/sca-java-1.x/trunk/samples/pom-distribution.xml
new file mode 100644
index 0000000000..4b6665e98d
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/pom-distribution.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<project>

+    <!--

+       This file is a modified version of the samples/pom.xml file in

+       the svn source tree. This file is used as the pom.xml for the

+       samples directory in the binary distribution.  Any updates to

+       samples/pom.xml in the svn source tree must also be applied to

+       samples/pom-distribution.xml to keep these 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 this file when this issue is fixed.

+    -->

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>tuscany-sca</artifactId>

+        <version>1.6.1-SNAPSHOT</version>

+    </parent>

+    <artifactId>tuscany-samples-distribution</artifactId>

+    <packaging>pom</packaging>

+    <name>Apache Tuscany SCA Samples in Binary Distribution</name>

+

+    <repositories>

+        <repository>

+            <id>apache.incubator</id>

+            <url>http://people.apache.org/repo/m2-incubating-repository</url>

+        </repository>

+    </repositories>

+

+    <profiles>

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>binding-echo</module>

+                <module>binding-echo-extension</module>

+                <module>binding-notification-broker</module>

+                <module>binding-notification-consumer</module>

+                <module>binding-notification-producer</module>

+                <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-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-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>databinding-echo</module>

+                <!--module>domain-webapp</module-->

+                <module>domain-management</module>

+                <module>feed-aggregator</module>

+                <module>feed-aggregator-webapp</module>

+                <module>helloworld-bpel</module>

+                <module>helloworld-dojo-webapp</module>

+                <!-- the following is excluded from pom-distribution.xml

+                <module>helloworld-erlang-reference</module -->

+                <!-- the following is excluded from pom-distribution.xml

+                <module>helloworld-erlang-service</module -->

+                <!-- the following is excluded from pom-distribution.xml

+                <module>helloworld-jms-webapp</module -->

+                <module>helloworld-jsonrpc-webapp</module>

+                <module>helloworld-reference-jms</module>

+                <module>helloworld-service-jms</module>

+                <module>helloworld-ws-service</module>

+                <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-jms</module>

+                <module>helloworld-ws-reference-secure</module>

+                <module>helloworld-ws-sdo</module>

+                <module>helloworld-ws-sdo-webapp</module>

+                <module>holder-ws-service</module>

+                <module>implementation-composite</module>

+                <module>implementation-crud</module>

+                <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>osgi-supplychain</module>

+                <module>photo-gallery</module>

+                <module>quote-xquery</module>

+                <module>simple-bigbank</module>

+                <module>simple-bigbank-spring</module>

+                <module>spring-bigbank-checkaccount</module>

+                <module>spring-bigbank-calculator</module>

+                <module>spring-bigbank-stockquote</module>

+                <module>simple-callback</module>

+                <module>simple-callback-ws</module>

+                <module>store</module>

+                <!-- the following is excluded from pom-distribution.xml

+                <module>store-dojo</module -->

+                <module>store-webapp</module>

+                <module>store-secure</module>

+                <module>supplychain</module>

+                <module>web-resource</module>

+                <!--module>zipcode-jaxws</module-->

+            </modules>

+        </profile>

+    </profiles>

+    

+</project>

diff --git a/sca-java-1.x/trunk/samples/pom.xml b/sca-java-1.x/trunk/samples/pom.xml
index 57851bdfa3..7825f293d9 100644
--- a/sca-java-1.x/trunk/samples/pom.xml
+++ b/sca-java-1.x/trunk/samples/pom.xml
@@ -18,6 +18,22 @@
  * 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>
@@ -51,6 +67,7 @@
                 <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-distributed</module>
                 <module>calculator-implementation-policies</module>
@@ -58,13 +75,16 @@
                 <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-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>databinding-echo</module>
                 <!--module>domain-webapp</module-->
@@ -73,8 +93,11 @@
                 <module>feed-aggregator-webapp</module>
                 <module>helloworld-bpel</module>
                 <module>helloworld-dojo-webapp</module>
+                <!-- the following is excluded from pom-distribution.xml -->
                 <module>helloworld-erlang-reference</module>
-                <module>helloworld-erlang-service</module>                
+                <!-- the following is excluded from pom-distribution.xml -->
+                <module>helloworld-erlang-service</module>
+                <!-- the following is excluded from pom-distribution.xml -->
                 <module>helloworld-jms-webapp</module>
                 <module>helloworld-jsonrpc-webapp</module>
                 <module>helloworld-reference-jms</module>
@@ -83,6 +106,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-jms</module>
                 <module>helloworld-ws-reference-secure</module>
@@ -94,6 +118,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>osgi-supplychain</module>
                 <module>photo-gallery</module>
@@ -106,6 +131,7 @@
                 <module>simple-callback</module>
                 <module>simple-callback-ws</module>
                 <module>store</module>
+                <!-- the following is excluded from pom-distribution.xml -->
                 <module>store-dojo</module>
                 <module>store-webapp</module>
                 <module>store-secure</module>