You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2007/07/10 19:14:07 UTC

svn commit: r555013 - in /incubator/tuscany/java/sdo: distribution/src/main/assembly/ distribution/src/main/release/ distribution/src/main/release/bin/ distribution/src/main/release/src/ lib/ sample/ sample/src/main/java/org/apache/tuscany/samples/sdo/...

Author: kelvingoodson
Date: Tue Jul 10 10:14:04 2007
New Revision: 555013

URL: http://svn.apache.org/viewvc?view=rev&rev=555013
Log:
updates for release

Added:
    incubator/tuscany/java/sdo/distribution/src/main/release/NOTICE
    incubator/tuscany/java/sdo/distribution/src/main/release/bin/README
    incubator/tuscany/java/sdo/distribution/src/main/release/bin/sampleProgramContents.html
    incubator/tuscany/java/sdo/distribution/src/main/release/src/README
    incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html
    incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html
    incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html
Removed:
    incubator/tuscany/java/sdo/distribution/src/main/release/bin/NOTICE
    incubator/tuscany/java/sdo/distribution/src/main/release/src/NOTICE
    incubator/tuscany/java/sdo/sample/LICENSE.txt
    incubator/tuscany/java/sdo/sample/NOTICE.txt
    incubator/tuscany/java/sdo/sample/README.txt
    incubator/tuscany/java/sdo/sample/STATUS.txt
    incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/
    incubator/tuscany/java/sdo/sdo-api/BUILDING.txt
    incubator/tuscany/java/sdo/sdo-api/LICENSE.txt
    incubator/tuscany/java/sdo/sdo-api/NOTICE.txt
    incubator/tuscany/java/sdo/sdo-api/STATUS.txt
Modified:
    incubator/tuscany/java/sdo/distribution/src/main/assembly/bin.xml
    incubator/tuscany/java/sdo/distribution/src/main/assembly/src.xml
    incubator/tuscany/java/sdo/distribution/src/main/release/README
    incubator/tuscany/java/sdo/distribution/src/main/release/src/BUILDING
    incubator/tuscany/java/sdo/lib/pom.xml
    incubator/tuscany/java/sdo/sample/pom.xml
    incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java
    incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html

Modified: incubator/tuscany/java/sdo/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/assembly/bin.xml?view=diff&rev=555013&r1=555012&r2=555013
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/assembly/bin.xml (original)
+++ incubator/tuscany/java/sdo/distribution/src/main/assembly/bin.xml Tue Jul 10 10:14:04 2007
@@ -33,8 +33,10 @@
 			<directory>src/main/release</directory>
 			<outputDirectory>tuscany-sdo-${sdo.version}</outputDirectory>
 			<includes>
-				<include>DISCLAIMER</include>
-				<include>README</include>
+                <include>CHANGES</include>
+                <include>DISCLAIMER</include>
+                <include>RELEASE_NOTES</include>
+                <include>NOTICE</include>
 			</includes>
 		</fileSet>
 		<fileSet>
@@ -43,9 +45,15 @@
 			<includes>
 				<include>INSTALL</include>
 				<include>LICENSE</include>
-				<include>NOTICE</include>
 			</includes>
 		</fileSet>
+        <fileSet>
+            <directory>src/main/release/bin</directory>
+            <outputDirectory>tuscany-sdo-${sdo.version}/docs/javadoc/sdo-samples</outputDirectory>
+            <includes>
+                <include>sampleProgramContents.html</include>
+             </includes>
+        </fileSet>
 
         <!-- Add javadoc to the doc directory -->
         <fileSet>
@@ -92,6 +100,11 @@
         </file> 
         <file>
             <source>src/main/release/RELEASE_NOTES</source>
+            <outputDirectory>tuscany-sdo-${sdo.version}</outputDirectory>
+            <filtered>true</filtered>
+        </file>
+        <file>
+            <source>src/main/release/bin/README</source>
             <outputDirectory>tuscany-sdo-${sdo.version}</outputDirectory>
             <filtered>true</filtered>
         </file>

Modified: incubator/tuscany/java/sdo/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/assembly/src.xml?view=diff&rev=555013&r1=555012&r2=555013
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/assembly/src.xml (original)
+++ incubator/tuscany/java/sdo/distribution/src/main/assembly/src.xml Tue Jul 10 10:14:04 2007
@@ -34,8 +34,7 @@
             <includes>
                 <include>CHANGES</include>
                 <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
