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/06/13 16:11:30 UTC
svn commit: r546884 [1/3] - in /incubator/tuscany/java/sdo: impl/model/
impl/src/main/java/org/apache/tuscany/sdo/
impl/src/main/java/org/apache/tuscany/sdo/helper/
impl/src/main/java/org/apache/tuscany/sdo/impl/
impl/src/main/java/org/apache/tuscany/s...
Author: kelvingoodson
Date: Wed Jun 13 07:11:26 2007
New Revision: 546884
URL: http://svn.apache.org/viewvc?view=rev&rev=546884
Log:
fix for TUSCANY-513
Added:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerType.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomersType.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/InfoType.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/impl/
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/impl/CustomerFactoryImpl.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/impl/CustomerTypeImpl.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/impl/CustomersTypeImpl.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/impl/InfoTypeImpl.java (with props)
incubator/tuscany/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java (with props)
incubator/tuscany/java/sdo/tools/src/test/resources/extensible/
incubator/tuscany/java/sdo/tools/src/test/resources/extensible/customer.xsd (with props)
incubator/tuscany/java/sdo/tools/src/test/resources/extensible/customers.xml (with props)
incubator/tuscany/java/sdo/tools/src/test/resources/extensible/infostreet.xml (with props)
incubator/tuscany/java/sdo/tools/src/test/resources/extensible/infostreet.xsd (with props)
incubator/tuscany/java/sdo/tools/src/test/resources/extensible/infozipcode.xml (with props)
incubator/tuscany/java/sdo/tools/src/test/resources/extensible/infozipcode.xsd (with props)
incubator/tuscany/java/sdo/tools/src/test/resources/extensible/nonamespace.xsd (with props)
Modified:
incubator/tuscany/java/sdo/impl/model/SDO.ecore
incubator/tuscany/java/sdo/impl/model/SDO.genmodel
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java
incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java
incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java
incubator/tuscany/java/sdo/tools/pom.xml
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/AccountImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/CustomerImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/noInterfaces/simple/Quote.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/open/impl/OneElementAndAnyAttrImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/open/impl/OpenFactoryImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/simple/cs/impl/CSFactoryImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/simple/cs/impl/QuoteBaseImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/simple/cs/impl/QuoteImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/subgroup/SubgroupFactory.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/subgroup/impl/AImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/subgroup/impl/BImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/subgroup/impl/BprimeImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/com/example/subgroup/impl/SubgroupFactoryImpl.java
incubator/tuscany/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet
Modified: incubator/tuscany/java/sdo/impl/model/SDO.ecore
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/model/SDO.ecore?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/model/SDO.ecore (original)
+++ incubator/tuscany/java/sdo/impl/model/SDO.ecore Wed Jun 13 07:11:26 2007
@@ -977,4 +977,6 @@
eSuperTypes="#//DataObject"/>
<eClassifiers xsi:type="ecore:EClass" name="DynamicStoreDataObject" instanceClassName="commonj.sdo.DataObject"
eSuperTypes="#//StoreDataObject"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ExtensibleDataObject" instanceClassName="commonj.sdo.DataObject"
+ eSuperTypes="#//DataObject"/>
</ecore:EPackage>
Modified: incubator/tuscany/java/sdo/impl/model/SDO.genmodel
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/model/SDO.genmodel?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/model/SDO.genmodel (original)
+++ incubator/tuscany/java/sdo/impl/model/SDO.genmodel Wed Jun 13 07:11:26 2007
@@ -578,5 +578,6 @@
<genClasses ecoreClass="SDO.ecore#//DynamicDataObject"/>
<genClasses ecoreClass="SDO.ecore#//StoreDataObject"/>
<genClasses ecoreClass="SDO.ecore#//DynamicStoreDataObject"/>
+ <genClasses ecoreClass="SDO.ecore#//ExtensibleDataObject"/>
</genPackages>
</genmodel:GenModel>
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java Wed Jun 13 07:11:26 2007
@@ -163,6 +163,15 @@
DataObject createDynamicStoreDataObject();
/**
+ * Returns a new object of class '<em>Extensible Data Object</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Extensible Data Object</em>'.
+ * @generated
+ */
+ DataObject createExtensibleDataObject();
+
+ /**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java Wed Jun 13 07:11:26 2007
@@ -1320,6 +1320,25 @@
int DYNAMIC_STORE_DATA_OBJECT_FEATURE_COUNT = STORE_DATA_OBJECT_FEATURE_COUNT + 0;
/**
+ * The meta object id for the '{@link org.apache.tuscany.sdo.impl.ExtensibleDataObjectImpl <em>Extensible Data Object</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.apache.tuscany.sdo.impl.ExtensibleDataObjectImpl
+ * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getExtensibleDataObject()
+ * @generated
+ */
+ int EXTENSIBLE_DATA_OBJECT = 17;
+
+ /**
+ * The number of structural features of the '<em>Extensible Data Object</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int EXTENSIBLE_DATA_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 0;
+
+ /**
* The meta object id for the '<em>EJava List</em>' data type.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1327,7 +1346,7 @@
* @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getEJavaList()
* @generated
*/
- int EJAVA_LIST = 17;
+ int EJAVA_LIST = 18;
/**
* The meta object id for the '<em>EObject Stream Exception</em>' data type.
@@ -1337,7 +1356,7 @@
* @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getEObjectStreamException()
* @generated
*/
- int EOBJECT_STREAM_EXCEPTION = 18;
+ int EOBJECT_STREAM_EXCEPTION = 19;
/**
@@ -1592,6 +1611,17 @@
* @generated
*/
EClass getDynamicStoreDataObject();
+
+ /**
+ * Returns the meta object for class '{@link commonj.sdo.DataObject <em>Extensible Data Object</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Extensible Data Object</em>'.
+ * @see commonj.sdo.DataObject
+ * @model instanceClass="commonj.sdo.DataObject"
+ * @generated
+ */
+ EClass getExtensibleDataObject();
/**
* Returns the meta object for data type '{@link java.util.List <em>EJava List</em>}'.
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java Wed Jun 13 07:11:26 2007
@@ -24,6 +24,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
import javax.xml.XMLConstants;
@@ -33,6 +34,10 @@
import org.apache.tuscany.sdo.impl.SDOFactoryImpl.SDOEcoreFactory;
import org.apache.tuscany.sdo.model.ModelFactory;
import org.apache.tuscany.sdo.api.SDOUtil;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
@@ -42,6 +47,8 @@
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.ExtendedMetaData;
import org.eclipse.emf.ecore.util.EcoreUtil.UsageCrossReferencer;
@@ -56,6 +63,10 @@
import org.eclipse.xsd.XSDSimpleTypeDefinition;
import org.eclipse.xsd.XSDTerm;
import org.eclipse.xsd.XSDTypeDefinition;
+import org.eclipse.xsd.ecore.EcoreXMLSchemaBuilder;
+import org.eclipse.xsd.util.XSDResourceFactoryImpl;
+import org.eclipse.xsd.util.XSDResourceImpl;
+import org.eclipse.xsd.util.XSDSchemaLocator;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -153,7 +164,28 @@
}
return (EDataType)eClassifier;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.xsd.ecore.XSDEcoreBuilder#createResourceSet()
+ */
+ protected ResourceSet createResourceSet() {
+ ResourceSet result = super.createResourceSet();
+ result.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new XSDResourceFactoryImpl());
+ result.getAdapterFactories().add(new XSDSchemaAdapterFactoryImpl());
+
+ EList resources = result.getResources();
+ for (Iterator iter = targetNamespaceToEPackageMap.entrySet().iterator(); iter.hasNext();) {
+ Map.Entry mapEntry = (Map.Entry)iter.next();
+ EPackage ePackage = (EPackage)mapEntry.getValue();
+ Resource resource = ePackage.eResource();
+ if (resource != null) {
+ resources.add(resource);
+ }
+ }
+ return result;
+ }
+
protected EClassifier getBuiltInEClassifier(String namespace, String name)
{
EClassifier eClassifier = null;
@@ -682,6 +714,114 @@
}
return qualifiedPackageName.toString().toLowerCase(); //make sure it's lower case .. we can't work with Axis if not.
+ }
+
+ private XSDSchema loadEPackage(EPackage ePackage)
+ {
+ XSDSchema ePackageXSDSchema = null;
+ XSDEcoreXMLSchemaBuilder xmlSchemaBuilder = new XSDEcoreXMLSchemaBuilder();
+ Collection xmlSchemas = xmlSchemaBuilder.generate(ePackage);
+ xsdComponentToEModelElementMap.putAll(xmlSchemaBuilder.getXSDComponentToEModelElementMap());
+ for (Iterator iter = xmlSchemas.iterator(); iter.hasNext();) {
+ Object xmlSchema = (Object)iter.next();
+ if (xmlSchema instanceof XSDSchema)
+ {
+ EPackage xmlSchemaEPackage = (EPackage) xsdComponentToEModelElementMap.get(xmlSchema);
+ addEPackageToXSDSchemaMapEntry(xmlSchemaEPackage, (XSDSchema) xmlSchema);
+ if (xmlSchemaEPackage.equals(ePackage))
+ {
+ ePackageXSDSchema = (XSDSchema) xmlSchema;
+ }
+ }
+ }
+ Map ePackageToXSDSchemaMap = xmlSchemaBuilder.getEPackageToXSDSchemaMap();
+ for (Iterator iter = ePackageToXSDSchemaMap.entrySet().iterator(); iter.hasNext();) {
+ Map.Entry mapEntry = (Map.Entry)iter.next();
+ EPackage xmlSchemaEPackage = (EPackage) mapEntry.getKey();
+ XSDSchema xmlSchema = (XSDSchema) mapEntry.getValue();
+ addEPackageToXSDSchemaMapEntry(xmlSchemaEPackage, xmlSchema);
+ }
+ return ePackageXSDSchema;
+ }
+
+ private void addEPackageToXSDSchemaMapEntry(EPackage ePackage, XSDSchema xsdSchema)
+ {
+ targetNamespaceToEPackageMap.put(ePackage.getNsURI(), ePackage);
+ populateTypeToTypeObjectMap(ePackage);
+ xsdSchemas.add(xsdSchema);
+ }
+
+ private static class XSDEcoreXMLSchemaBuilder extends EcoreXMLSchemaBuilder
+ {
+ public XSDEcoreXMLSchemaBuilder()
+ {
+ super();
+ }
+
+ public Map getXSDComponentToEModelElementMap()
+ {
+ return xsdComponentToEModelElementMap;
+ }
+
+ public Map getEPackageToXSDSchemaMap()
+ {
+ return ePackageToXSDSchemaMap;
+ }
+
+ protected void additionalProcessing(EClass cls, XSDComplexTypeDefinition xsdCTDComplexTypeDefinition)
+ {
+ // remove element definition
+ for(Iterator iter = xsdComponentToEModelElementMap.entrySet().iterator(); iter.hasNext();)
+ {
+ Map.Entry mapEntry = (Map.Entry)iter.next();
+ if (mapEntry.getValue().equals(cls) &&
+ mapEntry.getKey() instanceof XSDElementDeclaration)
+ {
+ xsdComponentToEModelElementMap.remove(mapEntry.getKey());
+ break;
+ }
+ }
+ }
+ }
+
+ class XSDSchemaAdapterFactoryImpl extends AdapterFactoryImpl
+ {
+ protected SchemaLocator schemaLocator = new SchemaLocator();
+
+ public boolean isFactoryForType(Object type)
+ {
+ return type == XSDSchemaLocator.class;
+ }
+
+ public Adapter adaptNew(Notifier target, Object type)
+ {
+ return schemaLocator;
+ }
+
+ class SchemaLocator extends XSDResourceImpl.SchemaLocator
+ {
+ public XSDSchema locateSchema(XSDSchema xsdSchema, String namespaceURI,
+ String rawSchemaLocationURI, String resolvedSchemaLocation)
+ {
+ if (targetNamespaceToEPackageMap.containsKey(namespaceURI))
+ {
+ for (Iterator iter = xsdSchemas.iterator(); iter.hasNext();) {
+ XSDSchema schema = (XSDSchema)iter.next();
+ if (schema.getTargetNamespace().equals(namespaceURI))
+ {
+ return schema;
+ }
+ }
+ }
+ EPackage ePackage = extendedMetaData.getPackage(namespaceURI);
+ if (ePackage != null)
+ {
+ XSDSchema schema = loadEPackage(ePackage);
+ return schema;
+ }
+ return super.locateSchema(xsdSchema, namespaceURI, rawSchemaLocationURI, resolvedSchemaLocation);
+ }
+ }
}
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java Wed Jun 13 07:11:26 2007
@@ -74,7 +74,7 @@
{
protected boolean extensibleNamespaces = false;
protected ExtendedMetaData extendedMetaData;
- protected XSDEcoreBuilder nondelegatingEcoreBuilder = null;
+ protected SDOXSDEcoreBuilder nondelegatingEcoreBuilder = null;
protected HashMap tcclToEcoreBuilderMap = null;
public XSDHelperImpl(ExtendedMetaData extendedMetaData, String redefineBuiltIn, boolean extensibleNamespaces)
@@ -82,7 +82,7 @@
this.extendedMetaData = extendedMetaData;
this.extensibleNamespaces = extensibleNamespaces;
- XSDEcoreBuilder ecoreBuilder = createEcoreBuilder();
+ SDOXSDEcoreBuilder ecoreBuilder = createEcoreBuilder();
if (extendedMetaData instanceof SDOExtendedMetaDataImpl &&
((SDOExtendedMetaDataImpl)extendedMetaData).getRegistry() instanceof EPackageRegistryImpl.Delegator) {
@@ -108,8 +108,8 @@
this(((TypeHelperImpl)typeHelper).extendedMetaData, null, extensibleNamespaces);
}
- protected XSDEcoreBuilder createEcoreBuilder() {
- XSDEcoreBuilder ecoreBuilder = new SDOXSDEcoreBuilder(extendedMetaData, extensibleNamespaces);
+ protected SDOXSDEcoreBuilder createEcoreBuilder() {
+ SDOXSDEcoreBuilder ecoreBuilder = new SDOXSDEcoreBuilder(extendedMetaData, extensibleNamespaces);
// Add the built-in models to the targetNamespaceToEPackageMap so they can't be (re)defined/overridden
for (Iterator iter = TypeHelperImpl.getBuiltInModels().iterator(); iter.hasNext(); ) {
@@ -127,14 +127,14 @@
}
}
- protected XSDEcoreBuilder getEcoreBuilder() {
+ protected SDOXSDEcoreBuilder getEcoreBuilder() {
if (nondelegatingEcoreBuilder != null)
return nondelegatingEcoreBuilder;
- XSDEcoreBuilder result = null;
+ SDOXSDEcoreBuilder result = null;
try {
for (ClassLoader tccl = Thread.currentThread().getContextClassLoader(); tccl != null; tccl = tccl.getParent()) {
- result = (XSDEcoreBuilder)tcclToEcoreBuilderMap.get(tccl);
+ result = (SDOXSDEcoreBuilder)tcclToEcoreBuilderMap.get(tccl);
if (result != null)
return result;
} // for
@@ -241,21 +241,24 @@
{
try
{
- ResourceSet resourceSet = DataObjectUtil.createResourceSet();
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new XSDResourceFactoryImpl());
+ SDOXSDEcoreBuilder ecoreBuilder = getEcoreBuilder();
+ ResourceSet resourceSet = ecoreBuilder.createResourceSet();
Resource model = resourceSet.createResource(URI.createURI(schemaLocation != null ? schemaLocation : "null.xsd"));
((XSDResourceImpl)model).load(inputSource, null);
- XSDEcoreBuilder ecoreBuilder = getEcoreBuilder();
List newTypes = new ArrayList();
for (Iterator schemaIter = model.getContents().iterator(); schemaIter.hasNext(); )
{
XSDSchema schema = (XSDSchema)schemaIter.next();
- EPackage ePackage = extendedMetaData.getPackage(schema.getTargetNamespace());
+ String targetNamespace = schema.getTargetNamespace();
+ EPackage ePackage = extendedMetaData.getPackage(targetNamespace);
if (extensibleNamespaces || ePackage == null || TypeHelperImpl.getBuiltInModels().contains(ePackage))
{
- Collection originalEPackages = new HashSet(ecoreBuilder.getTargetNamespaceToEPackageMap().values());
+ Map targetNamespaceToEPackageMap = ecoreBuilder.getTargetNamespaceToEPackageMap();
+ targetNamespaceToEPackageMap.remove(targetNamespace);
+
+ Collection originalEPackages = new HashSet(targetNamespaceToEPackageMap.values());
ecoreBuilder.generate(schema);
Collection newEPackages = ecoreBuilder.getTargetNamespaceToEPackageMap().values();
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java Wed Jun 13 07:11:26 2007
@@ -50,7 +50,7 @@
/**
* Base implementation of the SDO DataObject interface. Used as base class for generated (static) SDO classes
*/
-public abstract class DataObjectBase extends DataObjectImpl
+public abstract class DataObjectBase extends ExtensibleDataObjectImpl
{
protected int OPPOSITE_FEATURE_BASE = EOPPOSITE_FEATURE_BASE;
@@ -355,10 +355,10 @@
public EClass eStaticClass()
{
- return (EClass)getType();
+ return (EClass)getStaticType();
}
- public Type getType() // must be overridem in subclasses
+ public Type getStaticType() // must be overridem in subclasses
{
throw new UnsupportedOperationException();
}
@@ -370,27 +370,52 @@
public Object eGet(int featureID, boolean resolve, boolean coreType)
{
- Object result = get(internalConvertIndex(featureID), resolve);
- if (coreType)
+ Object result = null;
+ if (isDynamic())
{
- if (result instanceof FeatureMap.Internal.Wrapper) result = ((FeatureMap.Internal.Wrapper)result).featureMap();
+ result = super.eGet(internalConvertIndex(featureID), resolve, coreType);
+ } else
+ {
+ result = get(internalConvertIndex(featureID), resolve);
+ if (coreType)
+ {
+ if (result instanceof FeatureMap.Internal.Wrapper) result = ((FeatureMap.Internal.Wrapper)result).featureMap();
+ }
}
return result;
}
public void eSet(int featureID, Object newValue)
{
- set(internalConvertIndex(featureID), newValue);
+ if (isDynamic())
+ {
+ super.eSet(internalConvertIndex(featureID), newValue);
+ } else
+ {
+ set(internalConvertIndex(featureID), newValue);
+ }
}
public void eUnset(int featureID)
{
- unset(internalConvertIndex(featureID));
+ if (isDynamic())
+ {
+ super.eUnset(internalConvertIndex(featureID));
+ } else
+ {
+ unset(internalConvertIndex(featureID));
+ }
}
public boolean eIsSet(int featureID)
{
- return isSet(internalConvertIndex(featureID));
+ if (isDynamic())
+ {
+ return super.eIsSet(internalConvertIndex(featureID));
+ } else
+ {
+ return isSet(internalConvertIndex(featureID));
+ }
}
private class ChangeContextImpl implements ChangeContext
@@ -422,4 +447,5 @@
}
} //DataObjectBase
+
Added: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java?view=auto&rev=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java (added)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java Wed Jun 13 07:11:26 2007
@@ -0,0 +1,208 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.tuscany.sdo.impl;
+
+import org.apache.tuscany.sdo.SDOFactory;
+import org.apache.tuscany.sdo.SDOPackage;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extensible Data Object</b></em>'.
+ * @extends EStructuralFeature.Internal.DynamicValueHolder
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class ExtensibleDataObjectImpl extends DataObjectImpl implements DataObject, EStructuralFeature.Internal.DynamicValueHolder
+{
+ protected EClass eClass;
+ protected Object [] eSettings;
+
+ protected static final Object [] ENO_SETTINGS = new Object [0];
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ExtensibleDataObjectImpl()
+ {
+ super();
+ }
+
+ /**
+ * Creates an extensible DataObject.
+ */
+ public ExtensibleDataObjectImpl(EClass eClass)
+ {
+ super();
+ eSetClass(eClass);
+ Property csp = ((ClassImpl)eClass).getChangeSummaryProperty();
+ if (csp != null)
+ {
+ ChangeSummaryImpl changeSummary = (ChangeSummaryImpl)SDOFactory.eINSTANCE.createChangeSummary();
+ set(csp, changeSummary);
+ changeSummary.setDataObject(this);
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EClass eStaticClass()
+ {
+ return SDOPackage.eINSTANCE.getExtensibleDataObject();
+ }
+
+ public int eDerivedStructuralFeatureID(EStructuralFeature eStructuralFeature)
+ {
+ return eClass().getFeatureID(eStructuralFeature);
+ }
+
+ protected boolean eHasSettings()
+ {
+ return eSettings != null;
+ }
+
+ protected EStructuralFeature.Internal.DynamicValueHolder eSettings()
+ {
+ if (eSettings == null)
+ {
+ int size = eClass().getFeatureCount() - eStaticFeatureCount();
+ eSettings = size == 0 ? ENO_SETTINGS : new Object [size];
+ }
+
+ return this;
+ }
+
+ protected EClass eDynamicClass()
+ {
+ return eClass;
+ }
+
+ protected boolean isDynamic()
+ {
+ return (eClass != null);
+ }
+
+ public EClass eClass()
+ {
+ return isDynamic() ? eClass : eStaticClass();
+ }
+
+ public void eSetClass(EClass eClass)
+ {
+ this.eClass = eClass;
+ }
+
+ public Object dynamicGet(int dynamicFeatureID)
+ {
+ return eSettings[dynamicFeatureID];
+ }
+
+ public void dynamicSet(int dynamicFeatureID, Object value)
+ {
+ eSettings[dynamicFeatureID] = value;
+ }
+
+ public void dynamicUnset(int dynamicFeatureID)
+ {
+ eSettings[dynamicFeatureID] = null;
+ }
+
+ public Object eDynamicGet(int featureID, boolean resolve, boolean coreType)
+ {
+ if (featureID < eClass().getFeatureCount())
+ {
+ EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
+ return eSettingDelegate(eFeature).dynamicGet(this, eSettings(), featureID, resolve, coreType);
+ }
+ else
+ {
+ return super.eDynamicGet(featureID, resolve, coreType);
+ }
+ }
+
+ public void eDynamicSet(int featureID, Object newValue)
+ {
+ if (featureID < eClass().getFeatureCount())
+ {
+ EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
+ eDynamicSet(featureID, eFeature, newValue);
+ }
+ else
+ {
+ super.eDynamicSet(featureID, newValue);
+ }
+ }
+
+ public void eDynamicUnset(int featureID)
+ {
+ if (featureID < eClass().getFeatureCount())
+ {
+ EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
+ eDynamicUnset(featureID, eFeature);
+ }
+ else
+ {
+ super.eDynamicUnset(featureID);
+ }
+ }
+
+ public boolean eDynamicIsSet(int featureID)
+ {
+ if (featureID < eClass().getFeatureCount())
+ {
+ EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
+ return eSettingDelegate(eFeature).dynamicIsSet(this, eSettings(), featureID);
+ }
+ else
+ {
+ return super.eDynamicIsSet(featureID);
+ }
+ }
+
+ /**
+ * An EFactoryImpl that creates ExtensibleDataObjectImpl instances.
+ */
+ public static class FactoryImpl extends EFactoryImpl
+ {
+ public FactoryImpl()
+ {
+ }
+
+ public EObject basicCreate(EClass eClass)
+ {
+ return new ExtensibleDataObjectImpl(eClass);
+ }
+ }
+
+} //ExtensibleDataObjectImpl
Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java Wed Jun 13 07:11:26 2007
@@ -119,6 +119,7 @@
case SDOPackage.DYNAMIC_DATA_OBJECT: return (EObject)createDynamicDataObject();
case SDOPackage.STORE_DATA_OBJECT: return (EObject)createStoreDataObject();
case SDOPackage.DYNAMIC_STORE_DATA_OBJECT: return (EObject)createDynamicStoreDataObject();
+ case SDOPackage.EXTENSIBLE_DATA_OBJECT: return (EObject)createExtensibleDataObject();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -293,6 +294,17 @@
{
DynamicStoreDataObjectImpl dynamicStoreDataObject = new DynamicStoreDataObjectImpl();
return dynamicStoreDataObject;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public DataObject createExtensibleDataObject()
+ {
+ ExtensibleDataObjectImpl extensibleDataObject = new ExtensibleDataObjectImpl();
+ return extensibleDataObject;
}
/**
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java Wed Jun 13 07:11:26 2007
@@ -182,6 +182,13 @@
* <!-- end-user-doc -->
* @generated
*/
+ private EClass extensibleDataObjectEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EDataType eJavaListEDataType = null;
/**
@@ -502,6 +509,16 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EClass getExtensibleDataObject()
+ {
+ return extensibleDataObjectEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EDataType getEJavaList()
{
return eJavaListEDataType;
@@ -586,6 +603,8 @@
dynamicStoreDataObjectEClass = createEClass(DYNAMIC_STORE_DATA_OBJECT);
+ extensibleDataObjectEClass = createEClass(EXTENSIBLE_DATA_OBJECT);
+
// Create data types
eJavaListEDataType = createEDataType(EJAVA_LIST);
eObjectStreamExceptionEDataType = createEDataType(EOBJECT_STREAM_EXCEPTION);
@@ -676,6 +695,7 @@
dynamicDataObjectEClass.getESuperTypes().add(this.getDataObject());
storeDataObjectEClass.getESuperTypes().add(this.getDataObject());
dynamicStoreDataObjectEClass.getESuperTypes().add(this.getStoreDataObject());
+ extensibleDataObjectEClass.getESuperTypes().add(this.getDataObject());
// Initialize classes and features; add operations and parameters
initEClass(changeSummaryEClass, ChangeSummary.class, "ChangeSummary", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
@@ -1277,6 +1297,8 @@
initEClass(storeDataObjectEClass, DataObject.class, "StoreDataObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
initEClass(dynamicStoreDataObjectEClass, DataObject.class, "DynamicStoreDataObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(extensibleDataObjectEClass, DataObject.class, "ExtensibleDataObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
// Initialize data types
initEDataType(eJavaListEDataType, List.class, "EJavaList", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java Wed Jun 13 07:11:26 2007
@@ -216,7 +216,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getBaseDataGraphType();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java Wed Jun 13 07:11:26 2007
@@ -142,7 +142,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getDataGraphType();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java Wed Jun 13 07:11:26 2007
@@ -76,7 +76,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getDataObject();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java Wed Jun 13 07:11:26 2007
@@ -104,7 +104,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getModelsType();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java Wed Jun 13 07:11:26 2007
@@ -473,7 +473,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public commonj.sdo.Type getType()
+ public commonj.sdo.Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getProperty();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java Wed Jun 13 07:11:26 2007
@@ -106,7 +106,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getTextType();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java Wed Jun 13 07:11:26 2007
@@ -456,7 +456,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public commonj.sdo.Type getType()
+ public commonj.sdo.Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getType();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java Wed Jun 13 07:11:26 2007
@@ -106,7 +106,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getTypes();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java Wed Jun 13 07:11:26 2007
@@ -104,7 +104,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((ModelFactoryImpl)ModelFactory.INSTANCE).getXSDType();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java Wed Jun 13 07:11:26 2007
@@ -121,7 +121,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((JavaFactoryImpl)JavaFactory.INSTANCE).getJavaInfo();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java Wed Jun 13 07:11:26 2007
@@ -121,7 +121,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((XMLFactoryImpl)XMLFactory.INSTANCE).getXMLInfo();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java Wed Jun 13 07:11:26 2007
@@ -125,7 +125,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((MetadataFactoryImpl)MetadataFactory.INSTANCE).getJavaMetaData();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java Wed Jun 13 07:11:26 2007
@@ -134,7 +134,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((MetadataFactoryImpl)MetadataFactory.INSTANCE).getSDOMetaDataGroup();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java Wed Jun 13 07:11:26 2007
@@ -95,7 +95,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((MetadataFactoryImpl)MetadataFactory.INSTANCE).getTypeMetaData();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java Wed Jun 13 07:11:26 2007
@@ -95,7 +95,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((MetadataFactoryImpl)MetadataFactory.INSTANCE).getXSDMetaData();
}
Modified: incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java Wed Jun 13 07:11:26 2007
@@ -444,7 +444,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((SimpleFactoryImpl)SimpleFactory.INSTANCE).getQuote();
}
@@ -850,7 +850,7 @@
{
if (quotes == null)
{
- quotes = createPropertyList(ListKind.CONTAINMENT, Quote.class, QUOTES);
+ quotes = createPropertyList(ListKind.CONTAINMENT, Quote.class, QUOTES, 0);
}
return quotes;
}
Modified: incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java Wed Jun 13 07:11:26 2007
@@ -36,13 +36,15 @@
import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
+import org.apache.tuscany.sdo.model.internal.InternalFactory;
+
import org.apache.tuscany.sdo.util.SDOUtil;
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* Generator information:
- * patternVersion=1.1;
+ * patternVersion=1.2;
* <!-- end-user-doc -->
* @generated
*/
@@ -71,7 +73,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public static final String PATTERN_VERSION = "1.1";
+ public static final String PATTERN_VERSION = "1.2";
public static final int QUOTE = 1;
@@ -144,9 +146,10 @@
SimpleFactoryImpl theSimpleFactoryImpl = new SimpleFactoryImpl();
isInited = true;
- // Initialize simple dependencies
+ // Initialize dependencies
SDOUtil.registerStaticTypes(SDOFactory.class);
SDOUtil.registerStaticTypes(ModelFactory.class);
+ SDOUtil.registerStaticTypes(InternalFactory.class);
// Create package meta-data objects
theSimpleFactoryImpl.createMetaData();
@@ -195,31 +198,31 @@
// Initialize types and properties
initializeType(quoteType, Quote.class, "Quote", false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_SYMBOL);
+ property = getLocalProperty(quoteType, 0);
initializeProperty(property, theModelPackageImpl.getString(), "symbol", null, 1, 1, Quote.class, false, true, false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_COMPANY_NAME);
+ property = getLocalProperty(quoteType, 1);
initializeProperty(property, theModelPackageImpl.getString(), "companyName", null, 1, 1, Quote.class, false, true, false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_PRICE);
+ property = getLocalProperty(quoteType, 2);
initializeProperty(property, theModelPackageImpl.getDecimal(), "price", null, 1, 1, Quote.class, false, true, false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_OPEN1);
+ property = getLocalProperty(quoteType, 3);
initializeProperty(property, theModelPackageImpl.getDecimal(), "open1", null, 1, 1, Quote.class, false, true, false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_HIGH);
+ property = getLocalProperty(quoteType, 4);
initializeProperty(property, theModelPackageImpl.getDecimal(), "high", null, 1, 1, Quote.class, false, true, false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_LOW);
+ property = getLocalProperty(quoteType, 5);
initializeProperty(property, theModelPackageImpl.getDecimal(), "low", null, 1, 1, Quote.class, false, true, false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_VOLUME);
+ property = getLocalProperty(quoteType, 6);
initializeProperty(property, theModelPackageImpl.getDouble(), "volume", null, 1, 1, Quote.class, false, true, false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_CHANGE1);
+ property = getLocalProperty(quoteType, 7);
initializeProperty(property, theModelPackageImpl.getDouble(), "change1", null, 1, 1, Quote.class, false, true, false);
- property = getProperty(quoteType, QuoteImpl.INTERNAL_QUOTES);
+ property = getLocalProperty(quoteType, 8);
initializeProperty(property, this.getQuote(), "quotes", null, 0, -1, Quote.class, false, false, false, true , null);
createXSDMetaData(theModelPackageImpl);
Modified: incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java Wed Jun 13 07:11:26 2007
@@ -36,13 +36,15 @@
import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
+import org.apache.tuscany.sdo.model.internal.InternalFactory;
+
import org.apache.tuscany.sdo.util.SDOUtil;
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* Generator information:
- * patternVersion=1.1; -prefix Containment
+ * patternVersion=1.2; -prefix Containment
* <!-- end-user-doc -->
* @generated
*/
@@ -71,7 +73,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public static final String PATTERN_VERSION = "1.1";
+ public static final String PATTERN_VERSION = "1.2";
public static final int CONTAINMENT_TEST = 1;
@@ -144,9 +146,10 @@
ContainmentFactoryImpl theContainmentFactoryImpl = new ContainmentFactoryImpl();
isInited = true;
- // Initialize simple dependencies
+ // Initialize dependencies
SDOUtil.registerStaticTypes(SDOFactory.class);
SDOUtil.registerStaticTypes(ModelFactory.class);
+ SDOUtil.registerStaticTypes(InternalFactory.class);
// Create package meta-data objects
theContainmentFactoryImpl.createMetaData();
@@ -190,16 +193,16 @@
// Initialize types and properties
initializeType(containmentTestType, ContainmentTest.class, "ContainmentTest", false);
- property = getProperty(containmentTestType, ContainmentTestImpl.INTERNAL_MIXED);
+ property = getLocalProperty(containmentTestType, 0);
initializeProperty(property, getSequence(), "mixed", null, 0, -1, ContainmentTest.class, false, false, false);
- property = getProperty(containmentTestType, ContainmentTestImpl.INTERNAL_NAME);
+ property = getLocalProperty(containmentTestType, 1);
initializeProperty(property, theModelPackageImpl.getString(), "Name", null, 1, 1, ContainmentTest.class, false, true, true);
- property = getProperty(containmentTestType, ContainmentTestImpl.INTERNAL_CONTAIN);
+ property = getLocalProperty(containmentTestType, 2);
initializeProperty(property, this.getContainmentTest(), "Contain", null, 1, 1, ContainmentTest.class, false, true, true, true , null);
- property = getProperty(containmentTestType, ContainmentTestImpl.INTERNAL_CONTAIN_MANY);
+ property = getLocalProperty(containmentTestType, 3);
initializeProperty(property, this.getContainmentTest(), "ContainMany", null, 0, -1, ContainmentTest.class, false, false, true, true , null);
createXSDMetaData(theModelPackageImpl);
Modified: incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java Wed Jun 13 07:11:26 2007
@@ -146,7 +146,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((ContainmentFactoryImpl)ContainmentFactory.INSTANCE).getContainmentTest();
}
Modified: incubator/tuscany/java/sdo/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/pom.xml?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools/pom.xml Wed Jun 13 07:11:26 2007
@@ -31,6 +31,13 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-lib</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
Modified: incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java (original)
+++ incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java Wed Jun 13 07:11:26 2007
@@ -542,7 +542,7 @@
genModel.setRootExtendsInterface("");
genModel.setRootImplementsInterface("commonj.sdo.DataObject");
- genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.DataObjectImpl");
+ genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.ExtensibleDataObjectImpl");
genModel.setFeatureMapWrapperInterface("commonj.sdo.Sequence");
genModel.setFeatureMapWrapperInternalInterface("org.apache.tuscany.sdo.util.BasicSequence");
genModel.setFeatureMapWrapperClass("org.apache.tuscany.sdo.util.BasicSequence");
Modified: incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java (original)
+++ incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java Wed Jun 13 07:11:26 2007
@@ -161,7 +161,7 @@
protected final String TEXT_141 = NL + "\t\tcreateChangeSummary(";
protected final String TEXT_142 = ");";
protected final String TEXT_143 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
- protected final String TEXT_144 = " getType()" + NL + "\t{" + NL + "\t\treturn ((";
+ protected final String TEXT_144 = " getStaticType()" + NL + "\t{" + NL + "\t\treturn ((";
protected final String TEXT_145 = ")";
protected final String TEXT_146 = ".INSTANCE).get";
protected final String TEXT_147 = "();" + NL + "\t}" + NL;
Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/AccountImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/AccountImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/AccountImpl.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/AccountImpl.java Wed Jun 13 07:11:26 2007
@@ -121,7 +121,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((CustomerFactoryImpl)CustomerFactory.INSTANCE).getAccount();
}
Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/CustomerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/CustomerImpl.java?view=diff&rev=546884&r1=546883&r2=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/CustomerImpl.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/customer/impl/CustomerImpl.java Wed Jun 13 07:11:26 2007
@@ -155,7 +155,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Type getType()
+ public Type getStaticType()
{
return ((CustomerFactoryImpl)CustomerFactory.INSTANCE).getCustomer();
}
Added: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java?view=auto&rev=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java (added)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java Wed Jun 13 07:11:26 2007
@@ -0,0 +1,79 @@
+/**
+ *
+ * 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.
+ */
+package com.example.extensible.customer;
+
+import commonj.sdo.helper.HelperContext;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public interface CustomerFactory
+{
+
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ CustomerFactory INSTANCE = com.example.extensible.customer.impl.CustomerFactoryImpl.init();
+
+ /**
+ * Returns a new object of class '<em>Customers Type</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Customers Type</em>'.
+ * @generated
+ */
+ CustomersType createCustomersType();
+
+ /**
+ * Returns a new object of class '<em>Type</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Type</em>'.
+ * @generated
+ */
+ CustomerType createCustomerType();
+
+ /**
+ * Returns a new object of class '<em>Info Type</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Info Type</em>'.
+ * @generated
+ */
+ InfoType createInfoType();
+
+ /**
+ * Registers the types supported by this Factory within the supplied scope.argument
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param scope an instance of HelperContext used to manage the scoping of types.
+ * @generated
+ */
+ public void register(HelperContext scope);
+
+} //CustomerFactory
Propchange: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerType.java?view=auto&rev=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerType.java (added)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerType.java Wed Jun 13 07:11:26 2007
@@ -0,0 +1,198 @@
+/**
+ *
+ * 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.
+ */
+package com.example.extensible.customer;
+
+import java.io.Serializable;
+
+import java.math.BigInteger;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link com.example.extensible.customer.CustomerType#getName <em>Name</em>}</li>
+ * <li>{@link com.example.extensible.customer.CustomerType#getNumber <em>Number</em>}</li>
+ * <li>{@link com.example.extensible.customer.CustomerType#getInfo <em>Info</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @extends Serializable
+ * @generated
+ */
+public interface CustomerType extends Serializable
+{
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #isSetName()
+ * @see #unsetName()
+ * @see #setName(String)
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link com.example.extensible.customer.CustomerType#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #isSetName()
+ * @see #unsetName()
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+ /**
+ * Unsets the value of the '{@link com.example.extensible.customer.CustomerType#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isSetName()
+ * @see #getName()
+ * @see #setName(String)
+ * @generated
+ */
+ void unsetName();
+
+ /**
+ * Returns whether the value of the '{@link com.example.extensible.customer.CustomerType#getName <em>Name</em>}' attribute is set.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return whether the value of the '<em>Name</em>' attribute is set.
+ * @see #unsetName()
+ * @see #getName()
+ * @see #setName(String)
+ * @generated
+ */
+ boolean isSetName();
+
+ /**
+ * Returns the value of the '<em><b>Number</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Number</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Number</em>' attribute.
+ * @see #isSetNumber()
+ * @see #unsetNumber()
+ * @see #setNumber(BigInteger)
+ * @generated
+ */
+ BigInteger getNumber();
+
+ /**
+ * Sets the value of the '{@link com.example.extensible.customer.CustomerType#getNumber <em>Number</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Number</em>' attribute.
+ * @see #isSetNumber()
+ * @see #unsetNumber()
+ * @see #getNumber()
+ * @generated
+ */
+ void setNumber(BigInteger value);
+
+ /**
+ * Unsets the value of the '{@link com.example.extensible.customer.CustomerType#getNumber <em>Number</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isSetNumber()
+ * @see #getNumber()
+ * @see #setNumber(BigInteger)
+ * @generated
+ */
+ void unsetNumber();
+
+ /**
+ * Returns whether the value of the '{@link com.example.extensible.customer.CustomerType#getNumber <em>Number</em>}' attribute is set.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return whether the value of the '<em>Number</em>' attribute is set.
+ * @see #unsetNumber()
+ * @see #getNumber()
+ * @see #setNumber(BigInteger)
+ * @generated
+ */
+ boolean isSetNumber();
+
+ /**
+ * Returns the value of the '<em><b>Info</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Info</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Info</em>' containment reference.
+ * @see #isSetInfo()
+ * @see #unsetInfo()
+ * @see #setInfo(InfoType)
+ * @generated
+ */
+ InfoType getInfo();
+
+ /**
+ * Sets the value of the '{@link com.example.extensible.customer.CustomerType#getInfo <em>Info</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Info</em>' containment reference.
+ * @see #isSetInfo()
+ * @see #unsetInfo()
+ * @see #getInfo()
+ * @generated
+ */
+ void setInfo(InfoType value);
+
+ /**
+ * Unsets the value of the '{@link com.example.extensible.customer.CustomerType#getInfo <em>Info</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isSetInfo()
+ * @see #getInfo()
+ * @see #setInfo(InfoType)
+ * @generated
+ */
+ void unsetInfo();
+
+ /**
+ * Returns whether the value of the '{@link com.example.extensible.customer.CustomerType#getInfo <em>Info</em>}' containment reference is set.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return whether the value of the '<em>Info</em>' containment reference is set.
+ * @see #unsetInfo()
+ * @see #getInfo()
+ * @see #setInfo(InfoType)
+ * @generated
+ */
+ boolean isSetInfo();
+
+} // CustomerType
Propchange: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomerType.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomersType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomersType.java?view=auto&rev=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomersType.java (added)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomersType.java Wed Jun 13 07:11:26 2007
@@ -0,0 +1,57 @@
+/**
+ *
+ * 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.
+ */
+package com.example.extensible.customer;
+
+import java.io.Serializable;
+
+import java.util.List;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Customers Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link com.example.extensible.customer.CustomersType#getCustomer <em>Customer</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @extends Serializable
+ * @generated
+ */
+public interface CustomersType extends Serializable
+{
+ /**
+ * Returns the value of the '<em><b>Customer</b></em>' containment reference list.
+ * The list contents are of type {@link com.example.extensible.customer.CustomerType}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Customer</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Customer</em>' containment reference list.
+ * @generated
+ */
+ List getCustomer();
+
+} // CustomersType
Propchange: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomersType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/CustomersType.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/InfoType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/InfoType.java?view=auto&rev=546884
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/InfoType.java (added)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/InfoType.java Wed Jun 13 07:11:26 2007
@@ -0,0 +1,35 @@
+/**
+ *
+ * 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.
+ */
+package com.example.extensible.customer;
+
+import java.io.Serializable;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Info Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @extends Serializable
+ * @generated
+ */
+public interface InfoType extends Serializable
+{
+} // InfoType
Propchange: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/InfoType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/tools/src/test/java/com/example/extensible/customer/InfoType.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org