merge relevant required commits from the 1.1 branch up to 640209 (629426, 630144, 630180, 630184, 640196, 640209) - more to come from the 1.1 release and the 1.1.1 release

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

7 files changed, 12 insertions, 8 deletions

diff --git a/java/sdo/distribution/src/main/assembly/bin.xml b/java/sdo/distribution/src/main/assembly/bin.xml
index c16ffb5360..2e6b1f9ca8 100644
--- a/java/sdo/distribution/src/main/assembly/bin.xml
+++ b/java/sdo/distribution/src/main/assembly/bin.xml
@@ -122,6 +122,7 @@
         <dependencySet>
             <outputDirectory>tuscany-sdo-${sdo.version}/lib</outputDirectory>
             <includes>
+            	<include>org.apache.tuscany.sdo:tuscany-sdo-api-r2.1</include>
                 <include>org.apache.tuscany.sdo:tuscany-sdo-lib</include>
                 <include>org.apache.tuscany.sdo:tuscany-sdo-impl</include>
                 <include>org.apache.tuscany.sdo:tuscany-sdo-tools</include>
diff --git a/java/sdo/distribution/src/main/assembly/src.xml b/java/sdo/distribution/src/main/assembly/src.xml
index 82615d77d2..21a92118e7 100644
--- a/java/sdo/distribution/src/main/assembly/src.xml
+++ b/java/sdo/distribution/src/main/assembly/src.xml
@@ -34,7 +34,6 @@
             <includes>
                 <include>CHANGES</include>
                 <include>DISCLAIMER</include>
-                <include>NOTICE</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -81,6 +80,11 @@
             <filtered>true</filtered>
         </file>
         <file>
+            <source>src/main/release/src/NOTICE</source>
+            <outputDirectory>tuscany-sdo-${sdo.version}-src</outputDirectory>
+            <filtered>true</filtered>
+        </file>
+        <file>
             <source>src/main/release/RELEASE_NOTES</source>
             <outputDirectory>tuscany-sdo-${sdo.version}-src</outputDirectory>
             <filtered>true</filtered>
diff --git a/java/sdo/distribution/src/main/release/bin/NOTICE b/java/sdo/distribution/src/main/release/bin/NOTICE
index 6164c95944..dc3c1281f6 100644
--- a/java/sdo/distribution/src/main/release/bin/NOTICE
+++ b/java/sdo/distribution/src/main/release/bin/NOTICE
@@ -1,5 +1,5 @@
 Apache Tuscany

-Copyright (c) 2005 - 2007 The Apache Software Foundation