+                <include>NOTICE</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -44,14 +43,6 @@
             <includes>
                 <include>BUILDING</include>
                 <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/maven-shared-archive-resources/META-INF</directory>
-            <outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
-            <includes>
-                <include>NOTICE</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -104,4 +95,17 @@
             </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/RELEASE_NOTES</source>
+            <outputDirectory>tuscany-sdo-${sdo.version}-src</outputDirectory>
+            <filtered>true</filtered>
+        </file>
+
+    </files>
 </assembly>

Added: incubator/tuscany/java/sdo/distribution/src/main/release/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/release/NOTICE?view=auto&rev=555013
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/release/NOTICE (added)
+++ incubator/tuscany/java/sdo/distribution/src/main/release/NOTICE Tue Jul 10 10:14:04 2007
@@ -0,0 +1,32 @@
+Apache Tuscany SDO for Java
+Copyright 2006, 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Tuscany is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Web Services PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with other successful
+ASF projects. While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be fully endorsed
+by the ASF.
+
+Unless otherwise indicated, all distribution made available by the Apache Software Foundation
+is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
+A copy of the AL is provided with this distribution as the LICENSE.txt file present in the
+root directory, and is also available at http://www.apache.org/licenses/.
+
+The terms and conditions governing the distribution may refer to the AL or other license
+agreements, notices or terms and conditions. Some of these other license agreements may
+include (but are not limited to):
+
+  . Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-v10.html)
+
+It is your obligation to read and accept all such terms and conditions prior to use of the
+distribution. If term or condition is provided, please contact the Apache Software Foundation
+to determine what terms and conditions govern that particular distribution.
+
+This product also includes software developed by the Open Service Oriented Architecture organisation
+(http://osoa.org). The license for this software may be found in the LICENSE.txt file contained in this
+distribution.

Modified: incubator/tuscany/java/sdo/distribution/src/main/release/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/release/README?view=diff&rev=555013&r1=555012&r2=555013
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/release/README (original)
+++ incubator/tuscany/java/sdo/distribution/src/main/release/README Tue Jul 10 10:14:04 2007
@@ -1,4 +1,4 @@
-Tuscany SDO for Java M3 Binary Distribution Readme File
+Tuscany SDO for {$sdo.version} Binary Distribution Readme File
 
 Legal Notices
 
@@ -10,7 +10,8 @@
 
 Documentation
 
-For general documentation about the Tuscany project and the SDO for Java, see the <a href="http://incubator.apache.org/tuscany">Tuscany</a> website.
+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 API,  and the Tuscany SDO samples.
 

Added: incubator/tuscany/java/sdo/distribution/src/main/release/bin/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/release/bin/README?view=auto&rev=555013
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/release/bin/README (added)
+++ incubator/tuscany/java/sdo/distribution/src/main/release/bin/README Tue Jul 10 10:14:04 2007
@@ -0,0 +1,23 @@
+Tuscany SDO for ${sdo.version} Binary Distribution Readme File
+
+Legal Notices
+
+See the LICENSE and NOTICE files for legal information concerning this distribution. 
+
+Release Information
+
+See the RELEASE_NOTES file for a summary of what's new with this release since the M2 release.
+
+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 API,  and the Tuscany SDO samples.
+
+Samples
+
+Sample source code is included with this binary distribution. 
+
+
+

Added: incubator/tuscany/java/sdo/distribution/src/main/release/bin/sampleProgramContents.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/release/bin/sampleProgramContents.html?view=auto&rev=555013
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/release/bin/sampleProgramContents.html (added)
+++ incubator/tuscany/java/sdo/distribution/src/main/release/bin/sampleProgramContents.html Tue Jul 10 10:14:04 2007
@@ -0,0 +1,219 @@
+<html>
+<!-- Note -- this file is GENERATED from the samples using the
+Document Samples utility. Hand edits will be lost when regenerated!-->
+<!--                                                             
+*                                                              
+*  Licensed to the Apache Software Foundation (ASF) under one  
+*  or more contributor license agreements.  See the NOTICE file
+*  distributed with this work for additional information       
+*  regarding copyright ownership.  The ASF licenses this file  
+*  to you under the Apache License, Version 2.0 (the           
+*  "License"); you may not use this file except in compliance  
+*  with the License.  You may obtain a copy of the License at  
+*                                                              
+*    http://www.apache.org/licenses/LICENSE-2.0                
+*                                                              
+*  Unless required by applicable law or agreed to in writing,  
+*  software distributed under the License is distributed on an 
+*  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY      
+*  KIND, either express or implied.  See the License for the   
+*  specific language governing permissions and limitations     
+*  under the License.                                          
+-->                                                             
+<head><title>SDO Samples</title></head><body>
+  <h1>SDO Samples</h1>
+<P>
+The samples provided in the Tuscany SDO distribution cover many areas of
+the SDO API.  Here we provide two indexes into the samples.  The first lists
+each sample in sequence and details the central theme(s) of the sample.
+It also mentions if the sample significantly demonstrates other areas in passing.
+The second index lists all the themes that are covered by these samples, and
+indicates which of the samples has that subject area as a central theme or as
+demonstrates the subject area significant as an incidental part of the sample.<H2>Index by Sample Program Name</H2>
+<h3>Sample Program CreateCompany</h3>
+<b>Core function:</b><br/>
+<a href="#facet2">Set Properties of DataObject by name</a><br/>
+<br/><h3>Sample Program ReadPurchaseOrder</h3>
+<b>Core function:</b><br/>
+<a href="#facet15">Loading data from XML</a><br/>
+<a href="#facet16">Saving data to XML</a><br/>
+<br/><b>Also demonstrates:</b><br/>
+<a href="#facet1">Get Properties of DataObject by name</a><br/>
+<h3>Sample Program CreatePurchaseOrder</h3>
+<b>Core function:</b><br/>
+<a href="#facet15">Loading data from XML</a><br/>
+<a href="#facet16">Saving data to XML</a><br/>
+<br/><h3>Sample Program AccessDataObjectPropertiesByName</h3>
+<b>Core function:</b><br/>
+<a href="#facet1">Get Properties of DataObject by name</a><br/>
+<br/><h3>Sample Program AccessingTheContentsOfASequence</h3>
+<b>Core function:</b><br/>
+<a href="#facet13">Accessing values in a Sequence</a><br/>
+<br/><h3>Sample Program AccessDataObjectUsingValidXPath</h3>
+<b>Core function:</b><br/>
+<a href="#facet6">Get/Set Properties of DataObject by Xpath</a><br/>
+<br/><h3>Sample Program DynamicCustomerTypeSample</h3>
+<b>Core function:</b><br/>
+<a href="#facet9">Create Types using the SDO API</a><br/>
+<br/><b>Also demonstrates:</b><br/>
+<a href="#facet2">Set Properties of DataObject by name</a><br/>
+<a href="#facet12">Using Built-in Types</a><br/>
+<a href="#facet16">Saving data to XML</a><br/>
+<h3>Sample Program CreateCompanyTuscanyAPI</h3>
+<b>Core function:</b><br/>
+<a href="#facet2">Set Properties of DataObject by name</a><br/>
+<br/><h3>Sample Program CreateDataObjectFromXmlString</h3>
+<b>Core function:</b><br/>
+<a href="#facet12">Using Built-in Types</a><br/>
+<a href="#facet15">Loading data from XML</a><br/>
+<br/><h3>Sample Program SerializingDeserializingADataObject</h3>
+<b>Core function:</b><br/>
+<a href="#facet23">Java Serialization of data graph</a><br/>
+<br/><b>Also demonstrates:</b><br/>
+<a href="#facet24">Testing for Graph Equality</a><br/>
+<h3>Sample Program AccessingDataObjectsViaPropertyIndex</h3>
+<b>Core function:</b><br/>
+<a href="#facet4">Get/Set Properties of DataObject by index</a><br/>
+<br/><h3>Sample Program ObtainingDataGraphFromXml</h3>
+<b>Core function:</b><br/>
+<a href="#facet19">Wrapping data graph in a DataGraph instance</a><br/>
+<br/><b>Also demonstrates:</b><br/>
+<a href="#facet12">Using Built-in Types</a><br/>
+<h3>Sample Program PrintDataGraph</h3>
+<b>Core function:</b><br/>
+<a href="#facet14">Generic data graph traversal</a><br/>
+<br/><b>Also demonstrates:</b><br/>
+<a href="#facet5">Get/Set Properties by Instance Properties</a><br/>
+<a href="#facet7">isMany Properties</a><br/>
+<a href="#facet9">Create Types using the SDO API</a><br/>
+<a href="#facet13">Accessing values in a Sequence</a><br/>
+<a href="#facet21">Non-Containment</a><br/>
+<h3>Sample Program MedicalScenario</h3>
+<b>Core function:</b><br/>
+<a href="#facet8">Containment</a><br/>
+<a href="#facet9">Create Types using the SDO API</a><br/>
+<a href="#facet10">Create Types using XML Schema</a><br/>
+<a href="#facet20">Open Content</a><br/>
+<a href="#facet21">Non-Containment</a><br/>
+<br/><b>Also demonstrates:</b><br/>
+<a href="#facet3">Create DataObjects by name</a><br/>
+<a href="#facet7">isMany Properties</a><br/>
+<a href="#facet14">Generic data graph traversal</a><br/>
+<a href="#facet16">Saving data to XML</a><br/>
+<H2>Index by function</H2>
+<a name="facet0"/>
+<h3></h3>
+<a name="facet1"/>
+<h3>Get Properties of DataObject by name</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+AccessDataObjectPropertiesByName<br/>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+ReadPurchaseOrder<br/>
+<a name="facet2"/>
+<h3>Set Properties of DataObject by name</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+CreateCompany<br/>
+CreateCompanyTuscanyAPI<br/>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+DynamicCustomerTypeSample<br/>
+<a name="facet3"/>
+<h3>Create DataObjects by name</h3>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+MedicalScenario<br/>
+<a name="facet4"/>
+<h3>Get/Set Properties of DataObject by index</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+AccessingDataObjectsViaPropertyIndex<br/>
+<a name="facet5"/>
+<h3>Get/Set Properties by Instance Properties</h3>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+PrintDataGraph<br/>
+<a name="facet6"/>
+<h3>Get/Set Properties of DataObject by Xpath</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+AccessDataObjectUsingValidXPath<br/>
+<a name="facet7"/>
+<h3>isMany Properties</h3>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+MedicalScenario<br/>
+PrintDataGraph<br/>
+<a name="facet8"/>
+<h3>Containment</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+MedicalScenario<br/>
+<a name="facet9"/>
+<h3>Create Types using the SDO API</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+MedicalScenario<br/>
+DynamicCustomerTypeSample<br/>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+PrintDataGraph<br/>
+<a name="facet10"/>
+<h3>Create Types using XML Schema</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+MedicalScenario<br/>
+<a name="facet11"/>
+<h3>Create Types using the Tuscany API</h3>
+<a name="facet12"/>
+<h3>Using Built-in Types</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+CreateDataObjectFromXmlString<br/>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+DynamicCustomerTypeSample<br/>
+ObtainingDataGraphFromXml<br/>
+<a name="facet13"/>
+<h3>Accessing values in a Sequence</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+AccessingTheContentsOfASequence<br/>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+PrintDataGraph<br/>
+<a name="facet14"/>
+<h3>Generic data graph traversal</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+PrintDataGraph<br/>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+MedicalScenario<br/>
+<a name="facet15"/>
+<h3>Loading data from XML</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+CreateDataObjectFromXmlString<br/>
+CreatePurchaseOrder<br/>
+ReadPurchaseOrder<br/>
+<a name="facet16"/>
+<h3>Saving data to XML</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+CreatePurchaseOrder<br/>
+ReadPurchaseOrder<br/>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+MedicalScenario<br/>
+DynamicCustomerTypeSample<br/>
+<a name="facet17"/>
+<h3>Change Monitoring using a DataGraph</h3>
+<a name="facet18"/>
+<h3>Change Monitoring using a ChangeSummary Property on a DataObject</h3>
+<a name="facet19"/>
+<h3>Wrapping data graph in a DataGraph instance</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+ObtainingDataGraphFromXml<br/>
+<a name="facet20"/>
+<h3>Open Content</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+MedicalScenario<br/>
+<a name="facet21"/>
+<h3>Non-Containment</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+MedicalScenario<br/>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+PrintDataGraph<br/>
+<a name="facet22"/>
+<h3>Create XML Schema from Types</h3>
+<a name="facet23"/>
+<h3>Java Serialization of data graph</h3>
+<b>Samples which demonstrate this as their core function</b><br/>
+SerializingDeserializingADataObject<br/>
+<a name="facet24"/>
+<h3>Testing for Graph Equality</h3>
+<b>Samples which demonstrate this in addition to their core function</b><br/>
+SerializingDeserializingADataObject<br/>
+</body>
+</html>

Modified: incubator/tuscany/java/sdo/distribution/src/main/release/src/BUILDING
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/release/src/BUILDING?view=diff&rev=555013&r1=555012&r2=555013
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/release/src/BUILDING (original)
+++ incubator/tuscany/java/sdo/distribution/src/main/release/src/BUILDING Tue Jul 10 10:14:04 2007
@@ -1,24 +1,26 @@
-Building SDO Releases
-=====================
-The SDO specification source distribution and the SDO implementation source distribution
-together with a computer with a live internet connection, maven 2.0.4 installed and java 1.4.2
-or above installed are all you need to build
-1) the SDO binary distribution
-2) the SDO samples source distribution 
-
-Building the SDO Java Implementation Project Binary Release from the source distribution 
-========================================================================================
-(note,  these instructions are for building the SDO binary release from
+Building the SDO Release from a Source Distribution
+===================================================
+
+
+Note,  these instructions are for building the SDO binary release from
 source, not for establishing a development environment.  If you wish to
 participate in sdo development, follow the instructions at 
-http://cwiki.apache.org/confluence/display/TUSCANY/Developing+SDO+Java
+http://incubator.apache.org/tuscany/developing-sdo-java.html
+
+
+Initial Setup
+-------------
+
+1) Install J2SE JDK 1.4.2 or above
+2) Install Maven:
+Download Maven 2.0.4 (download from http://maven.apache.org/download.html)
+
 
 Building
 --------
-In these instructions <archive-root> refers to the common root folder contained in all distribution archives for a particular release, for example "tuscany-sdo-1.0-incubating-M3"
 
-1) Download the corresponding SDO specification source distribution from http://cwiki.apache.org/TUSCANY/sdo-java-download.html
-2) Execute the instructions in that archive for building the SDO specification component
+
+
 Note: following this step you will have maven installed, and a Java JDK at level 1.4.2 or above installed.
 3) If you have chosen to install a JDK at level 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
