Author: antelder
Date: Sun Mar 23 07:06:55 2008
New Revision: 640209

URL: http://svn.apache.org/viewvc?rev=640209&view=rev
Log:
Change the branch structure so that the src distro legal and info files are at 
the svn root instead of distribution/src/main/release, this is because there 
seems to be a feeling that the tag IS a release so need the correct legal files 
at the root.

Added:
    incubator/tuscany/branches/sdo-1.1-incubating/BUILDING
      - copied unchanged from r638293, 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/src/BUILDING
    incubator/tuscany/branches/sdo-1.1-incubating/DISCLAIMER
      - copied unchanged from r638293, 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/DISCLAIMER
    incubator/tuscany/branches/sdo-1.1-incubating/LICENSE
      - copied unchanged from r638293, 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/src/LICENSE
    incubator/tuscany/branches/sdo-1.1-incubating/NOTICE
      - copied unchanged from r640197, 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/src/NOTICE
    incubator/tuscany/branches/sdo-1.1-incubating/README
      - copied, changed from r638293, 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/src/README
    incubator/tuscany/branches/sdo-1.1-incubating/RELEASE_NOTES
      - copied, changed from r638293, 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/RELEASE_NOTES
Removed:
    
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/DISCLAIMER
    
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/README
    
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/RELEASE_NOTES
    
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/src/
Modified:
    
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/bin.xml
    
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/src.xml

Copied: incubator/tuscany/branches/sdo-1.1-incubating/README (from r638293, 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/src/README)
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/README?p2=incubator/tuscany/branches/sdo-1.1-incubating/README&p1=incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/src/README&r1=638293&r2=640209&rev=640209&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/src/README
 (original)
+++ incubator/tuscany/branches/sdo-1.1-incubating/README Sun Mar 23 07:06:55 
2008
@@ -1,4 +1,4 @@
-Tuscany SDO for ${sdo.version} Source Distribution Readme File
+Tuscany SDO for 1.1-incubating Source Distribution Readme File
 
 See the LICENSE, DISCLAIMER and NOTICE files for legal information concerning 
this distribution. 
 

Copied: incubator/tuscany/branches/sdo-1.1-incubating/RELEASE_NOTES (from 
r638293, 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/RELEASE_NOTES)
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/RELEASE_NOTES?p2=incubator/tuscany/branches/sdo-1.1-incubating/RELEASE_NOTES&p1=incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/RELEASE_NOTES&r1=638293&r2=640209&rev=640209&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/release/RELEASE_NOTES
 (original)
+++ incubator/tuscany/branches/sdo-1.1-incubating/RELEASE_NOTES Sun Mar 23 
07:06:55 2008
@@ -1,16 +1,16 @@
-What's New in SDO Java ${sdo.version}
+What's New in SDO Java 1.1-incubating
 
-Apache Tuscany's SDO Java Release ${sdo.version} is the second such release
-with full coverage of the SDO 2.1 specification (First being 
${sdo.previousversion}).
+Apache Tuscany's SDO Java Release 1.1-incubating is the second such release
+with full coverage of the SDO 2.1 specification (First being 1.0-incubating).
 
 It includes some new features and improvements along with a number of bug 
fixes (see below for detail).
 
 For previous revision history, take a look at
-http://svn.apache.org/viewvc/incubator/tuscany/tags/java/sdo/${sdo.previousversion}/sdo/distribution/RELEASE_NOTES.txt
+http://svn.apache.org/viewvc/incubator/tuscany/tags/java/sdo/1.0-incubating/sdo/distribution/RELEASE_NOTES.txt
 
-SDO Java ${sdo.version} is a superset of previous SDO ${sdo.previousversion} 
release.
-Anything in ${sdo.previousversion} is also in ${sdo.version}, but 
${sdo.version} contains
-features and bugfixes not present in ${sdo.previousversion} release.
+SDO Java 1.1-incubating is a superset of previous SDO 1.0-incubating release.
+Anything in 1.0-incubating is also in 1.1-incubating, but 1.1-incubating 
contains
+features and bugfixes not present in 1.0-incubating release.
 
 Downloading
 ===========
@@ -35,7 +35,7 @@
 
 maven groupId=org.apache.tuscany.sdo
 maven artifactId=tuscany-sdo-lib
-jar archive=tuscany-sdo-lib-${sdo.version}
+jar archive=tuscany-sdo-lib-1.1-incubating
 
 This artifact provides a clear distinction between Tuscany SDO implementation, 
 and the Tuscany
 API which extends the SDO API.  See the javadoc contained in the binary 
release for details of

Modified: 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/bin.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/bin.xml?rev=640209&r1=640208&r2=640209&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/bin.xml
 (original)
+++ 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/bin.xml
 Sun Mar 23 07:06:55 2008
@@ -30,18 +30,11 @@
 
             <!-- Add the text files to the top-level directory -->
            <fileSet>
-               <directory>src/main/release</directory>
-               <outputDirectory>tuscany-sdo-${sdo.version}</outputDirectory>
-               <includes>
-                <include>DISCLAIMER</include>
-               </includes>
-           </fileSet>
-           <fileSet>
                <directory>src/main/release/bin</directory>
                <outputDirectory>tuscany-sdo-${sdo.version}</outputDirectory>
                <includes>
-                       <include>INSTALL</include>
-                        <include>NOTICE</include>
+               <include>INSTALL</include>
+               <include>NOTICE</include>
                </includes>
            </fileSet>
             <fileSet>
@@ -87,7 +80,12 @@
 
     <files>
         <file>
-            <source>src/main/release/RELEASE_NOTES</source>
+            <source>../DISCLAIMER</source>
+            <outputDirectory>tuscany-sdo-${sdo.version}</outputDirectory>
+            <filtered>true</filtered>
+        </file>
+        <file>
+            <source>../RELEASE_NOTES</source>
             <outputDirectory>tuscany-sdo-${sdo.version}</outputDirectory>
             <filtered>true</filtered>
         </file>

Modified: 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/src.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/src.xml?rev=640209&r1=640208&r2=640209&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/src.xml
 (original)
+++ 
incubator/tuscany/branches/sdo-1.1-incubating/distribution/src/main/assembly/src.xml
 Sun Mar 23 07:06:55 2008
@@ -28,22 +28,6 @@
 
     <fileSets>
         <fileSet>
-            <directory>src/main/release</directory>
-            <!-- TODO get the right version reference -->
-            
<outputDirectory>tuscany-sdo-${tuscany.version}-src</outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            
<outputDirectory>tuscany-sdo-${tuscany.version}-src</outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>..</directory>
             
<outputDirectory>tuscany-sdo-${tuscany.version}-src</outputDirectory>
             <includes>
@@ -69,27 +53,4 @@
             </excludes>
         </fileSet>
     </fileSets>
-    <files>
-        <file>
-            <source>src/main/release/src/README</source>
-            <outputDirectory>tuscany-sdo-${sdo.version}-src</outputDirectory>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>src/main/release/src/LICENSE</source>
-            <outputDirectory>tuscany-sdo-${sdo.version}-src</outputDirectory>
-            <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>
-        </file>
-
-    </files>
 </assembly>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to