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/18 23:29:17 UTC

svn commit: r557402 - in /incubator/tuscany/branches/sdo-1.0-incubating/sample: ./ src/main/java/org/apache/tuscany/samples/sdo/ src/main/java/org/apache/tuscany/samples/sdo/advanced/ src/main/java/org/apache/tuscany/samples/sdo/basic/ src/main/java/or...

Author: kelvingoodson
Date: Wed Jul 18 14:29:16 2007
New Revision: 557402

URL: http://svn.apache.org/viewvc?view=rev&rev=557402
Log:
hide sample infrastructure in javadoc

Added:
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java
      - copied, changed from r557276, incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/util/DocumentSamples.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java
      - copied, changed from r557276, incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleInfrastructure.java
Removed:
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleInfrastructure.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/util/
Modified:
    incubator/tuscany/branches/sdo-1.0-incubating/sample/pom.xml
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java
    incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/pom.xml?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/pom.xml (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/pom.xml Wed Jul 18 14:29:16 2007
@@ -75,6 +75,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <overview>${basedir}/src/main/java/org/apache/tuscany/samples/sdo/overview.html</overview> 
+                         <excludePackageNames>*.internal</excludePackageNames>
                     <version>2.0</version>
                 </configuration>
                 <executions>

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java Wed Jul 18 14:29:16 2007
@@ -25,6 +25,9 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
+import org.apache.tuscany.samples.sdo.SampleBase;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
+
 
 /**
  * A program to execute a sequence of SDO sample programs. The program executes
@@ -41,7 +44,7 @@
  * will be much more output than if set to one of the other values. 
  * 
  */
-public class ExecuteSamples {
+public class ExecuteSamples extends SampleBase {
 
   /**
    * Edit this value to cause the program to pause between each sample program
@@ -65,10 +68,16 @@
   
   
   public static void main(String [] args) throws SecurityException, NoSuchMethodException, IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException, IOException {
+    ExecuteSamples sample = new ExecuteSamples(COMMENTARY_FOR_NOVICE);
+    sample.run();
+  }
+  
+  public ExecuteSamples(Integer userLevel) {
+    super(userLevel, SAMPLE_LEVEL_BASIC);
+  }
 
-
-    
-    Class[] constructorArgTypes = { Integer.class };
+  public void runSample() throws Exception {
+   Class[] constructorArgTypes = { Integer.class };
 
     
     BufferedReader in = new BufferedReader(new InputStreamReader(System.in));

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java Wed Jul 18 14:29:16 2007
@@ -23,11 +23,9 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.io.StringReader;
 import java.net.URL;
-import java.util.List;
 
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 import org.apache.tuscany.sdo.api.SDOUtil;
 
 import commonj.sdo.DataObject;

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java Wed Jul 18 14:29:16 2007
@@ -20,22 +20,16 @@
 
 package org.apache.tuscany.samples.sdo.advanced;
 
-import java.io.FileInputStream;
 import java.io.InputStream;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 import org.apache.tuscany.sdo.api.SDOUtil;
 
-
+import commonj.sdo.DataGraph;
+import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;
 import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import commonj.sdo.DataObject;
-import commonj.sdo.DataGraph;
-import commonj.sdo.Sequence;
 
 /**
  * This sample program demonstrates a variety of methods available to obtain the root DataObject
@@ -55,9 +49,9 @@
  * <br>
  * To define the correct Types for each DataObject ( CompanyType, DepartmentType etc )
  * this sample relies upon
- * {@link org.apache.tuscany.samples.sdo.SampleInfrastructure#COMPANY_XSD} which is
+ * {@link org.apache.tuscany.samples.sdo.internal.SampleInfrastructure#COMPANY_XSD} which is
  * provided in the resources directory of these samples. The xml file
- * {@link org.apache.tuscany.samples.sdo.SampleInfrastructure#COMPANY_DATAGRAPH_XML} is
+ * {@link org.apache.tuscany.samples.sdo.internal.SampleInfrastructure#COMPANY_DATAGRAPH_XML} is
  * used to load the DataGraph and is also located in this resources directory. <br>
  * <P>
  * <b>Usage:</b> <br>

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java Wed Jul 18 14:29:16 2007
@@ -25,9 +25,7 @@
 import java.util.ListIterator;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
-
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.Property;

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java Wed Jul 18 14:29:16 2007
@@ -23,7 +23,7 @@
 import java.util.List;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java Wed Jul 18 14:29:16 2007
@@ -22,7 +22,6 @@
 
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.Property;

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java Wed Jul 18 14:29:16 2007
@@ -23,7 +23,7 @@
 import java.io.FileOutputStream;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 
 
 import commonj.sdo.DataObject;

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java Wed Jul 18 14:29:16 2007
@@ -24,9 +24,7 @@
 import java.io.OutputStream;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
-
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.DataFactory;
@@ -36,9 +34,9 @@
 /**
  * Demonstrates creating a purchaseOrder DataObject from an existing XSD and then
  * persisting to disk. Uses previously defined model
- * {@link org.apache.tuscany.samples.sdo.SampleInfrastructure#PO_XSD_RESOURCE} to
+ * {@link org.apache.tuscany.samples.sdo.internal.SampleInfrastructure#PO_XSD_RESOURCE} to
  * define types then generates a purchase order DataObject and persists to
- * {@link org.apache.tuscany.samples.sdo.SampleInfrastructure#PO_XML_GENERATED}. This
+ * {@link org.apache.tuscany.samples.sdo.internal.SampleInfrastructure#PO_XML_GENERATED}. This
  * sample was used to generate valid XML for Fuhwei Lwo's paper <A
  * HREF="http://www-128.ibm.com/developerworks/webservices/library/ws-sdoxmlschema/"
  * title="Me" onClick="checkLinks(this)">Create and read an XML document based on XML

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java Wed Jul 18 14:29:16 2007
@@ -23,9 +23,7 @@
 import java.util.List;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
-
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;
@@ -36,7 +34,7 @@
  * HREF="http://www-128.ibm.com/developerworks/webservices/library/ws-sdoxmlschema/"
  * title="Me" onClick="checkLinks(this)">Create and read an XML document based on XML
  * Schema</A>.  Uses file
- * {@link org.apache.tuscany.samples.sdo.SampleInfrastructure#PO_XML_GENERATED}
+ * {@link org.apache.tuscany.samples.sdo.internal.SampleInfrastructure#PO_XML_GENERATED}
  * previously generated by {@link CreatePurchaseOrder} to populate purchase order
  * DataObject
  * <p>

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java Wed Jul 18 14:29:16 2007
@@ -23,8 +23,7 @@
 import java.util.List;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;
@@ -80,9 +79,9 @@
     /**
      * Accesses and modifies properties of a purchase order DataObject using xPath(
      * properties are defined in the xsd
-     * {@link org.apache.tuscany.samples.sdo.SampleInfrastructure#PO_XSD_RESOURCE} and
+     * {@link org.apache.tuscany.samples.sdo.internal.SampleInfrastructure#PO_XSD_RESOURCE} and
      * populated by xml
-     * {@link org.apache.tuscany.samples.sdo.SampleInfrastructure#PO_XML_RESOURCE} )
+     * {@link org.apache.tuscany.samples.sdo.internal.SampleInfrastructure#PO_XML_RESOURCE} )
      * 
      * @param args.
      *            No parameters required.

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java Wed Jul 18 14:29:16 2007
@@ -23,9 +23,8 @@
 import java.util.List;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
 import org.apache.tuscany.samples.sdo.advanced.PrintDataGraph;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java Wed Jul 18 14:29:16 2007
@@ -22,7 +22,7 @@
 
 import java.io.FileOutputStream;
 
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 import org.apache.tuscany.sdo.api.SDOUtil;
 
 import commonj.sdo.DataGraph;

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java Wed Jul 18 14:29:16 2007
@@ -22,13 +22,11 @@
 import java.util.List;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.Property;
 import commonj.sdo.Sequence;
 import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLHelper;
 
 /**
  * Demonstrates creating a DataObject from a String of XML without an explicit model.

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java Wed Jul 18 14:29:16 2007
@@ -20,16 +20,15 @@
 
 package org.apache.tuscany.samples.sdo.intermediate;
 
+import java.util.List;
+
+import org.apache.tuscany.samples.sdo.SampleBase;
+
 import commonj.sdo.DataObject;
 import commonj.sdo.Type;
 import commonj.sdo.helper.DataFactory;
 import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLHelper;
 import commonj.sdo.helper.TypeHelper;
-import java.util.List;
-
-import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
 
 /**
  * Demonstrates creating and using Types dynamically. This sample is from the <a

Modified: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java?view=diff&rev=557402&r1=557401&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java Wed Jul 18 14:29:16 2007
@@ -22,13 +22,11 @@
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
 import org.apache.tuscany.samples.sdo.SampleBase;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.helper.HelperContext;

Copied: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java (from r557276, incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/util/DocumentSamples.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java?view=diff&rev=557402&p1=incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/util/DocumentSamples.java&r1=557276&p2=incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/util/DocumentSamples.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java Wed Jul 18 14:29:16 2007
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.tuscany.samples.sdo.util;
+package org.apache.tuscany.samples.sdo.internal;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -28,8 +28,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.tuscany.samples.sdo.SampleInfrastructure;
-import org.apache.tuscany.samples.sdo.SampleInfrastructure.SDOFacets;
+import org.apache.tuscany.samples.sdo.internal.SampleInfrastructure.SDOFacets;
+
 
 /**
  * Class to generate html documentation for the SDO Samples.

Copied: incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java (from r557276, incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleInfrastructure.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java?view=diff&rev=557402&p1=incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleInfrastructure.java&r1=557276&p2=incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java&r2=557402
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleInfrastructure.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java Wed Jul 18 14:29:16 2007
@@ -18,7 +18,7 @@
  *  under the License.
  */
 
-package org.apache.tuscany.samples.sdo;
+package org.apache.tuscany.samples.sdo.internal;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;



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