@@ -27,26 +29,11 @@
 4) Change to the top level directory of the Tuscany SDO Java Implementation project (<archive-root>/sdo) of this source distribution.
 6) Execute: mvn
    This will install the sdo implementation and tools jars in your local maven repository
-5) Execute: mvn package javadoc:javadoc assembly:assembly
-   This will build the Tuscany SDO for Java binary distribution artefacts in the sdo/distribution/target
-   directory.
+cd to distribution and run mvn
 
 Note: Depending on the load being experienced by remote Maven 2.0 repositories you may have to execute mvn several
     times until required dependencies are all located in your local maven repository.  After you have completed a
     full successful build you can use "mvn -o" which builds without trying to access updated build dependencies (offline mode) and is much faster.
 
-6) Currently, due to maven configuration issues, the distribution artefacts at this point contain 2 spurious items, junit-3.8.1.jar and asm-2.2.jar.  In order for the distribution archives to be consistent with the contained license information, these jar files must be manually removed from the archives.  This step will become unnecessary once the issues with maven have been overcome/fixed.
 
 7) To run the sample programs, change directory to the <archive-root>/sdo/sample directory, and run the command "mvn".  Then look in the <archive-root>/sdo/sample/target/site/apidocs/index.html file for javadoc that describes how to run the samples.
