merge of commit 643011 from 1.1 branch

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

3 files changed, 35 insertions, 34 deletions

diff --git a/java/sdo/distribution/src/main/assembly/src.xml b/java/sdo/distribution/src/main/assembly/src.xml
index 4043e744e2..37a0d02caf 100644
--- a/java/sdo/distribution/src/main/assembly/src.xml
+++ b/java/sdo/distribution/src/main/assembly/src.xml
@@ -50,6 +50,7 @@
                 <exclude>**/var/journal</exclude>
                 <exclude>**/build.out*</exclude>
                 <exclude>impl/.felix</exclude>
+                <exclude>impl/.felix/**/*</exclude>
             </excludes>
         </fileSet>
     </fileSets>
diff --git a/java/sdo/distribution/src/main/release/bin/README b/java/sdo/distribution/src/main/release/bin/README
index fc82c39310..adf9ee9c2d 100644
--- a/java/sdo/distribution/src/main/release/bin/README
+++ b/java/sdo/distribution/src/main/release/bin/README
@@ -1,23 +1,23 @@
-Tuscany SDO for ${sdo.version} Binary Distribution Readme File

-

-See the LICENSE, DISCLAIMER and NOTICE files for legal information concerning this distribution. 

-

-See the RELEASE_NOTES file for a summary of what's new with this release.

-

-See the INSTALL file for instructions on how to use Tuscany SDO Java provided in this binary distribution.

-

-See the docs/javadoc/sdo-samples/index.html file for instructions on how to run the sample programs.

-

-Documentation

-

-For general documentation about the Tuscany project and the SDO for Java, see the Tuscany website

-http://incubator.apache.org/tuscany

-

-This distribution contains javadoc for the SDO 2.1 API, the Tuscany SDO extensions API,  and the Tuscany SDO samples.

-

-Samples

-

-Sample source code is included with this binary distribution. 

-

-

-

+Tuscany SDO for ${sdo.version} Binary Distribution Readme File
+
+See the LICENSE, DISCLAIMER and NOTICE files for legal information concerning this distribution. 
+
+See the RELEASE_NOTES file for a summary of what's new with this release.
+
+See the INSTALL file for instructions on how to use Tuscany SDO Java provided in this binary distribution.
+
+See the docs/javadoc/sdo-samples/index.html file for instructions on how to run the sample programs.
+
+Documentation
+
+For general documentation about the Tuscany project and the SDO for Java, see the Tuscany website
+http://incubator.apache.org/tuscany
+
+This distribution contains javadoc for the SDO 2.1 API, the Tuscany SDO extensions API,  and the Tuscany SDO samples.
+
+Samples
+
+Sample source code is included with this binary distribution. 
+
+
+
diff --git a/java/sdo/distribution/src/main/release/bin/samples/README b/java/sdo/distribution/src/main/release/bin/samples/README
index d669e0b2b2..a19704ccd2 100644
--- a/java/sdo/distribution/src/main/release/bin/samples/README
+++ b/java/sdo/distribution/src/main/release/bin/samples/README
@@ -1,11 +1,11 @@
-Apache Tuscany SDO Java Sample Programs

-

-Documentation for these samples may be found in the docs/javadoc/sdo-samples directory

-of this distribution.

-

-The runsamples.sh and runsamples.bat scripts in their unedited form

-provide a way to run all of the samples sequentially.  If you run these scripts

-from within the directory they are found in, they will run correctly.

-If you run them from elsewhere you will need to edit the scripts and set the

-BINARY_BASE variable to the path in your filesystem where you unpacked the

-SDO distribution.

+Apache Tuscany SDO Java Sample Programs
+
+Documentation for these samples may be found in the docs/javadoc/sdo-samples directory
+of this distribution.
+
+The runsamples.sh and runsamples.bat scripts in their unedited form
+provide a way to run all of the samples sequentially.  If you run these scripts
+from within the directory they are found in, they will run correctly.
+If you run them from elsewhere you will need to edit the scripts and set the
+BINARY_BASE variable to the path in your filesystem where you unpacked the
+SDO distribution.