svn commit: r452375 - in /incubator/tuscany/branches/sdo-java-M2: sdo-api/src/main/java/commonj/sdo/helper/ sdo/impl/src/test/java/org/apache/tuscany/sdo/test/

[kelvingoodson]

Author: kelvingoodson
Date: Tue Oct  3 02:41:35 2006
New Revision: 452375

URL: http://svn.apache.org/viewvc?view=rev&rev=452375
Log:
remove SDO 2.1 methods from M2 sdo api distribution

Modified:
    
incubator/tuscany/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
    
incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
    
incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java

Modified: 
incubator/tuscany/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java?view=diff&rev=452375&r1=452374&r2=452375
==============================================================================
--- 
incubator/tuscany/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
 (original)
+++ 
incubator/tuscany/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
 Tue Oct  3 02:41:35 2006
@@ -63,34 +63,8 @@
    * @throws IllegalArgumentException if the Types could not be defined.
    */
   List /*Type*/ define(List /*DataObject*/ types);
-
-  /**
-   * Define the DataObject as a Property for setting open content.
-   * The containing Type of the open content property is not specified by SDO.
-   * If the specified uri is not null the defined property is accessible 
through
-   * TypeHelper.getOpenContentProperty(uri, propertyName).
-   * If a null uri is specified, the location and management of the open 
content property
-   * is not specified by SDO.
-   * @param uri the namespace URI of the open content Property or null.
-   * @return the defined open content Property.
-   * @throws IllegalArgumentException if the Property could not be defined.
-   * 
-   * NOTE: this is an early addition of an SDO 2.1 feature.
-   */
-  public Property defineOpenContentProperty(String uri, DataObject property);
   
   /**
-   * Get the open content Property with the specified uri and name, or null if 
-   * not found.
-   * @param uri the namespace URI of the open content Property.
-   * @param propertyName the name of the open content Property.
-   * @return the global Property.
-   * 
-   * NOTE: this is an early addition of an SDO 2.1 feature.
-   */
-  public Property getOpenContentProperty(String uri, String propertyName);
-  
-    /**
    * The default TypeHelper.
    */
   TypeHelper INSTANCE = HelperProvider.getTypeHelper();

Modified: 
incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java?view=diff&rev=452375&r1=452374&r2=452375
==============================================================================
--- 
incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
 (original)
+++ 
incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
 Tue Oct  3 02:41:35 2006
@@ -27,6 +27,7 @@
 import java.math.BigDecimal;

 import java.net.URL;

 

+import org.apache.tuscany.sdo.helper.TypeHelperImpl;

 import org.apache.tuscany.sdo.util.SDOUtil;

 

 import commonj.sdo.DataObject;

@@ -44,7 +45,7 @@
     private final String TEST_NAMESPACE = "http://www.example.com/open";;

     private final String TEST_DATA = "/openContentProperty.xml";

 

-    private TypeHelper typeHelper;

+    private TypeHelperImpl typeHelper;

     private XSDHelper xsdHelper;

     private XMLHelper xmlHelper;

     private DataFactory dataFactory;

@@ -108,7 +109,7 @@
     protected void setUp() throws Exception {

         super.setUp();

 

-        typeHelper = SDOUtil.createTypeHelper();

+        typeHelper = (TypeHelperImpl)SDOUtil.createTypeHelper();

         xsdHelper = SDOUtil.createXSDHelper(typeHelper);

         xmlHelper = SDOUtil.createXMLHelper(typeHelper);

         dataFactory = SDOUtil.createDataFactory(typeHelper);


Modified: 
incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java?view=diff&rev=452375&r1=452374&r2=452375
==============================================================================
--- 
incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
 (original)
+++ 
incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
 Tue Oct  3 02:41:35 2006
@@ -25,6 +25,7 @@
 
 import junit.framework.TestCase;
 
+import org.apache.tuscany.sdo.helper.TypeHelperImpl;
 import org.apache.tuscany.sdo.util.SDOUtil;
 
 import commonj.sdo.DataObject;
@@ -548,7 +549,7 @@
   
   public void testDefineOpenType() throws Exception 
   {
-    TypeHelper types = SDOUtil.createTypeHelper();
+    TypeHelperImpl types = (TypeHelperImpl)SDOUtil.createTypeHelper();
     DataFactory factory = SDOUtil.createDataFactory(types);
     XMLHelper xmlHelper = SDOUtil.createXMLHelper(types);
     



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