-
-
-Building the SDO Samples Source distribution
-============================================
-
-To build the SDO Samples source distribution
-1) Build the SDO binary distribution as instructed above
-2) From the top level directory of your SDO implementation build tree change directory to the <archive-root>/sdo/sample directory and execute the command mvn javadoc:javadoc to create javadoc for the samples in the <archive-root>/sdo/sample/target/site/apidocs directory
-3) copy the <archive-root>/sdo/sample directory from the SDO implementation source distribution to a temporary location with the path <archive-root>/sample below the temporary directory location
-4) copy the site/apidocs folder created in step 2 to the temporary directory created for step 3, so that it exists at path <archive-root>/sample/javadoc
-5) create .zip and .tar.gz archives containing the sample source and javadoc using the naming convention
-apache-<archive-root>-sample.<archive-extension>, such that the archives each contain a single root folder <archive-root>
\ No newline at end of file

Added: incubator/tuscany/java/sdo/distribution/src/main/release/src/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/distribution/src/main/release/src/README?view=auto&rev=555013
==============================================================================
--- incubator/tuscany/java/sdo/distribution/src/main/release/src/README (added)
+++ incubator/tuscany/java/sdo/distribution/src/main/release/src/README Tue Jul 10 10:14:04 2007
@@ -0,0 +1,20 @@
+Tuscany SDO for ${sdo.version} Source Distribution Readme File
+
+Legal Notices
+
+See the LICENSE and NOTICE files for legal information concerning this distribution. 
+
+Release Information
+
+See the RELEASE_NOTES file for a summary of what's new with this release since the M2 release.
+
+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 API,  and the Tuscany SDO samples.
+
+
+
+

