Author: kelvingoodson
Date: Mon Jul 28 05:20:25 2008
New Revision: 680330
URL: http://svn.apache.org/viewvc?rev=680330&view=rev
Log:
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
Modified:
tuscany/java/sdo/distribution/src/main/assembly/bin.xml
tuscany/java/sdo/distribution/src/main/assembly/src.xml
tuscany/java/sdo/distribution/src/main/release/bin/NOTICE
tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat
tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh
tuscany/java/sdo/distribution/src/main/release/src/BUILDING
tuscany/java/sdo/distribution/src/main/release/src/NOTICE
tuscany/java/sdo/impl/src/main/resources/META-INF/NOTICE
tuscany/java/sdo/impl/src/main/resources/META-INF/README.txt
tuscany/java/sdo/lib/src/main/resources/META-INF/NOTICE
tuscany/java/sdo/lib/src/main/resources/META-INF/README.txt
tuscany/java/sdo/plugin/src/main/resources/META-INF/NOTICE
tuscany/java/sdo/plugin/src/main/resources/META-INF/README.txt
tuscany/java/sdo/sample/src/main/resources/META-INF/NOTICE
tuscany/java/sdo/sample/src/main/resources/META-INF/README.txt
tuscany/java/sdo/sdo-api/src/main/resources/META-INF/NOTICE
tuscany/java/sdo/sdo-api/src/main/resources/META-INF/README.txt
tuscany/java/sdo/tools/src/main/resources/META-INF/NOTICE
tuscany/java/sdo/tools/src/main/resources/META-INF/README.txt
Modified: tuscany/java/sdo/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/distribution/src/main/assembly/bin.xml?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/distribution/src/main/assembly/bin.xml (original)
+++ tuscany/java/sdo/distribution/src/main/assembly/bin.xml Mon Jul 28 05:20:25
2008
@@ -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>
Modified: tuscany/java/sdo/distribution/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/distribution/src/main/assembly/src.xml?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/distribution/src/main/assembly/src.xml (original)
+++ tuscany/java/sdo/distribution/src/main/assembly/src.xml Mon Jul 28 05:20:25
2008
@@ -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>
Modified: tuscany/java/sdo/distribution/src/main/release/bin/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/distribution/src/main/release/bin/NOTICE?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/distribution/src/main/release/bin/NOTICE (original)
+++ tuscany/java/sdo/distribution/src/main/release/bin/NOTICE Mon Jul 28
05:20:25 2008
@@ -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/).
Modified:
tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat
(original)
+++ tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.bat
Mon Jul 28 05:20:25 2008
@@ -22,5 +22,5 @@
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
Modified:
tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh
(original)
+++ tuscany/java/sdo/distribution/src/main/release/bin/samples/runsamples.sh
Mon Jul 28 05:20:25 2008
@@ -20,8 +20,8 @@
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
Modified: tuscany/java/sdo/distribution/src/main/release/src/BUILDING
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/distribution/src/main/release/src/BUILDING?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/distribution/src/main/release/src/BUILDING (original)
+++ tuscany/java/sdo/distribution/src/main/release/src/BUILDING Mon Jul 28
05:20:25 2008
@@ -20,8 +20,7 @@
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
Modified: tuscany/java/sdo/distribution/src/main/release/src/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/distribution/src/main/release/src/NOTICE?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/distribution/src/main/release/src/NOTICE (original)
+++ tuscany/java/sdo/distribution/src/main/release/src/NOTICE Mon Jul 28
05:20:25 2008
@@ -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/).
Modified: tuscany/java/sdo/impl/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/impl/src/main/resources/META-INF/NOTICE?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/impl/src/main/resources/META-INF/NOTICE (original)
+++ tuscany/java/sdo/impl/src/main/resources/META-INF/NOTICE Mon Jul 28
05:20:25 2008
@@ -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/).
Modified: tuscany/java/sdo/impl/src/main/resources/META-INF/README.txt
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/impl/src/main/resources/META-INF/README.txt?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/impl/src/main/resources/META-INF/README.txt (original)
+++ tuscany/java/sdo/impl/src/main/resources/META-INF/README.txt Mon Jul 28
05:20:25 2008
@@ -1,4 +1,4 @@
-Apache Tuscany 1.0-incubating build (July 2007)
+Apache Tuscany 1.1-incubating build February 2008)
===============================================
http://incubator.apache.org/tuscany/
Modified: tuscany/java/sdo/lib/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/lib/src/main/resources/META-INF/NOTICE?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/lib/src/main/resources/META-INF/NOTICE (original)
+++ tuscany/java/sdo/lib/src/main/resources/META-INF/NOTICE Mon Jul 28 05:20:25
2008
@@ -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/).
Modified: tuscany/java/sdo/lib/src/main/resources/META-INF/README.txt
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/lib/src/main/resources/META-INF/README.txt?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/lib/src/main/resources/META-INF/README.txt (original)
+++ tuscany/java/sdo/lib/src/main/resources/META-INF/README.txt Mon Jul 28
05:20:25 2008
@@ -1,4 +1,4 @@
-Apache Tuscany 1.0-incubating build (July 2007)
+Apache Tuscany 1.1-incubating build (February 2008)
===============================================
http://incubator.apache.org/tuscany/
Modified: tuscany/java/sdo/plugin/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/plugin/src/main/resources/META-INF/NOTICE?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/plugin/src/main/resources/META-INF/NOTICE (original)
+++ tuscany/java/sdo/plugin/src/main/resources/META-INF/NOTICE Mon Jul 28
05:20:25 2008
@@ -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/).
Modified: tuscany/java/sdo/plugin/src/main/resources/META-INF/README.txt
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/plugin/src/main/resources/META-INF/README.txt?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/plugin/src/main/resources/META-INF/README.txt (original)
+++ tuscany/java/sdo/plugin/src/main/resources/META-INF/README.txt Mon Jul 28
05:20:25 2008
@@ -1,4 +1,4 @@
-Apache Tuscany 1.0-incubating build (July 2007)
+Apache Tuscany 1.1-incubating build (February 2008)
===============================================
http://incubator.apache.org/tuscany/
Modified: tuscany/java/sdo/sample/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/sample/src/main/resources/META-INF/NOTICE?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/sample/src/main/resources/META-INF/NOTICE (original)
+++ tuscany/java/sdo/sample/src/main/resources/META-INF/NOTICE Mon Jul 28
05:20:25 2008
@@ -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/).
Modified: tuscany/java/sdo/sample/src/main/resources/META-INF/README.txt
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/sample/src/main/resources/META-INF/README.txt?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/sample/src/main/resources/META-INF/README.txt (original)
+++ tuscany/java/sdo/sample/src/main/resources/META-INF/README.txt Mon Jul 28
05:20:25 2008
@@ -1,4 +1,4 @@
-Apache Tuscany 1.0-incubating build (July 2007)
+Apache Tuscany 1.1-incubating build (February 2008)
===============================================
http://incubator.apache.org/tuscany/
Modified: tuscany/java/sdo/sdo-api/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/sdo-api/src/main/resources/META-INF/NOTICE?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/sdo-api/src/main/resources/META-INF/NOTICE (original)
+++ tuscany/java/sdo/sdo-api/src/main/resources/META-INF/NOTICE Mon Jul 28
05:20:25 2008
@@ -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/).
Modified: tuscany/java/sdo/sdo-api/src/main/resources/META-INF/README.txt
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/sdo-api/src/main/resources/META-INF/README.txt?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/sdo-api/src/main/resources/META-INF/README.txt (original)
+++ tuscany/java/sdo/sdo-api/src/main/resources/META-INF/README.txt Mon Jul 28
05:20:25 2008
@@ -1,4 +1,4 @@
-Apache Tuscany 1.0-incubating build (July 2007)
+Apache Tuscany 1.1-incubating build (February 2008)
===============================================
http://incubator.apache.org/tuscany/
Modified: tuscany/java/sdo/tools/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/tools/src/main/resources/META-INF/NOTICE?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/tools/src/main/resources/META-INF/NOTICE (original)
+++ tuscany/java/sdo/tools/src/main/resources/META-INF/NOTICE Mon Jul 28
05:20:25 2008
@@ -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/).
Modified: tuscany/java/sdo/tools/src/main/resources/META-INF/README.txt
URL:
http://svn.apache.org/viewvc/tuscany/java/sdo/tools/src/main/resources/META-INF/README.txt?rev=680330&r1=680329&r2=680330&view=diff
==============================================================================
--- tuscany/java/sdo/tools/src/main/resources/META-INF/README.txt (original)
+++ tuscany/java/sdo/tools/src/main/resources/META-INF/README.txt Mon Jul 28
05:20:25 2008
@@ -1,4 +1,4 @@
-Apache Tuscany 1.0-incubating build (July 2007)
+Apache Tuscany 1.1-incubating build (February 2008)
===============================================
http://incubator.apache.org/tuscany/
