You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2006/11/20 16:00:06 UTC
svn commit: r477212 - in /incubator/tuscany/java/spec/sdo-api/src/main:
java/commonj/sdo/ java/commonj/sdo/helper/ java/commonj/sdo/impl/
resources/xml/
Author: frankb
Date: Mon Nov 20 07:00:04 2006
New Revision: 477212
URL: http://svn.apache.org/viewvc?view=rev&rev=477212
Log:
TUSCANY-929: Move to SDO 2.1 spec APIs
Added:
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java
Modified:
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataGraph.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataObject.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Property.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Sequence.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Type.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/datagraph.xsd
incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xml
incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xsd
incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xml
incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xsd
incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xml
incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xsd
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataGraph.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataGraph.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataGraph.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataGraph.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataObject.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataObject.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/DataObject.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -205,10 +208,13 @@
List getList(String path);
/**
+ * @see #getSequence()
* Returns the value of a <code>Sequence</code> property identified by the specified path.
+ * An implementation may throw an UnsupportedOperationException.
* @param path the path to a valid object and property.
* @return the <code>Sequence</code> value of the specified property.
* @see #get(String)
+ * @deprecated in 2.1.0.
*/
Sequence getSequence(String path);
@@ -488,10 +494,13 @@
List getList(int propertyIndex);
/**
+ * @see #getSequence()
* Returns the value of a <code>Sequence</code> property identified by the specified property index.
+ * An implementation may throw an UnsupportedOperationException.
* @param propertyIndex the index of the property.
* @return the <code>Sequence</code> value of the specified property.
* @see #get(int)
+ * @deprecated in 2.1.0.
*/
Sequence getSequence(int propertyIndex);
@@ -654,13 +663,12 @@
* Returns whether the property of the object is considered to be set.
* <p>
* isSet() for many-valued Properties returns true if the List is not empty and
- * false if the List is empty. For single-valued Properties:
- * <ul><li>If the Property has not been set() or has been unset() then isSet() returns false.</li>
- * <li>If the current value is not the Property's default or null, isSet() returns true.</li>
- * <li>For the remaining cases the implementation may decide between two policies: </li>
- * <ol><li>any call to set() without a call to unset() will cause isSet() to return true, or </li>
- * <li>the current value is compared to the default value and isSet() returns true when they differ.</li>
- * </ol></ul><p>
+ * false if the List is empty. For single-valued Properties it returns true if the Property
+ * has been set() and not unset(), and false otherwise.
+ * Any call to set() without a call to unset() will cause isSet() to return true, regardless of
+ * the value being set. For example, after calling set(property, property.getDefault()) on a
+ * previously unset property, isSet(property) will return true, even though the value of
+ * get(property) will be unchanged.
* @param property the property in question.
* @return whether the property of the object is set.
* @see #set(Property, Object)
@@ -810,10 +818,13 @@
List getList(Property property);
/**
+ * @see #getSequence()
* Returns the value of the specified <code>Sequence</code> property.
+ * An implementation may throw an UnsupportedOperationException.
* @param property the property to get.
* @return the <code>Sequence</code> value of the specified property.
* @see #get(Property)
+ * @deprecated in 2.1.0.
*/
Sequence getSequence(Property property);
@@ -1078,6 +1089,11 @@
* or null if not found. The instance properties are getInstanceProperties().
* @param propertyName the name of the Property
* @return the named Property from the DataObject's current instance properties, or null.
+ */
+ Property getInstanceProperty(String propertyName);
+
+ /**
+ * @deprecated replaced by {@link #getInstanceProperty(String)} in 2.1.0
*/
Property getProperty(String propertyName);
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Property.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Property.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Property.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Property.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -72,8 +75,41 @@
Property getOpposite();
/**
- * Return a list of alias names for this Property.
+ * Returns a list of alias names for this Property.
* @return a list of alias names for this Property.
*/
List /*String*/ getAliasNames();
+
+ /**
+ * Returns whether or not instances of this property can be set to null. The effect of calling set(null) on a non-nullable
+ * property is not specified by SDO.
+ * @return true if this property is nullable.
+ */
+ boolean isNullable();
+
+ /**
+ * Returns whether or not this is an open content Property.
+ * @return true if this property is an open content Property.
+ */
+ boolean isOpenContent();
+
+ /**
+ * Returns a read-only List of instance Properties available on this Property.
+ * <p>
+ * This list includes, at a minimum, any open content properties (extensions) added to
+ * the object before {@link commonj.sdo.helper.TypeHelper#define(DataObject) defining
+ * the Property's Type}. Implementations may, but are not required to in the 2.1 version
+ * of SDO, provide additional instance properties.
+ * @return the List of instance Properties on this Property.
+ */
+ List /*Property*/ getInstanceProperties();
+
+ /**
+ * Returns the value of the specified instance property of this Property.
+ * @param property one of the properties returned by {@link #getInstanceProperties()}.
+ * @return the value of the specified property.
+ * @see DataObject#get(Property)
+ */
+ Object get(Property property);
+
}
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Sequence.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Sequence.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Sequence.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Sequence.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -112,20 +115,26 @@
void move(int toIndex, int fromIndex);
/**
- * Adds a new entry with the SDO text Property
- * to the end of the Sequence.
- * Same as add(property, text) where property is the SDO text Property.
- * @param text value of the entry.
+ * @deprecated replaced by {@link #addText(String)} in 2.1.0
*/
void add(String text);
/**
- * Adds a new entry with the SDO text Property
- * at the given index.
- * Same as add(index, property, text) where property is the SDO text Property.
+ * @deprecated replaced by {@link #addText(int, String)} in 2.1.0
+ */
+ void add(int index, String text);
+
+ /**
+ * Adds a new text entry to the end of the Sequence.
+ * @param text value of the entry.
+ */
+ void addText(String text);
+
+ /**
+ * Adds a new text entry at the given index.
* @param index the index at which to add the entry.
* @param text value of the entry.
*/
- void add(int index, String text);
+ void addText(int index, String text);
}
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Type.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Type.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Type.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/Type.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -140,4 +143,24 @@
* @return a list of alias names for this Type.
*/
List /*String*/ getAliasNames();
+
+ /**
+ * Returns a read-only List of instance Properties available on this Type.
+ * <p>
+ * This list includes, at a minimum, any open content properties (extensions) added to
+ * the object before {@link commonj.sdo.helper.TypeHelper#define(DataObject) defining
+ * the Type's Type}. Implementations may, but are not required to in the 2.1 version
+ * of SDO, provide additional instance properties.
+ * @return the List of instance Properties on this Type.
+ */
+ List /*Property*/ getInstanceProperties();
+
+ /**
+ * Returns the value of the specified instance property of this Type.
+ * @param property one of the properties returned by {@link #getInstanceProperties()}.
+ * @return the value of the specified property.
+ * @see DataObject#get(Property)
+ */
+ Object get(Property property);
+
}
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -17,6 +20,9 @@
import java.util.Date;
import java.util.Locale;
+import commonj.sdo.Type;
+import commonj.sdo.Property;
+
import commonj.sdo.impl.HelperProvider;
/**
@@ -178,7 +184,32 @@
String toYearMonthDay(Calendar calendar);
/**
- * The default TypeHelper.
+ * Convert the specified value to an {@link Type#getInstanceClass() instance}
+ * of the specified type.
+ * Supported conversions are listed in Section 16 of the SDO specification.
+ * @param type the target {@link Type#isDataType() data type}.
+ * @param value the value to convert
+ * @return a value of the specified type's instance class
+ * @throws IllegalArgumentException if the value could not be converted
+ * @see #convert(Property, Object)
+ */
+ Object convert(Type type, Object value);
+
+ /**
+ * Convert the specified value to an {@link Type#getInstanceClass() instance}
+ * of the specified property's {@link Property#getType() type}.
+ * The specified value must be a List if the property is {@link Property#isMany()
+ * many valued}. In this case, all the values in the List are converted.
+ * @param property the target {@link Type#isDataType() data type} property.
+ * @param value the value or List of values to convert
+ * @return a converted value or list of converted values
+ * @throws IllegalArgumentException if the value could not be converted
+ * @see #convert(Type, Object)
+ */
+ Object convert(Property property, Object value);
+
+ /**
+ * The default DataHelper.
*/
DataHelper INSTANCE = HelperProvider.getDataHelper();
}
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
Added: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java?view=auto&rev=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java (added)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java Mon Nov 20 07:00:04 2006
@@ -0,0 +1,67 @@
+/**
+ * <copyright>
+ *
+ * Service Data Objects
+ * Version 2.1.0
+ * Licensed Materials
+ *
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
+ *
+ * </copyright>
+ *
+ */
+
+package commonj.sdo.helper;
+
+/**
+ * This interface represents a helper execution context.
+ * The set of helpers returned by the methods in this interface have visibility
+ * to the same SDO metadata, that is, they execute in the same "scope".
+ */
+public interface HelperContext
+{
+ /**
+ * Gets the CopyHelper to use in this context.
+ * @return a CopyHelper object
+ */
+ CopyHelper getCopyHelper();
+
+ /**
+ * Gets the DataFactory to use in this context.
+ * @return a DataFactory object
+ */
+ DataFactory getDataFactory();
+
+ /**
+ * Gets the DataHelper to use in this context.
+ * @return a DataHelper object
+ */
+ DataHelper getDataHelper();
+
+ /**
+ * Gets the EqualityHelper to use in this context.
+ * @return an EqualityHelper object
+ */
+ EqualityHelper getEqualityHelper();
+
+ /**
+ * Gets the TypeHelper to use in this context.
+ * @return a TypeHelper object
+ */
+ TypeHelper getTypeHelper();
+
+ /**
+ * Gets the XMLHelper to use in this context.
+ * @return an XMLHelper object
+ */
+ XMLHelper getXMLHelper();
+
+ /**
+ * Gets the XSDHelper to use in this context.
+ * @return an XSDHelper object
+ */
+ XSDHelper getXSDHelper();
+}
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -47,6 +50,15 @@
Type getType(Class interfaceClass);
/**
+ * Get the open content (global) 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.
+ */
+ Property getOpenContentProperty(String uri, String propertyName);
+
+ /**
* Define the DataObject as a Type.
* The Type is available through TypeHelper and DataGraph getType() methods.
* @param type the DataObject representing the Type.
@@ -75,18 +87,9 @@
* @return the defined open content Property.
* @throws IllegalArgumentException if the Property could not be defined.
*/
- public Property defineOpenContentProperty(String uri, DataObject property);
-
+ 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.
- */
- public Property getOpenContentProperty(String uri, String propertyName);
-
- /**
* The default TypeHelper.
*/
TypeHelper INSTANCE = HelperProvider.getTypeHelper();
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -18,6 +21,8 @@
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
+import javax.xml.transform.Source;
+import javax.xml.transform.Result;
import commonj.sdo.DataObject;
import commonj.sdo.impl.HelperProvider;
@@ -85,6 +90,20 @@
XMLDocument load(Reader inputReader, String locationURI, Object options) throws IOException;
/**
+ * Creates and returns an XMLDocument from the inputSource.
+ * The InputSource will be closed after reading.
+ * By default does not perform XSD validation.
+ * @param inputSource specifies the Source to read from
+ * @param locationURI specifies the URI of the document for relative schema locations
+ * @param options implementation-specific options.
+ * @return the new XMLDocument loaded
+ * @throws IOException for stream exceptions.
+ * @throws RuntimeException for errors in XML parsing or
+ * implementation-specific validation.
+ */
+ XMLDocument load(Source inputSource, String locationURI, Object options) throws IOException;
+
+ /**
* Returns the DataObject saved as an XML document with the specified root element.
* Same as
* StringWriter stringWriter = new StringWriter();
@@ -151,6 +170,21 @@
*/
void save(XMLDocument xmlDocument, Writer outputWriter, Object options) throws IOException;
+ /**
+ * Serializes an XMLDocument as an XML document into the outputResult in a
+ * serialization technology independent format (as specified in
+ * javax.xml.transform).
+ * The OutputResult will be flushed after writing.
+ * Does not perform validation to ensure compliance with an XSD.
+ * @param xmlDocument specifies XMLDocument to be saved
+ * @param outputResult specifies Result to be saved
+ * @param options implementation-specific options.
+ * @throws IOException for stream exceptions.
+ * @throws IllegalArgumentException if the dataObject tree
+ * is not closed or has no container.
+ */
+ void save(XMLDocument xmlDocument, Result outputResult, Object options) throws IOException;
+
/**
* Creates an XMLDocument with the specified XML rootElement for the DataObject.
* @param dataObject specifies DataObject to be saved
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java Mon Nov 20 07:00:04 2006
@@ -2,10 +2,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
Modified: incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java Mon Nov 20 07:00:04 2006
@@ -32,6 +32,7 @@
import commonj.sdo.helper.DataFactory;
import commonj.sdo.helper.DataHelper;
import commonj.sdo.helper.EqualityHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
@@ -364,4 +365,36 @@
public static ExternalizableDelegator.Resolvable createResolvable(Object target) {
return INSTANCE.resolvable(target);
}
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ // New in SDO 2.1
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ /**
+ * Gets the default HelperContext
+ * @return a HelperContext object
+ */
+ public static HelperContext getDefaultContext()
+ {
+ return INSTANCE.helperContext();
+ }
+
+ HelperContext helperContext()
+ {
+ return defaultContext;
+ }
+
+ static HelperContext defaultContext = new DefaultHelperContext();
+
+ static class DefaultHelperContext implements HelperContext
+ {
+ public CopyHelper getCopyHelper() { return INSTANCE.copyHelper(); }
+ public DataFactory getDataFactory() { return INSTANCE.dataFactory(); }
+ public DataHelper getDataHelper() { return INSTANCE.dataHelper(); }
+ public EqualityHelper getEqualityHelper() { return INSTANCE.equalityHelper(); }
+ public TypeHelper getTypeHelper() { return INSTANCE.typeHelper(); }
+ public XMLHelper getXMLHelper() { return INSTANCE.xmlHelper(); }
+ public XSDHelper getXSDHelper() { return INSTANCE.xsdHelper(); }
+ }
+
}
Modified: incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/datagraph.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/datagraph.xsd?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/datagraph.xsd (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/datagraph.xsd Mon Nov 20 07:00:04 2006
@@ -5,10 +5,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -73,5 +76,6 @@
</xsd:complexType>
<xsd:attribute name="ref" type="xsd:string"/>
+ <xsd:attribute name="unset" type="xsd:string"/>
</xsd:schema>
Modified: incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xml?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xml (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xml Mon Nov 20 07:00:04 2006
@@ -5,10 +5,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -21,10 +24,15 @@
xsi:schemaLocation="commonj.sdo sdoModel.xsd commonj.sdo/java sdoJava.xsd commonj.sdo/xml sdoXML.xsd">
<!--
- JavaInfo declares properties used in open content for
+ Global properties used in open content for
the Java binding of SDO Types and Properties.
-->
+ <type uri="commonj.sdo/java">
+ <property name="javaClass" type="commonj.sdo#String"/>
+ </type>
+
+ <!-- JavaInfo deprecated in 2.1.0 -->
<type name="JavaInfo" uri="commonj.sdo/java">
<property name="javaClass" type="commonj.sdo#String"/>
</type>
Modified: incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xsd?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xsd (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoJava.xsd Mon Nov 20 07:00:04 2006
@@ -5,10 +5,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -35,15 +38,15 @@
<xsd:attribute name="nestedInterfaces" type="xsd:boolean" />
<!--
- JavaInfo declares properties used in open content for
+ Global properties used in open content for
the Java binding of SDO Types and Properties.
-->
-<!-- FIXME need this global attribute because as per spec Type's with JavaInfo.javaClass cannot be (de)serialized -->
<xsd:attribute name="javaClass" type="sdo:String"/>
+<!-- JavaInfo deprecated in 2.1.0 -->
<xsd:complexType name="JavaInfo">
- <xsd:attribute ref="sdoJava:javaClass"/>
+ <xsd:attribute name="javaClass" type="sdo:String"/>
</xsd:complexType>
<!--
Modified: incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xml?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xml (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xml Mon Nov 20 07:00:04 2006
@@ -5,10 +5,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -45,19 +48,21 @@
<property name="default" type="#String"/>
<property name="readOnly" type="#Boolean"/>
<property name="opposite" type="#Property"/>
+ <property name="nullable" type="#Boolean"/>
</type>
- <!-- SDO special types -->
+<!-- SDO special types -->
<type name="DataObject" abstract="true" sdoJava:instanceClass="commonj.sdo.DataObject" uri="commonj.sdo"/>
- <type name="ObjectType" abstract="true" datatype="true" sdoJava:instanceClass="java.lang.Object" uri="commonj.sdo"/>
+ <type name="Object" abstract="true" datatype="true" sdoJava:instanceClass="java.lang.Object" uri="commonj.sdo"/>
<type name="ChangeSummaryType" abstract="true" datatype="true" sdoJava:instanceClass="commonj.sdo.ChangeSummary" uri="commonj.sdo"/>
- <type name="TextType" abstract="true">
- <property name="text" type="#String" many="true"/>
- </type>
+ <!-- TextType deprecated in 2.1.0 -->
+ <type name="TextType" abstract="true">
+ <property name="text" type="#String" many="true"/>
+ </type>
- <!-- SDO data types -->
+<!-- SDO data types -->
<type name="Boolean" datatype="true" sdoJava:instanceClass="boolean" uri="commonj.sdo"/>
<type name="Byte" datatype="true" sdoJava:instanceClass="byte" uri="commonj.sdo"/>
Modified: incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xsd?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xsd (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoModel.xsd Mon Nov 20 07:00:04 2006
@@ -5,10 +5,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -61,7 +64,7 @@
<xsd:any namespace="##other" processContents="lax"
minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
- <xsd:attribute name="name" type="xsd:ID" sdo:dataType="sdo:String"/>
+ <xsd:attribute name="name" type="xsd:ID" sdoXML:dataType="sdo:String"/>
<xsd:attribute name="uri" type="sdo:URI"/>
<xsd:attribute name="dataType" type="sdo:Boolean"/>
<xsd:attribute name="open" type="sdo:Boolean"/>
@@ -82,26 +85,27 @@
<xsd:attribute name="containment" type="sdo:Boolean"/>
<xsd:attribute name="default" type="sdo:String"/>
<xsd:attribute name="readOnly" type="sdo:Boolean"/>
- <xsd:attribute name="type" type="sdo:URI" sdoXML:propertyType="sdo:Type" />
- <xsd:attribute name="opposite" type="sdo:URI" sdoXML:propertyType="sdo:Property" />
+ <xsd:attribute name="type" type="sdo:URI" sdoXML:propertyType="sdo:Type"/>
+ <xsd:attribute name="opposite" type="sdo:URI" sdoXML:propertyType="sdo:Property"/>
+ <xsd:attribute name="nullable" type="sdo:Boolean"/>
<xsd:anyAttribute namespace="##any" processContents="lax"/>
</xsd:complexType>
<!-- Special Types -->
<xsd:complexType name="DataObject" abstract="true"/>
-<xsd:complexType name="TextType" abstract="true">
- <xsd:sequence>
- <xsd:element name="text" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/>
- </xsd:sequence>
-</xsd:complexType>
+<!-- TextType deprecated in 2.1.0 -->
+ <xsd:complexType name="TextType" abstract="true">
+ <xsd:sequence>
+ <xsd:element name="text" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
<!-- ChangeSummaryType is defined in datagraph.xsd.
Although declared there as a ComplexType,
at the model level it is treated as a SimpleType
with a special XML serialization.
-->
-
<!-- Data Types -->
<xsd:simpleType name="Boolean" sdoJava:instanceClass="boolean">
Modified: incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xml?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xml (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xml Mon Nov 20 07:00:04 2006
@@ -5,10 +5,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -21,10 +24,15 @@
xsi:schemaLocation="commonj.sdo sdoModel.xsd commonj.sdo/java sdoJava.xsd commonj.sdo/xml sdoXML.xsd">
<!--
- XMLInfo declares properties used in open content for
+ Global properties used in open content for
the XML binding of SDO Types and Properties.
-->
+ <type uri="commonj.sdo/xml">
+ <property name="xmlElement" type="commonj.sdo#Boolean"/>
+ </type>
+
+ <!-- XMLInfo deprecated in 2.1.0 -->
<type name="XMLInfo" uri="commonj.sdo/xml">
<property name="xmlElement" type="commonj.sdo#Boolean"/>
</type>
Modified: incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xsd?view=diff&rev=477212&r1=477211&r2=477212
==============================================================================
--- incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xsd (original)
+++ incubator/tuscany/java/spec/sdo-api/src/main/resources/xml/sdoXML.xsd Mon Nov 20 07:00:04 2006
@@ -5,10 +5,13 @@
* <copyright>
*
* Service Data Objects
- * Version 2.0
- * Licensed Materials - Property of BEA and IBM
+ * Version 2.1.0
+ * Licensed Materials
*
- * (c) Copyright BEA Systems, Inc. and International Business Machines Corp 2005. All rights reserved.
+ * (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+ * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+ * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+ * 2005, 2006. All rights reserved.
*
* </copyright>
*
@@ -36,12 +39,16 @@
<xsd:attribute name="dataType" type="xsd:QName" />
<xsd:attribute name="aliasName" type="xsd:string" />
<xsd:attribute name="readOnly" type="xsd:boolean" />
+<xsd:attribute name="many" type="xsd:boolean" />
<!--
- XMLInfo declares properties used in open content for
+ Global properties used in open content for
the XML binding of SDO Types and Properties.
-->
+<xsd:attribute name="xmlElement" type="sdo:Boolean"/>
+
+<!-- XMLInfo deprecated in 2.1.0 -->
<xsd:complexType name="XMLInfo">
<xsd:attribute name="xmlElement" type="sdo:Boolean"/>
</xsd:complexType>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org