Modified: incubator/tuscany/java/sdo/lib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/lib/pom.xml?view=diff&rev=555013&r1=555012&r2=555013
==============================================================================
--- incubator/tuscany/java/sdo/lib/pom.xml (original)
+++ incubator/tuscany/java/sdo/lib/pom.xml Tue Jul 10 10:14:04 2007
@@ -77,6 +77,7 @@
 <!-- KG TODO                    <overview>${basedir}/src/main/java/org/apache/tuscany/sdo/overview.html</overview> -->
                     <version>2.0</version>
                     <source>1.4</source>
+                    <excludePackageNames>org.apache.tuscany.sdo.lib:org.apache.tuscany.sdo.spi</excludePackageNames>
                 </configuration>
                 <executions>
                     <execution>

Modified: incubator/tuscany/java/sdo/sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/pom.xml?view=diff&rev=555013&r1=555012&r2=555013
==============================================================================
--- incubator/tuscany/java/sdo/sample/pom.xml (original)
+++ incubator/tuscany/java/sdo/sample/pom.xml Tue Jul 10 10:14:04 2007
@@ -81,7 +81,7 @@
                     <execution>
                         <phase>package</phase>
                         <goals>
-                            <goal>javadoc</goal>
+                            <goal>jar</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -97,25 +97,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-<!-- KG TODO                    <overview>${basedir}/src/main/java/org/apache/tuscany/sdo/overview.html</overview> -->
-                    <version>2.0</version>
-                    <source>1.4</source>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>
 </project>

