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

2 files changed, 46 insertions, 2 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.