+Copyright (c) 2005 - 2008 The Apache Software Foundation

 

 This product includes software developed at

 The Apache Software Foundation (http://www.apache.org/).

diff --git a/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat b/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat
index 6bc92679da..a2e81eafec 100644
--- a/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat
+++ b/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat
@@ -22,5 +22,5 @@ echo If this script fails with ClassDefNotFound errors you probably need to
 echo edit the BINARY_BASE variable in the script to point to the location

 echo where you unpacked the Tuscany SDO binary distribution

 set LIB=%BINARY_BASE%\lib

-set CLASSPATH=%LIB%\sample-sdo-%RELEASE%.jar;%LIB%\sdo-api-r2.1-%RELEASE%.jar;%LIB%\tuscany-sdo-lib-%RELEASE%.jar;%LIB%\tuscany-sdo-impl-%RELEASE%.jar;%LIB%\tuscany-sdo-tools-%RELEASE%.jar;%LIB%\codegen-ecore-2.2.3.jar;%LIB%\codegen-2.2.3.jar;%LIB%\ecore-2.2.3.jar;%LIB%\ecore-change-2.2.3.jar;%LIB%\ecore-xmi-2.2.3.jar;%LIB%\common-2.2.3.jar;%LIB%\xsd-2.2.3.jar;%LIB%\stax-api-1.0.1.jar;%LIB%\wstx-asl-3.2.0.jar

+set CLASSPATH=%LIB%\sample-sdo-%RELEASE%.jar;%LIB%\sdo-api-r2.1-%RELEASE%.jar;%LIB%\tuscany-sdo-lib-%RELEASE%.jar;%LIB%\tuscany-sdo-impl-%RELEASE%.jar;%LIB%\tuscany-sdo-tools-%RELEASE%.jar;%LIB%\codegen-ecore-2.2.3.jar;%LIB%\codegen-2.2.3.jar;%LIB%\ecore-2.2.3.jar;%LIB%\ecore-change-2.2.3.jar;%LIB%\ecore-xmi-2.2.3.jar;%LIB%\common-2.2.3.jar;%LIB%\xsd-2.2.3.jar;%LIB%\stax-api-1.0.1.jar;%LIB%\wstx-asl-3.2.1.jar

 java org.apache.tuscany.samples.sdo.ExecuteSamples
\ No newline at end of file
diff --git a/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh b/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh
index 4b0695d5a6..e7a627d34e 100644
--- a/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh
+++ b/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh
@@ -20,8 +20,8 @@ echo If this script fails with ClassDefNotFound errors you probably need to
 echo edit the BINARY_BASE variable in the script to point to the location
 echo where you unpacked the Tuscany SDO binary distribution
 export BINARY_BASE=..
-export RELEASE=1.0-incubating
+export RELEASE=${sdo.version}
 export LIB=$BINARY_BASE/lib
-export CLASSPATH=$LIB/sample-sdo-$RELEASE.jar:$LIB/tuscany-sdo-api-r2.1-$RELEASE.jar:$LIB/tuscany-sdo-lib-$RELEASE.jar:$LIB/tuscany-sdo-impl-$RELEASE.jar:$LIB/tuscany-sdo-tools-$RELEASE.jar:$LIB/codegen-ecore-2.2.3.jar:$LIB/codegen-2.2.3.jar:$LIB/ecore-2.2.3.jar:$LIB/ecore-change-2.2.3.jar:$LIB/ecore-xmi-2.2.3.jar:$LIB/common-2.2.3.jar:$LIB/xsd-2.2.3.jar:$LIB/stax-api-1.0.1.jar:$LIB/wstx-asl-3.2.0.jar
+export CLASSPATH=$LIB/sample-sdo-$RELEASE.jar:$LIB/tuscany-sdo-api-r2.1-$RELEASE.jar:$LIB/tuscany-sdo-lib-$RELEASE.jar:$LIB/tuscany-sdo-impl-$RELEASE.jar:$LIB/tuscany-sdo-tools-$RELEASE.jar:$LIB/codegen-ecore-2.2.3.jar:$LIB/codegen-2.2.3.jar:$LIB/ecore-2.2.3.jar:$LIB/ecore-change-2.2.3.jar:$LIB/ecore-xmi-2.2.3.jar:$LIB/common-2.2.3.jar:$LIB/xsd-2.2.3.jar:$LIB/stax-api-1.0.1.jar:$LIB/wstx-asl-3.2.1.jar
 echo $CLASSPATH
 java org.apache.tuscany.samples.sdo.ExecuteSamples
diff --git a/java/sdo/distribution/src/main/release/src/BUILDING b/java/sdo/distribution/src/main/release/src/BUILDING
index 87b1ed4063..ff5e3a29f9 100644
--- a/java/sdo/distribution/src/main/release/src/BUILDING
+++ b/java/sdo/distribution/src/main/release/src/BUILDING
@@ -20,8 +20,7 @@ Building
 

 1) If you have chosen to install a JDK at version 5 then all will be fine,  but there is one value add component in the

    Tuscany SDO implementation which relies on new JDK 5.0 features.  If you do not wish to use JDK 5 for the following

-   build step, then you will need to delete the file

-   <archive-root>/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java before proceding

+   build step, then you will need to do mvn -Pjava_1_4_maven, as this profile option excludes the JDK5 dependent features.

 2) In a command window/shell, change to the top level directory of the Tuscany SDO Java source distribution.

 3) Execute: mvn

    This will install the sdo implementation and tools jars in your local maven repository

diff --git a/java/sdo/distribution/src/main/release/src/NOTICE b/java/sdo/distribution/src/main/release/src/NOTICE
index 8bf45184e9..365ebf1293 100644
--- a/java/sdo/distribution/src/main/release/src/NOTICE
+++ b/java/sdo/distribution/src/main/release/src/NOTICE
@@ -1,5 +1,5 @@
 Apache Tuscany

-Copyright (c) 2005 - 2007 The Apache Software Foundation

+Copyright (c) 2005 - 2008 The Apache Software Foundation

 

 This product includes software developed at

 The Apache Software Foundation (http://www.apache.org/).