Added: incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html?view=auto&rev=555013
==============================================================================
--- incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html (added)
+++ incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html Tue Jul 10 10:14:04 2007
@@ -0,0 +1,31 @@
+<html>
+<!--
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ * -->
+<head>
+    <title>Advanced SDO Samples</title>
+</head>
+<BODY>
+<h1>Advanced Service Data Object (SDO) Sample Programs</h1>
+
+<h3>Running the Samples</h3> See <A HREF="../../../../../../index.html" 
+target="_top">the main overview</A> for instructions on how to run these 
+samples.
+</BODY>
+</HTML>

Added: incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html?view=auto&rev=555013
==============================================================================
--- incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html (added)
+++ incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html Tue Jul 10 10:14:04 2007
@@ -0,0 +1,31 @@
+<html>
+<!--
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ * -->
+<head>
+    <title>Basic SDO Samples</title>
+</head>
+<BODY>
+<h1>Simple Service Data Object (SDO) Sample Programs</h1>
+
+<h3>Running the Samples</h3> See <A HREF="../../../../../../index.html" 
+target="_top">the main overview</A> for instructions on how to run these 
+samples.
+</BODY>
+</HTML>

Modified: incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java?view=diff&rev=555013&r1=555012&r2=555013
==============================================================================
--- incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java (original)
+++ incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java Tue Jul 10 10:14:04 2007
@@ -129,8 +129,10 @@
         
         // FIXME I'm not sure how to explain why the top level data object is of type AnyTypeDataObject
         // and the shipTo Property's type is DataObject
+        // FIXME show that this is open and isDataType = false
         System.out.println("The type of the DataObject is " + purchaseOrder.getType().getName() +
             " and has " + purchaseOrder.getType().getProperties().size() + " Properties");
+        System.out.println("The type of the DataObject is " + purchaseOrder.getInstanceProperty("shipTo").getType().getName());
         System.out.println("The DataObject itself has " + purchaseOrder.getInstanceProperties().size() + " Properties\n");
         Property p0 = (Property)purchaseOrder.getInstanceProperties().get(0);
         System.out.println("The first of these instance Properties is " + p0.getName() + " and is of type " + p0.getType().getName());

Added: incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html?view=auto&rev=555013
==============================================================================
--- incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html (added)
+++ incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html Tue Jul 10 10:14:04 2007
@@ -0,0 +1,30 @@
+<html>
+<!--
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ * -->
+<head>
+    <title>Intermediate SDO Samples</title>
+</head>
+<BODY>
+<h1>Intermediate Service Data Object (SDO) Sample Programs</h1>
+<h3>Running the Samples</h3> See <A HREF="../../../../../../index.html" 
+target="_top">the main overview</A> for instructions on how to run these 
+samples.
+</BODY>
+</HTML>

Modified: incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html?view=diff&rev=555013&r1=555012&r2=555013
==============================================================================
--- incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html (original)
+++ incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html Tue Jul 10 10:14:04 2007
@@ -19,56 +19,97 @@
  *  under the License.
  * -->
 <head>
-	<title>SDO Sample Overview</title>
+    <title>SDO Sample Overview</title>
 </head>
 <BODY>
-<h1>Tuscany Service Data Object (SDO) Sample Programs</h1>  
-<h2>Overview</h2>
-This sample code is from the <a href="http://incubator.apache.org/tuscany"
- target="_blank"> Apache Tuscany</a> project. The samples were written to help users
-understand and experiment with SDO.  You can get a feel for the topics that are
-covered by each sample by looking at the <a href="sampleProgramContents.html">
-documentation</a> that is produced by the DocumentSamples utility.
-<H2>Experimentation</H2>
-The SDO samples are written to be used in conjunction with the specification and other documents.  However, 
-the most important function that these samples provide is a place to begin experimenting with the SDO API
-and programming model.  Developers are encouraged to extend and experiment with the current set of samples.  
-If a sample is unclear, is missing documentation or a tutorial, or does not cover a desired area ,
-please send feedback to the tuscany mailing lists,
-or better still send us a patch or join the Tuscany team and contribute back to the
-<A href="http://incubator.apache.org/tuscany">project</A>.
-  
+<h1>Tuscany Service Data Object (SDO) Sample Programs</h1> <h2>Overview</h2> 
+This sample code is from the <a href="http://incubator.apache.org/tuscany" target="_blank">Apache 
+Tuscany</a> project. The samples were written to help users understand and 
+experiment with SDO.  You can get a feel for the topics that are covered by each 
+sample by looking at the <a href="sampleProgramContents.html">index by SDO 
+subject areas</a> documentation. The samples have been roughly divided into 
+three groups, basic, intermediate and advanced to help you choose the samples 
+you wish to look at as you learn the SDO API.
+<P>
+These samples provide a place to begin learning and experimenting with the SDO 
+API and programming model.  Developers are encouraged to extend and experiment 
+with the current set of samples.  If a sample is unclear, is missing 
+documentation, or does not cover a desired area, please send feedback to the 
+Tuscany mailing lists, or better still send us a patch or join the Tuscany team 
+and contribute back to the <A
+href="http://incubator.apache.org/tuscany">project</A>.
 
-<h3>Getting Ready to run the Samples</h3>
-The samples depend on the following libraries<UL>
-		<LI>The SDO API and the Tuscany SDO Implementation
-		<UL>
-			<LI>sdo-api-{version}.jar - SDO API</LI>
-			<LI>tuscany-sdo-lib-{version}.jar - Tuscany APIs and support function</LI>
-			<LI>tuscany-sdo-impl-{version}.jar - Tuscany SDO implementation</LI>
-		</UL>
-		</LI>
-		<LI>EMF dependencies.
-		<UL>
-			<LI>common-{version}.jar - some common framework utility and base
-			classes</LI>
-			<LI>ecore-{version}.jar - the EMF core runtime implementation
-			classes (the Ecore metamodel)</LI>
-			<LI>ecore-change-{version}.jar - the EMF change recorder and
-			framework</LI>
-			<LI>ecore-xmi-{version}.jar - EMF's default XML (and XMI)
-			serializer and loader</LI>
-			<LI>xsd-{version}.jar - the XML Schema model</LI></UL></LI></UL>
-<P>If you are running these samples from a Tuscany samples distribution you can resolve these dependencies by ensuring that all the jar files in the lib directory of the extracted distribution are on your classpath.<BR>
-<BR>
-If you are running these samples as a result of building Tuscany SDO for Java from a Tuscany source distribution using maven then these dependencies will be resolved by having followed the build instructions.<BR>
-<BR>To run these samples against the current Tuscany codebase, follow the instructions at <A
-	href="http://cwiki.apache.org/TUSCANY/developing-sdo-java.html">Developing SDO Java</A>, which describes how to build Tuscany SDO for Java in an Eclipse SDK environment.</P>
-<H3>Running the Samples</H3>
-<P>In order to get an overview of the samples the user may wish to run
-{@link org.apache.tuscany.samples.sdo.ExecuteSamples} which will execute
-all the command line examples.<BR>
-<FONT face="Courier">java org.apache.tuscany.samples.sdo.ExecuteSamples</FONT></P><P>Alternatively, browse the JavaDoc for the sample program classes and run an
-individual example of your choice in the same way. Another suggestion is to read the
-SDO specifciaton in conjunction with the examples in {@link
-org.apache.tuscany.samples.sdo.specExampleSection}.</P></BODY></html>
+<h3>Running the Samples from a Binary Distribution of Apache Tuscany</h3> The 
+SDO samples have been written to be useful in learning SDO, even without 
+reference to the sample source code.  The samples output commentary as they 
+execute and key lines of source code are output too. One of the sample programs 
+(ExecuteSamples) executes all the other samples in sequence. The binary 
+distribution includes the sample source code too, so that you can investigate 
+further if you wish.
+<P>
+The binary distribution of Tuscany contains a pair of scripts to execute the 
+ExecuteSamples program (runsamples.bat and runsamples.sh).  To execute the 
+samples first locate the appropriate script for your environment in the samples 
+directory of the binary distribution and set the value of the BINARY_BASE 
+variable to be the directory in your file system that contains the lib and 
+samples directories. Then run the script and take a look at the output. After 
+that, copy and modify the script to suit your own purposes in running the other 
+samples.
+
+<h3>Running the Samples from a Source Distribution of Apache Tuscany</h3> The 
+samples depend on the following libraries
+<UL>
+    <LI>
+        The samples themselves, the SDO 2.1 API and the Tuscany SDO 
+        Implementation
+        <UL>
+            <LI>
+                sample-sdo-{tuscany-version}.jar - SDO API
+            </LI>
+            <LI>
+                sdo-api-r2.1-{tuscany-version}.jar - SDO API
+            </LI>
+            <LI>
+                tuscany-sdo-lib-{tuscany-version}.jar - Tuscany APIs and support 
+                function
+            </LI>
+            <LI>
+                tuscany-sdo-impl-{tuscany-version}.jar - Tuscany SDO 
+                implementation
+            </LI>
+        </UL>
+    </LI>
+    <LI>
+        EMF dependencies.
+        <UL>
+            <LI>
+                common-{version}.jar - some common framework utility and base classes
+            </LI>
+            <LI>
+                ecore-{version}.jar - the EMF core runtime implementation classes (the Ecore 
+                metamodel)
+            </LI>
+            <LI>
+                ecore-change-{version}.jar - the EMF change recorder and framework
+            </LI>
+            <LI>
+                ecore-xmi-{version}.jar - EMF's default XML (and XMI) serializer and loader
+            </LI>
+            <LI>
+                xsd-{version}.jar - the XML Schema model
+            </LI>
+        </UL>
+    </LI>
+    <LI>And the StAX API</LI>
+    <UL>
+        <LI>stax-api-1.0.1.jar</LI>
+    </UL>
+</UL>
+<P>
+If you are running these samples as a result of building Tuscany SDO for Java 
+from a Tuscany source distribution using maven then these dependencies will be 
+resolved by having followed the instructions in the BUILDING file at the root of
+the source distribution.
+</P>
+</BODY>
+</html>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org