You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by Luciano Resende <lu...@gmail.com> on 2007/07/21 18:34:58 UTC
Re: svn commit: r558163 [1/3] - in /incubator/tuscany/java/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/sdo/model/impl/ impl/src/main/java/org/apache/tusc
This is breaking DAS, updating to a revision prior to this changes work ok.
Any recommendations ?
On 7/20/07, kelvingoodson@apache.org <ke...@apache.org> wrote:
> Author: kelvingoodson
> Date: Fri Jul 20 14:51:12 2007
> New Revision: 558163
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=558163
> Log:
> Fix for TUSCANY-1143
>
> Modified:
> incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.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/FactoryBase.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/ModelFactoryImpl.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/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/internal/impl/InternalFactoryImpl.java
> incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.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/XMLFactoryImpl.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/DataObjectUtil.java
> incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
> incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
> incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
>
> Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java?view=diff&rev=558163&r1=558162&r2=558163
> ==============================================================================
> --- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java (original)
> +++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java Fri Jul 20 14:51:12 2007
> @@ -112,7 +112,7 @@
>
> static protected EPackage.Registry builtInModelRegistry = null;
>
> - static protected EPackage.Registry getBuiltInModelRegistry() {
> + static public EPackage.Registry getBuiltInModelRegistry() {
> if (builtInModelRegistry == null) {
> EPackageRegistryImpl registry = new EPackageRegistryImpl();
> for (Iterator iter = TypeHelperImpl.getBuiltInModels().iterator(); iter.hasNext();) {
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -23,13 +23,18 @@
> import java.util.List;
>
> import org.apache.tuscany.sdo.SDOFactory;
> +import org.apache.tuscany.sdo.helper.HelperContextImpl;
> import org.apache.tuscany.sdo.util.BasicSequence;
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.NotificationChain;
> +import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
> +import org.eclipse.emf.ecore.EPackage;
> import org.eclipse.emf.ecore.InternalEObject;
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
> +import org.eclipse.emf.ecore.resource.Resource;
> +import org.eclipse.emf.ecore.resource.ResourceSet;
> import org.eclipse.emf.ecore.util.BasicFeatureMap;
> import org.eclipse.emf.ecore.util.EDataTypeEList;
> import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
> @@ -375,7 +380,24 @@
>
> protected Object resolveProxy(Object proxy)
> {
> - return EcoreUtil.resolve((EObject)proxy, this);
> + Resource resource = this.eResource();
> + ResourceSet resourceSet = resource != null ? resource.getResourceSet() : null;
> + if (resourceSet != null) return EcoreUtil.resolve((EObject)proxy, resourceSet);
> +
> + URI proxyURI = ((InternalEObject)proxy).eProxyURI();
> + if (proxyURI != null)
> + {
> + EPackage ePackage = HelperContextImpl.getBuiltInModelRegistry().getEPackage(proxyURI.trimFragment().toString());
> + if (ePackage != null)
> + {
> + resource = ePackage.eResource();
> + if (resource != null)
> + {
> + return resource.getEObject(proxyURI.fragment().toString());
> + }
> + }
> + }
> + return null;
> }
>
>
> @@ -477,6 +499,7 @@
> }
>
> } //DataObjectBase
> +
>
>
>
>
> Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java?view=diff&rev=558163&r1=558162&r2=558163
> ==============================================================================
> --- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java (original)
> +++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java Fri Jul 20 14:51:12 2007
> @@ -58,8 +58,6 @@
>
> createResource(namespaceURI);
> setNsURI(namespaceURI);
> - //FIXME ... figure out proper (scoped) way to register static packages
> - EPackage.Registry.INSTANCE.put(namespaceURI, this);
>
> ((SDOEFactoryImpl)getEFactoryInstance()).sdoFactory = this;
> }
> @@ -76,15 +74,6 @@
> createResource(namespaceURI);
> setNsURI(namespaceURI);
>
> - // TODO this is a big kludge until we figure out how to connect type scopes
> - if("commonj.sdo".equals(namespaceURI) ||
> - "commonj.sdo/java".equals(namespaceURI) ||
> - "commonj.sdo/xml".equals(namespaceURI) ||
> - "http://www.apache.org/tuscany/commonj.sdo.internal".equals(namespaceURI))
> - {
> - EPackage.Registry.INSTANCE.put(namespaceURI, this);
> - }
> -
> ((SDOEFactoryImpl)getEFactoryInstance()).sdoFactory = this;
> }
>
> @@ -245,8 +234,15 @@
> ((EClass)subType).getESuperTypes().add((EClass)superType);
> }
>
> - //public static FactoryBase getStaticFactory(String namespaceURI)
> - // temporarily return Object - until everything is gen'd with new codegen pattern
> + /***
> + * @param namespaceURI
> + * @return Static factory (from the global scope) for the provided URI
> + *
> + * @deprecated - Use of the global scope is no longer encouraged. This method uses the
> + * global scope for retrieving the URI's factory. Instead, it is now possible to simply
> + * access SomeFactoryInterface.INSTANCE object directly.
> + *
> + */
> public static Object getStaticFactory(String namespaceURI)
> {
> EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(namespaceURI);
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -243,7 +243,7 @@
> models_set_ = true;
> if (isNotifying())
> {
> - addNotification(this, ChangeKind.SET, MODELS, oldModels, newModels, !oldModels_set_, changeContext);
> + addNotification(this, ChangeKind.SET, INTERNAL_MODELS, oldModels, newModels, !oldModels_set_, changeContext);
> }
> return changeContext;
> }
> @@ -259,19 +259,19 @@
> {
> ChangeContext changeContext = null;
> if (models != null)
> - changeContext = inverseRemove(models, this, OPPOSITE_FEATURE_BASE - MODELS, null, changeContext);
> + changeContext = inverseRemove(models, this, OPPOSITE_FEATURE_BASE - INTERNAL_MODELS, null, changeContext);
> if (newModels != null)
> - changeContext = inverseAdd(newModels, this, OPPOSITE_FEATURE_BASE - MODELS, null, changeContext);
> + changeContext = inverseAdd(newModels, this, OPPOSITE_FEATURE_BASE - INTERNAL_MODELS, null, changeContext);
> changeContext = basicSetModels(newModels, changeContext);
> if (changeContext != null) dispatch(changeContext);
> }
> else
> - {
> + {
> boolean oldModels_set_ = models_set_;
> models_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, MODELS, newModels, newModels, !oldModels_set_);
> - }
> + notify(ChangeKind.SET, INTERNAL_MODELS, newModels, newModels, !oldModels_set_);
> + }
> }
>
> /**
> @@ -287,7 +287,7 @@
> models_set_ = false;
> if (isNotifying())
> {
> - addNotification(this, ChangeKind.UNSET, MODELS, oldModels, null, !oldModels_set_, changeContext);
> + addNotification(this, ChangeKind.UNSET, INTERNAL_MODELS, oldModels, null, !oldModels_set_, changeContext);
> }
> return changeContext;
> }
> @@ -302,7 +302,7 @@
> if (models != null)
> {
> ChangeContext changeContext = null;
> - changeContext = inverseRemove(models, this, EOPPOSITE_FEATURE_BASE - MODELS, null, changeContext);
> + changeContext = inverseRemove(models, this, EOPPOSITE_FEATURE_BASE - INTERNAL_MODELS, null, changeContext);
> changeContext = basicUnsetModels(changeContext);
> if (changeContext != null) dispatch(changeContext);
> }
> @@ -311,7 +311,7 @@
> boolean oldModels_set_ = models_set_;
> models_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, MODELS, null, null, oldModels_set_);
> + notify(ChangeKind.UNSET, INTERNAL_MODELS, null, null, oldModels_set_);
> }
> }
>
> @@ -347,7 +347,7 @@
> xsd_set_ = true;
> if (isNotifying())
> {
> - addNotification(this, ChangeKind.SET, XSD, oldXsd, newXsd, !oldXsd_set_, changeContext);
> + addNotification(this, ChangeKind.SET, INTERNAL_XSD, oldXsd, newXsd, !oldXsd_set_, changeContext);
> }
> return changeContext;
> }
> @@ -363,19 +363,19 @@
> {
> ChangeContext changeContext = null;
> if (xsd != null)
> - changeContext = inverseRemove(xsd, this, OPPOSITE_FEATURE_BASE - XSD, null, changeContext);
> + changeContext = inverseRemove(xsd, this, OPPOSITE_FEATURE_BASE - INTERNAL_XSD, null, changeContext);
> if (newXsd != null)
> - changeContext = inverseAdd(newXsd, this, OPPOSITE_FEATURE_BASE - XSD, null, changeContext);
> + changeContext = inverseAdd(newXsd, this, OPPOSITE_FEATURE_BASE - INTERNAL_XSD, null, changeContext);
> changeContext = basicSetXsd(newXsd, changeContext);
> if (changeContext != null) dispatch(changeContext);
> }
> else
> - {
> + {
> boolean oldXsd_set_ = xsd_set_;
> xsd_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, XSD, newXsd, newXsd, !oldXsd_set_);
> - }
> + notify(ChangeKind.SET, INTERNAL_XSD, newXsd, newXsd, !oldXsd_set_);
> + }
> }
>
> /**
> @@ -391,7 +391,7 @@
> xsd_set_ = false;
> if (isNotifying())
> {
> - addNotification(this, ChangeKind.UNSET, XSD, oldXsd, null, !oldXsd_set_, changeContext);
> + addNotification(this, ChangeKind.UNSET, INTERNAL_XSD, oldXsd, null, !oldXsd_set_, changeContext);
> }
> return changeContext;
> }
> @@ -406,7 +406,7 @@
> if (xsd != null)
> {
> ChangeContext changeContext = null;
> - changeContext = inverseRemove(xsd, this, EOPPOSITE_FEATURE_BASE - XSD, null, changeContext);
> + changeContext = inverseRemove(xsd, this, EOPPOSITE_FEATURE_BASE - INTERNAL_XSD, null, changeContext);
> changeContext = basicUnsetXsd(changeContext);
> if (changeContext != null) dispatch(changeContext);
> }
> @@ -415,7 +415,7 @@
> boolean oldXsd_set_ = xsd_set_;
> xsd_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, XSD, null, null, oldXsd_set_);
> + notify(ChangeKind.UNSET, INTERNAL_XSD, null, null, oldXsd_set_);
> }
> }
>
> @@ -450,7 +450,7 @@
> boolean oldChangeSummary_set_ = changeSummary_set_;
> changeSummary_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, CHANGE_SUMMARY, oldChangeSummary, changeSummary, !oldChangeSummary_set_);
> + notify(ChangeKind.SET, INTERNAL_CHANGE_SUMMARY, oldChangeSummary, changeSummary, !oldChangeSummary_set_);
> }
>
> /**
> @@ -465,7 +465,7 @@
> changeSummary = CHANGE_SUMMARY_DEFAULT_;
> changeSummary_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, CHANGE_SUMMARY, oldChangeSummary, CHANGE_SUMMARY_DEFAULT_, oldChangeSummary_set_);
> + notify(ChangeKind.UNSET, INTERNAL_CHANGE_SUMMARY, oldChangeSummary, CHANGE_SUMMARY_DEFAULT_, oldChangeSummary_set_);
> }
>
> /**
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -55,7 +55,7 @@
> * @generated
> * @ordered
> */
> - public final static int INTERNAL_MODELS = BaseDataGraphTypeImpl.MODELS;
> + public final static int INTERNAL_MODELS = BaseDataGraphTypeImpl.INTERNAL_MODELS;
>
> /**
> * The internal feature id for the '<em><b>Xsd</b></em>' containment reference.
> @@ -64,7 +64,7 @@
> * @generated
> * @ordered
> */
> - public final static int INTERNAL_XSD = BaseDataGraphTypeImpl.XSD;
> + public final static int INTERNAL_XSD = BaseDataGraphTypeImpl.INTERNAL_XSD;
>
> /**
> * The internal feature id for the '<em><b>Change Summary</b></em>' attribute.
> @@ -73,7 +73,7 @@
> * @generated
> * @ordered
> */
> - public final static int INTERNAL_CHANGE_SUMMARY = BaseDataGraphTypeImpl.CHANGE_SUMMARY;
> + public final static int INTERNAL_CHANGE_SUMMARY = BaseDataGraphTypeImpl.INTERNAL_CHANGE_SUMMARY;
>
> /**
> * The internal feature id for the '<em><b>Any Attribute</b></em>' attribute list.
> @@ -82,7 +82,7 @@
> * @generated
> * @ordered
> */
> - public final static int INTERNAL_ANY_ATTRIBUTE = BaseDataGraphTypeImpl.ANY_ATTRIBUTE;
> + public final static int INTERNAL_ANY_ATTRIBUTE = BaseDataGraphTypeImpl.INTERNAL_ANY_ATTRIBUTE;
>
> /**
> * The internal feature id for the '<em><b>Any</b></em>' attribute list.
>
> Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java?view=diff&rev=558163&r1=558162&r2=558163
> ==============================================================================
> --- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java (original)
> +++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java Fri Jul 20 14:51:12 2007
> @@ -19,34 +19,29 @@
> */
> package org.apache.tuscany.sdo.model.impl;
>
> +import commonj.sdo.helper.DataHelper;
> +import commonj.sdo.helper.HelperContext;
> +
> +import org.apache.tuscany.sdo.SDOFactory;
> +import org.apache.tuscany.sdo.helper.TypeHelperImpl;
> +
> +import commonj.sdo.ChangeSummary;
> +import commonj.sdo.DataObject;
> +
> import java.math.BigDecimal;
> import java.math.BigInteger;
> +
> import java.text.SimpleDateFormat;
> import java.util.Date;
> import java.util.List;
> import java.util.TimeZone;
>
> -import org.apache.tuscany.sdo.SDOFactory;
> -import org.apache.tuscany.sdo.helper.TypeHelperImpl;
> import org.apache.tuscany.sdo.impl.FactoryBase;
> -import org.apache.tuscany.sdo.model.BaseDataGraphType;
> -import org.apache.tuscany.sdo.model.DataGraphType;
> -import org.apache.tuscany.sdo.model.ModelFactory;
> -import org.apache.tuscany.sdo.model.ModelsType;
> -import org.apache.tuscany.sdo.model.Property;
> -import org.apache.tuscany.sdo.model.TextType;
> -import org.apache.tuscany.sdo.model.Type;
> -import org.apache.tuscany.sdo.model.Types;
> -import org.apache.tuscany.sdo.model.XSDType;
> -import org.apache.tuscany.sdo.util.SDOUtil;
> +
> +import org.apache.tuscany.sdo.model.*;
> import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
> import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
>
> -import commonj.sdo.ChangeSummary;
> -import commonj.sdo.DataObject;
> -import commonj.sdo.helper.DataHelper;
> -import commonj.sdo.helper.HelperContext;
> -
> /**
> * <!-- begin-user-doc -->
> * An implementation of the commonj.sdo model factory.
> @@ -70,7 +65,8 @@
> * initializeType(dataObjectType, commonj.sdo.DataObject.class, "DataObject", true); // generated as org.apache.tuscany.sdo.model.DataObject.class
> * 8. Add the following case to the generated create() method:
> * case DATA_OBJECT: return SDOFactory.eINSTANCE.createAnyTypeDataObject();
> - * 9. Move this JavaDoc comment into the newly generated ModelFactoryImpl class.
> + * 9. Make sure the top of each generated file contains the ASF License.
> + * 10. Move this JavaDoc comment into the newly generated ModelFactoryImpl class.
> * <!-- end-user-doc -->
> * @generated
> */
> @@ -99,7 +95,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 BASE_DATA_GRAPH_TYPE = 1;
> public static final int DATA_GRAPH_TYPE = 2;
> @@ -162,11 +158,16 @@
> * <!-- begin-user-doc -->
> * <!-- end-user-doc -->
> * @generated
> - */
> - public void register(HelperContext scope) {
> + */
> + public void register(HelperContext scope)
> + {
> if(scope == null) {
> - throw new IllegalArgumentException("Scope can not be null");
> - }
> + throw new IllegalArgumentException("Scope can not be null");
> + }
> +
> + //Register dependent packages with provided scope
> +
> + // Initialize this package
> TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
> th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
> }
> @@ -719,28 +720,24 @@
> }
>
>
> - private static boolean isInited = false;
> -
> + private static ModelFactoryImpl instance = null;
> public static ModelFactoryImpl init()
> {
> - if (isInited) return (ModelFactoryImpl)FactoryBase.getStaticFactory(ModelFactoryImpl.NAMESPACE_URI);
> - ModelFactoryImpl theModelFactoryImpl = new ModelFactoryImpl();
> - isInited = true;
> -
> - // Initialize simple dependencies
> - SDOUtil.registerStaticTypes(SDOFactory.class);
> - //SDOUtil.registerStaticTypes(ModelFactory.class);
> + if (instance != null ) return instance;
> + instance = new ModelFactoryImpl();
>
> + // Initialize dependent packages
> +
> // Create package meta-data objects
> - theModelFactoryImpl.createMetaData();
> + instance.createMetaData();
>
> // Initialize created meta-data
> - theModelFactoryImpl.initializeMetaData();
> -
> + instance.initializeMetaData();
> +
> // Mark meta-data to indicate it can't be changed
> //theModelFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
>
> - return theModelFactoryImpl;
> + return instance;
> }
>
> private boolean isCreated = false;
> @@ -751,17 +748,17 @@
> isCreated = true;
>
> // Create types and their properties
> - baseDataGraphTypeType = createType(false, BASE_DATA_GRAPH_TYPE);
> + baseDataGraphTypeType = createType(false, BASE_DATA_GRAPH_TYPE);
> createProperty(false, baseDataGraphTypeType,BaseDataGraphTypeImpl.INTERNAL_MODELS);
> createProperty(false, baseDataGraphTypeType,BaseDataGraphTypeImpl.INTERNAL_XSD);
> createProperty(true, baseDataGraphTypeType,BaseDataGraphTypeImpl.INTERNAL_CHANGE_SUMMARY);
> createProperty(true, baseDataGraphTypeType,BaseDataGraphTypeImpl.INTERNAL_ANY_ATTRIBUTE);
> - dataGraphTypeType = createType(false, DATA_GRAPH_TYPE);
> + dataGraphTypeType = createType(false, DATA_GRAPH_TYPE);
> createProperty(true, dataGraphTypeType,DataGraphTypeImpl.INTERNAL_ANY);
> - dataObjectType = createType(false, DATA_OBJECT);
> - modelsTypeType = createType(false, MODELS_TYPE);
> + dataObjectType = createType(false, DATA_OBJECT);
> + modelsTypeType = createType(false, MODELS_TYPE);
> createProperty(true, modelsTypeType,ModelsTypeImpl.INTERNAL_ANY);
> - propertyType = createType(false, PROPERTY);
> + propertyType = createType(false, PROPERTY);
> createProperty(true, propertyType,PropertyImpl.INTERNAL_ALIAS_NAME);
> createProperty(true, propertyType,PropertyImpl.INTERNAL_ANY);
> createProperty(true, propertyType,PropertyImpl.INTERNAL_NAME);
> @@ -773,9 +770,9 @@
> createProperty(false, propertyType,PropertyImpl.INTERNAL_OPPOSITE);
> createProperty(true, propertyType,PropertyImpl.INTERNAL_NULLABLE);
> createProperty(true, propertyType,PropertyImpl.INTERNAL_ANY_ATTRIBUTE);
> - textTypeType = createType(false, TEXT_TYPE);
> + textTypeType = createType(false, TEXT_TYPE);
> createProperty(true, textTypeType,TextTypeImpl.INTERNAL_TEXT);
> - typeType = createType(false, TYPE);
> + typeType = createType(false, TYPE);
> createProperty(false, typeType,TypeImpl.INTERNAL_BASE_TYPE);
> createProperty(false, typeType,TypeImpl.INTERNAL_PROPERTY);
> createProperty(true, typeType,TypeImpl.INTERNAL_ALIAS_NAME);
> @@ -787,9 +784,9 @@
> createProperty(true, typeType,TypeImpl.INTERNAL_SEQUENCED);
> createProperty(true, typeType,TypeImpl.INTERNAL_ABSTRACT);
> createProperty(true, typeType,TypeImpl.INTERNAL_ANY_ATTRIBUTE);
> - typesType = createType(false, TYPES);
> + typesType = createType(false, TYPES);
> createProperty(false, typesType,TypesImpl.INTERNAL_TYPE);
> - xsdTypeType = createType(false, XSD_TYPE);
> + xsdTypeType = createType(false, XSD_TYPE);
> createProperty(true, xsdTypeType,XSDTypeImpl.INTERNAL_ANY);
>
> // Create data types
> @@ -838,113 +835,113 @@
> commonj.sdo.Property property = null;
>
> // Add supertypes to types
> - addSuperType(dataGraphTypeType, baseDataGraphTypeType);
> + addSuperType(dataGraphTypeType, this.getBaseDataGraphType());
>
> // Initialize types and properties
> initializeType(baseDataGraphTypeType, BaseDataGraphType.class, "BaseDataGraphType", true);
> - property = getProperty(baseDataGraphTypeType, BaseDataGraphTypeImpl.INTERNAL_MODELS);
> + property = getLocalProperty(baseDataGraphTypeType, 0);
> initializeProperty(property, this.getModelsType(), "models", null, 0, 1, BaseDataGraphType.class, false, true, false, true , null);
>
> - property = getProperty(baseDataGraphTypeType, BaseDataGraphTypeImpl.INTERNAL_XSD);
> + property = getLocalProperty(baseDataGraphTypeType, 1);
> initializeProperty(property, this.getXSDType(), "xsd", null, 0, 1, BaseDataGraphType.class, false, true, false, true , null);
>
> - property = getProperty(baseDataGraphTypeType, BaseDataGraphTypeImpl.INTERNAL_CHANGE_SUMMARY);
> + property = getLocalProperty(baseDataGraphTypeType, 2);
> initializeProperty(property, this.getChangeSummaryType(), "changeSummary", null, 0, 1, BaseDataGraphType.class, false, true, false);
>
> - property = getProperty(baseDataGraphTypeType, BaseDataGraphTypeImpl.INTERNAL_ANY_ATTRIBUTE);
> + property = getLocalProperty(baseDataGraphTypeType, 3);
> initializeProperty(property, getSequence(), "anyAttribute", null, 0, -1, BaseDataGraphType.class, false, false, false);
>
> initializeType(dataGraphTypeType, DataGraphType.class, "DataGraphType", false);
> - property = getProperty(dataGraphTypeType, DataGraphTypeImpl.INTERNAL_ANY);
> + property = getLocalProperty(dataGraphTypeType, 0);
> initializeProperty(property, getSequence(), "any", null, 0, 1, DataGraphType.class, false, false, false);
>
> - initializeType(dataObjectType, commonj.sdo.DataObject.class, "DataObject", true);
> + initializeType(dataObjectType, commonj.sdo.DataObject.class, "DataObject", true); // generated as org.apache.tuscany.sdo.model.DataObject.class
> initializeType(modelsTypeType, ModelsType.class, "ModelsType", false);
> - property = getProperty(modelsTypeType, ModelsTypeImpl.INTERNAL_ANY);
> + property = getLocalProperty(modelsTypeType, 0);
> initializeProperty(property, getSequence(), "any", null, 0, -1, ModelsType.class, false, false, false);
>
> initializeType(propertyType, Property.class, "Property", false);
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_ALIAS_NAME);
> + property = getLocalProperty(propertyType, 0);
> initializeProperty(property, this.getString(), "aliasName", null, 0, -1, Property.class, false, false, false);
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_ANY);
> + property = getLocalProperty(propertyType, 1);
> initializeProperty(property, getSequence(), "any", null, 0, -1, Property.class, false, false, false);
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_NAME);
> + property = getLocalProperty(propertyType, 2);
> initializeProperty(property, this.getString(), "name", null, 0, 1, Property.class, false, true, false);
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_MANY);
> + property = getLocalProperty(propertyType, 3);
> initializeProperty(property, this.getBoolean(), "many", null, 0, 1, Property.class, false, true, false);
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_CONTAINMENT);
> + property = getLocalProperty(propertyType, 4);
> initializeProperty(property, this.getBoolean(), "containment", null, 0, 1, Property.class, false, true, false);
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_DEFAULT);
> + property = getLocalProperty(propertyType, 5);
> initializeProperty(property, this.getString(), "default", null, 0, 1, Property.class, false, true, false);
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_READ_ONLY);
> + property = getLocalProperty(propertyType, 6);
> initializeProperty(property, this.getBoolean(), "readOnly", null, 0, 1, Property.class, false, true, false);
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_TYPE);
> + property = getLocalProperty(propertyType, 7);
> initializeProperty(property, this.getType(), "type", null, 0, 1, Property.class, false, true, false, false , null);
> setInstanceProperty (property, "commonj.sdo/xml", "propertyType", "sdo:Type");
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_OPPOSITE);
> + property = getLocalProperty(propertyType, 8);
> initializeProperty(property, this.getProperty(), "opposite", null, 0, 1, Property.class, false, true, false, false , null);
> setInstanceProperty (property, "commonj.sdo/xml", "propertyType", "sdo:Property");
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_NULLABLE);
> + property = getLocalProperty(propertyType, 9);
> initializeProperty(property, this.getBoolean(), "nullable", null, 0, 1, Property.class, false, true, false);
>
> - property = getProperty(propertyType, PropertyImpl.INTERNAL_ANY_ATTRIBUTE);
> + property = getLocalProperty(propertyType, 10);
> initializeProperty(property, getSequence(), "anyAttribute", null, 0, -1, Property.class, false, false, false);
>
> initializeType(textTypeType, TextType.class, "TextType", true);
> - property = getProperty(textTypeType, TextTypeImpl.INTERNAL_TEXT);
> + property = getLocalProperty(textTypeType, 0);
> initializeProperty(property, this.getString(), "text", null, 0, -1, TextType.class, false, false, false);
>
> initializeType(typeType, Type.class, "Type", false);
> - property = getProperty(typeType, TypeImpl.INTERNAL_BASE_TYPE);
> + property = getLocalProperty(typeType, 0);
> initializeProperty(property, this.getType(), "baseType", null, 0, -1, Type.class, false, false, false, false , null);
> setInstanceProperty (property, "commonj.sdo/xml", "propertyType", "sdo:Type");
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_PROPERTY);
> + property = getLocalProperty(typeType, 1);
> initializeProperty(property, this.getProperty(), "property", null, 0, -1, Type.class, false, false, false, true , null);
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_ALIAS_NAME);
> + property = getLocalProperty(typeType, 2);
> initializeProperty(property, this.getString(), "aliasName", null, 0, -1, Type.class, false, false, false);
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_ANY);
> + property = getLocalProperty(typeType, 3);
> initializeProperty(property, getSequence(), "any", null, 0, -1, Type.class, false, false, false);
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_NAME);
> + property = getLocalProperty(typeType, 4);
> initializeProperty(property, this.getString(), "name", null, 0, 1, Type.class, false, true, false);
> setInstanceProperty (property, "commonj.sdo/xml", "dataType", "sdo:String");
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_URI);
> + property = getLocalProperty(typeType, 5);
> initializeProperty(property, this.getURI(), "uri", null, 0, 1, Type.class, false, true, false);
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_DATA_TYPE);
> + property = getLocalProperty(typeType, 6);
> initializeProperty(property, this.getBoolean(), "dataType", null, 0, 1, Type.class, false, true, false);
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_OPEN);
> + property = getLocalProperty(typeType, 7);
> initializeProperty(property, this.getBoolean(), "open", null, 0, 1, Type.class, false, true, false);
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_SEQUENCED);
> + property = getLocalProperty(typeType, 8);
> initializeProperty(property, this.getBoolean(), "sequenced", null, 0, 1, Type.class, false, true, false);
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_ABSTRACT);
> + property = getLocalProperty(typeType, 9);
> initializeProperty(property, this.getBoolean(), "abstract", null, 0, 1, Type.class, false, true, false);
>
> - property = getProperty(typeType, TypeImpl.INTERNAL_ANY_ATTRIBUTE);
> + property = getLocalProperty(typeType, 10);
> initializeProperty(property, getSequence(), "anyAttribute", null, 0, -1, Type.class, false, false, false);
>
> initializeType(typesType, Types.class, "Types", false);
> - property = getProperty(typesType, TypesImpl.INTERNAL_TYPE);
> + property = getLocalProperty(typesType, 0);
> initializeProperty(property, this.getType(), "type", null, 0, -1, Types.class, false, false, false, true , null);
>
> initializeType(xsdTypeType, XSDType.class, "XSDType", false);
> - property = getProperty(xsdTypeType, XSDTypeImpl.INTERNAL_ANY);
> + property = getLocalProperty(xsdTypeType, 0);
> initializeProperty(property, getSequence(), "any", null, 0, -1, XSDType.class, false, false, false);
>
> // Initialize data types
> @@ -2398,5 +2395,7 @@
> {
> return (String)instanceValue;
> }
> +
> +
>
> } //ModelFactoryImpl
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -525,7 +525,7 @@
> boolean oldName_set_ = name_set_;
> name_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, NAME, oldName, name, !oldName_set_);
> + notify(ChangeKind.SET, INTERNAL_NAME, oldName, name, !oldName_set_);
> }
>
> /**
> @@ -540,7 +540,7 @@
> name = NAME_DEFAULT_;
> name_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, NAME, oldName, NAME_DEFAULT_, oldName_set_);
> + notify(ChangeKind.UNSET, INTERNAL_NAME, oldName, NAME_DEFAULT_, oldName_set_);
> }
>
> /**
> @@ -574,7 +574,7 @@
> boolean oldMany_set_ = many_set_;
> many_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, MANY, oldMany, many, !oldMany_set_);
> + notify(ChangeKind.SET, INTERNAL_MANY, oldMany, many, !oldMany_set_);
> }
>
> /**
> @@ -589,7 +589,7 @@
> many = MANY_DEFAULT_;
> many_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, MANY, oldMany, MANY_DEFAULT_, oldMany_set_);
> + notify(ChangeKind.UNSET, INTERNAL_MANY, oldMany, MANY_DEFAULT_, oldMany_set_);
> }
>
> /**
> @@ -623,7 +623,7 @@
> boolean oldContainment_set_ = containment_set_;
> containment_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, CONTAINMENT, oldContainment, containment, !oldContainment_set_);
> + notify(ChangeKind.SET, INTERNAL_CONTAINMENT, oldContainment, containment, !oldContainment_set_);
> }
>
> /**
> @@ -638,7 +638,7 @@
> containment = CONTAINMENT_DEFAULT_;
> containment_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, CONTAINMENT, oldContainment, CONTAINMENT_DEFAULT_, oldContainment_set_);
> + notify(ChangeKind.UNSET, INTERNAL_CONTAINMENT, oldContainment, CONTAINMENT_DEFAULT_, oldContainment_set_);
> }
>
> /**
> @@ -672,7 +672,7 @@
> boolean oldDefault_set_ = default_set_;
> default_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, DEFAULT, oldDefault, default_, !oldDefault_set_);
> + notify(ChangeKind.SET, INTERNAL_DEFAULT, oldDefault, default_, !oldDefault_set_);
> }
>
> /**
> @@ -687,7 +687,7 @@
> default_ = DEFAULT_DEFAULT_;
> default_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, DEFAULT, oldDefault, DEFAULT_DEFAULT_, oldDefault_set_);
> + notify(ChangeKind.UNSET, INTERNAL_DEFAULT, oldDefault, DEFAULT_DEFAULT_, oldDefault_set_);
> }
>
> /**
> @@ -721,7 +721,7 @@
> boolean oldReadOnly_set_ = readOnly_set_;
> readOnly_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, READ_ONLY, oldReadOnly, readOnly, !oldReadOnly_set_);
> + notify(ChangeKind.SET, INTERNAL_READ_ONLY, oldReadOnly, readOnly, !oldReadOnly_set_);
> }
>
> /**
> @@ -736,7 +736,7 @@
> readOnly = READ_ONLY_DEFAULT_;
> readOnly_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, READ_ONLY, oldReadOnly, READ_ONLY_DEFAULT_, oldReadOnly_set_);
> + notify(ChangeKind.UNSET, INTERNAL_READ_ONLY, oldReadOnly, READ_ONLY_DEFAULT_, oldReadOnly_set_);
> }
>
> /**
> @@ -763,7 +763,7 @@
> if (type != oldType)
> {
> if (isNotifying())
> - notify(ChangeKind.RESOLVE, TYPE, oldType, type);
> + notify(ChangeKind.RESOLVE, INTERNAL_TYPE, oldType, type);
> }
> }
> return type;
> @@ -790,7 +790,7 @@
> boolean oldType_set_ = type_set_;
> type_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, TYPE, oldType, type, !oldType_set_);
> + notify(ChangeKind.SET, INTERNAL_TYPE, oldType, type, !oldType_set_);
> }
>
> /**
> @@ -805,7 +805,7 @@
> type = null;
> type_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, TYPE, oldType, null, oldType_set_);
> + notify(ChangeKind.UNSET, INTERNAL_TYPE, oldType, null, oldType_set_);
> }
>
> /**
> @@ -832,7 +832,7 @@
> if (opposite != oldOpposite)
> {
> if (isNotifying())
> - notify(ChangeKind.RESOLVE, OPPOSITE, oldOpposite, opposite);
> + notify(ChangeKind.RESOLVE, INTERNAL_OPPOSITE, oldOpposite, opposite);
> }
> }
> return opposite;
> @@ -859,7 +859,7 @@
> boolean oldOpposite_set_ = opposite_set_;
> opposite_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, OPPOSITE, oldOpposite, opposite, !oldOpposite_set_);
> + notify(ChangeKind.SET, INTERNAL_OPPOSITE, oldOpposite, opposite, !oldOpposite_set_);
> }
>
> /**
> @@ -874,7 +874,7 @@
> opposite = null;
> opposite_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, OPPOSITE, oldOpposite, null, oldOpposite_set_);
> + notify(ChangeKind.UNSET, INTERNAL_OPPOSITE, oldOpposite, null, oldOpposite_set_);
> }
>
> /**
> @@ -908,7 +908,7 @@
> boolean oldNullable_set_ = nullable_set_;
> nullable_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, NULLABLE, oldNullable, nullable, !oldNullable_set_);
> + notify(ChangeKind.SET, INTERNAL_NULLABLE, oldNullable, nullable, !oldNullable_set_);
> }
>
> /**
> @@ -923,7 +923,7 @@
> nullable = NULLABLE_DEFAULT_;
> nullable_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, NULLABLE, oldNullable, NULLABLE_DEFAULT_, oldNullable_set_);
> + notify(ChangeKind.UNSET, INTERNAL_NULLABLE, oldNullable, NULLABLE_DEFAULT_, oldNullable_set_);
> }
>
> /**
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -19,18 +19,20 @@
> */
> package org.apache.tuscany.sdo.model.impl;
>
> +import commonj.sdo.Sequence;
> +import commonj.sdo.helper.TypeHelper;
> +
> import java.util.Collection;
> import java.util.List;
>
> import org.apache.tuscany.sdo.impl.DataObjectBase;
> +
> import org.apache.tuscany.sdo.model.ModelFactory;
> import org.apache.tuscany.sdo.model.Property;
> import org.apache.tuscany.sdo.model.Type;
> import org.eclipse.emf.ecore.EStructuralFeature;
> import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
>
> -import commonj.sdo.Sequence;
> -
> /**
> * <!-- begin-user-doc -->
> * An implementation of the model object '<em><b>Type</b></em>'.
> @@ -534,7 +536,7 @@
> boolean oldName_set_ = name_set_;
> name_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, NAME, oldName, name, !oldName_set_);
> + notify(ChangeKind.SET, INTERNAL_NAME, oldName, name, !oldName_set_);
> }
>
> /**
> @@ -549,7 +551,7 @@
> name = NAME_DEFAULT_;
> name_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, NAME, oldName, NAME_DEFAULT_, oldName_set_);
> + notify(ChangeKind.UNSET, INTERNAL_NAME, oldName, NAME_DEFAULT_, oldName_set_);
> }
>
> /**
> @@ -583,7 +585,7 @@
> boolean oldUri_set_ = uri_set_;
> uri_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, URI, oldUri, uri, !oldUri_set_);
> + notify(ChangeKind.SET, INTERNAL_URI, oldUri, uri, !oldUri_set_);
> }
>
> /**
> @@ -598,7 +600,7 @@
> uri = URI_DEFAULT_;
> uri_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, URI, oldUri, URI_DEFAULT_, oldUri_set_);
> + notify(ChangeKind.UNSET, INTERNAL_URI, oldUri, URI_DEFAULT_, oldUri_set_);
> }
>
> /**
> @@ -632,7 +634,7 @@
> boolean oldDataType_set_ = dataType_set_;
> dataType_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, DATA_TYPE, oldDataType, dataType, !oldDataType_set_);
> + notify(ChangeKind.SET, INTERNAL_DATA_TYPE, oldDataType, dataType, !oldDataType_set_);
> }
>
> /**
> @@ -647,7 +649,7 @@
> dataType = DATA_TYPE_DEFAULT_;
> dataType_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, DATA_TYPE, oldDataType, DATA_TYPE_DEFAULT_, oldDataType_set_);
> + notify(ChangeKind.UNSET, INTERNAL_DATA_TYPE, oldDataType, DATA_TYPE_DEFAULT_, oldDataType_set_);
> }
>
> /**
> @@ -681,7 +683,7 @@
> boolean oldOpen_set_ = open_set_;
> open_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, OPEN, oldOpen, open, !oldOpen_set_);
> + notify(ChangeKind.SET, INTERNAL_OPEN, oldOpen, open, !oldOpen_set_);
> }
>
> /**
> @@ -696,7 +698,7 @@
> open = OPEN_DEFAULT_;
> open_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, OPEN, oldOpen, OPEN_DEFAULT_, oldOpen_set_);
> + notify(ChangeKind.UNSET, INTERNAL_OPEN, oldOpen, OPEN_DEFAULT_, oldOpen_set_);
> }
>
> /**
> @@ -730,7 +732,7 @@
> boolean oldSequenced_set_ = sequenced_set_;
> sequenced_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, SEQUENCED, oldSequenced, sequenced, !oldSequenced_set_);
> + notify(ChangeKind.SET, INTERNAL_SEQUENCED, oldSequenced, sequenced, !oldSequenced_set_);
> }
>
> /**
> @@ -745,7 +747,7 @@
> sequenced = SEQUENCED_DEFAULT_;
> sequenced_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, SEQUENCED, oldSequenced, SEQUENCED_DEFAULT_, oldSequenced_set_);
> + notify(ChangeKind.UNSET, INTERNAL_SEQUENCED, oldSequenced, SEQUENCED_DEFAULT_, oldSequenced_set_);
> }
>
> /**
> @@ -779,7 +781,7 @@
> boolean oldAbstract_set_ = abstract_set_;
> abstract_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, ABSTRACT, oldAbstract, abstract_, !oldAbstract_set_);
> + notify(ChangeKind.SET, INTERNAL_ABSTRACT, oldAbstract, abstract_, !oldAbstract_set_);
> }
>
> /**
> @@ -794,7 +796,7 @@
> abstract_ = ABSTRACT_DEFAULT_;
> abstract_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, ABSTRACT, oldAbstract, ABSTRACT_DEFAULT_, oldAbstract_set_);
> + notify(ChangeKind.UNSET, INTERNAL_ABSTRACT, oldAbstract, ABSTRACT_DEFAULT_, oldAbstract_set_);
> }
>
> /**
> @@ -1040,15 +1042,14 @@
> return result.toString();
> }
>
> - EStructuralFeature javaClassFeature = null;
> +EStructuralFeature javaClassFeature = null;
>
> - public String getInstanceClassName()
> +public String getInstanceClassName()
> {
> - //FB EStructuralFeature javaClassFeature = JavaFactory.getGlobal_JavaClass();
> - //FB TODO figure out proper way to access global properties
> if (javaClassFeature == null)
> {
> - javaClassFeature = BasicExtendedMetaData.INSTANCE.getAttribute("commonj.sdo/java", "javaClass");
> + //FB TODO figure out what helper to use
> + javaClassFeature = (EStructuralFeature)TypeHelper.INSTANCE.getOpenContentProperty("commonj.sdo/java", "javaClass");
> }
>
> Sequence anyAttribute = getAnyAttribute();
> @@ -1061,7 +1062,7 @@
> return (String)anyAttribute.getValue(i);
> }
> }
> - return null;
> + return null;
> }
> -
> +
> } //TypeImpl
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -201,7 +201,7 @@
> }
> return super.isSet(propertyIndex);
> }
> -
> +
> public List getTypeList()
> {
> return getType_();
>
> Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java?view=diff&rev=558163&r1=558162&r2=558163
> ==============================================================================
> --- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java (original)
> +++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java Fri Jul 20 14:51:12 2007
> @@ -26,12 +26,8 @@
> import commonj.sdo.Property;
> import commonj.sdo.Type;
>
> -import org.apache.tuscany.sdo.SDOFactory;
> -
> import org.apache.tuscany.sdo.impl.FactoryBase;
>
> -import org.apache.tuscany.sdo.model.ModelFactory;
> -
> import org.apache.tuscany.sdo.model.internal.*;
> import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
>
> @@ -45,7 +41,8 @@
> * 2. Delete all the createXXXFromString() and convertXXXToString() methods in the newly generated InternalFactoryImpl and
> * replace them with the ones from this file (resolve any missing imports).
> * 3. Comment out all simple depedencies (SDOUtil.registerStaticTypes calls) in the init() method.
> - * 4. Move this JavaDoc comment into the newly generated ModelFactoryImpl class.
> + * 4. Make sure the top of each generated file contains the ASF License.
> + * 5. Move this JavaDoc comment into the newly generated ModelFactoryImpl class.
> * <!-- end-user-doc -->
> * @generated
> */
> @@ -96,11 +93,16 @@
> * <!-- begin-user-doc -->
> * <!-- end-user-doc -->
> * @generated
> - */
> - public void register(HelperContext scope) {
> + */
> + public void register(HelperContext scope)
> + {
> if(scope == null) {
> - throw new IllegalArgumentException("Scope can not be null");
> - }
> + throw new IllegalArgumentException("Scope can not be null");
> + }
> +
> + //Register dependent packages with provided scope
> +
> + // Initialize this package
> TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
> th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
> }
> @@ -171,28 +173,24 @@
> }
>
>
> - private static boolean isInited = false;
> -
> + private static InternalFactoryImpl instance = null;
> public static InternalFactoryImpl init()
> {
> - if (isInited) return (InternalFactoryImpl)FactoryBase.getStaticFactory(InternalFactoryImpl.NAMESPACE_URI);
> - InternalFactoryImpl theInternalFactoryImpl = new InternalFactoryImpl();
> - isInited = true;
> -
> - // Initialize simple dependencies
> - //SDOUtil.registerStaticTypes(SDOFactory.class);
> - //SDOUtil.registerStaticTypes(ModelFactory.class);
> + if (instance != null ) return instance;
> + instance = new InternalFactoryImpl();
> +
> + // Initialize dependent packages
>
> // Create package meta-data objects
> - theInternalFactoryImpl.createMetaData();
> + instance.createMetaData();
>
> // Initialize created meta-data
> - theInternalFactoryImpl.initializeMetaData();
> -
> + instance.initializeMetaData();
> +
> // Mark meta-data to indicate it can't be changed
> //theInternalFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
>
> - return theInternalFactoryImpl;
> + return instance;
> }
>
> private boolean isCreated = false;
>
> Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java?view=diff&rev=558163&r1=558162&r2=558163
> ==============================================================================
> --- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java (original)
> +++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java Fri Jul 20 14:51:12 2007
> @@ -26,8 +26,6 @@
> import commonj.sdo.Property;
> import commonj.sdo.Type;
>
> -import org.apache.tuscany.sdo.SDOFactory;
> -
> import org.apache.tuscany.sdo.impl.FactoryBase;
>
> import org.apache.tuscany.sdo.model.ModelFactory;
> @@ -35,8 +33,6 @@
> import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
>
> import org.apache.tuscany.sdo.model.java.*;
> -
> -import org.apache.tuscany.sdo.util.SDOUtil;
> import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
> import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
>
> @@ -49,10 +45,12 @@
> * XSD2JavaGenerator -generateBuiltIn commonj.sdo/java -targetDirectory <temp-dir> -javaPackage org.apache.tuscany.sdo.model.java <sdo-api-dir>/src/main/resources/xml/sdoJava.xsd
> * 2. Delete all the createXXXFromString() and convertXXXToString() methods in the newly generated JavaFactoryImpl and
> * replace them with the ones from this file.
> - * 3. Move this JavaDoc comment into the newly generated JavaFactoryImpl class.
> + * 3. Make sure the top of each generated file contains the ASF License.
> + * 4. Move this JavaDoc comment into the newly generated JavaFactoryImpl class.
> * <!-- end-user-doc -->
> * @generated
> */
> +
> public class JavaFactoryImpl extends FactoryBase implements JavaFactory
> {
>
> @@ -78,7 +76,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 JAVA_INFO = 1;
> public static final int BOOLEAN_OBJECT = 2;
> @@ -107,11 +105,17 @@
> * <!-- begin-user-doc -->
> * <!-- end-user-doc -->
> * @generated
> - */
> - public void register(HelperContext scope) {
> + */
> + public void register(HelperContext scope)
> + {
> if(scope == null) {
> - throw new IllegalArgumentException("Scope can not be null");
> - }
> + throw new IllegalArgumentException("Scope can not be null");
> + }
> +
> + //Register dependent packages with provided scope
> + ModelFactory.INSTANCE.register(scope);
> +
> + // Initialize this package
> TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
> th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
> }
> @@ -266,28 +270,25 @@
> }
>
>
> - private static boolean isInited = false;
> -
> + private static JavaFactoryImpl instance = null;
> public static JavaFactoryImpl init()
> {
> - if (isInited) return (JavaFactoryImpl)FactoryBase.getStaticFactory(JavaFactoryImpl.NAMESPACE_URI);
> - JavaFactoryImpl theJavaFactoryImpl = new JavaFactoryImpl();
> - isInited = true;
> -
> - // Initialize simple dependencies
> - SDOUtil.registerStaticTypes(SDOFactory.class);
> - SDOUtil.registerStaticTypes(ModelFactory.class);
> + if (instance != null ) return instance;
> + instance = new JavaFactoryImpl();
>
> + // Initialize dependent packages
> + ModelFactory ModelFactoryInstance = ModelFactory.INSTANCE;
> +
> // Create package meta-data objects
> - theJavaFactoryImpl.createMetaData();
> + instance.createMetaData();
>
> // Initialize created meta-data
> - theJavaFactoryImpl.initializeMetaData();
> -
> + instance.initializeMetaData();
> +
> // Mark meta-data to indicate it can't be changed
> //theJavaFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
>
> - return theJavaFactoryImpl;
> + return instance;
> }
>
> private boolean isCreated = false;
> @@ -298,7 +299,7 @@
> isCreated = true;
>
> // Create types and their properties
> - javaInfoType = createType(false, JAVA_INFO);
> + javaInfoType = createType(false, JAVA_INFO);
> createProperty(true, javaInfoType,JavaInfoImpl.INTERNAL_JAVA_CLASS);
>
> // Create data types
> @@ -320,14 +321,14 @@
> isInitialized = true;
>
> // Obtain other dependent packages
> - ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)FactoryBase.getStaticFactory(ModelFactoryImpl.NAMESPACE_URI);
> + ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactory.INSTANCE;
> Property property = null;
>
> // Add supertypes to types
>
> // Initialize types and properties
> initializeType(javaInfoType, JavaInfo.class, "JavaInfo", false);
> - property = getProperty(javaInfoType, JavaInfoImpl.INTERNAL_JAVA_CLASS);
> + property = getLocalProperty(javaInfoType, 0);
> initializeProperty(property, theModelPackageImpl.getString(), "javaClass", null, 0, 1, JavaInfo.class, false, true, false);
>
> // Initialize data types
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -147,7 +147,7 @@
> boolean oldJavaClass_set_ = javaClass_set_;
> javaClass_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, JAVA_CLASS, oldJavaClass, javaClass, !oldJavaClass_set_);
> + notify(ChangeKind.SET, INTERNAL_JAVA_CLASS, oldJavaClass, javaClass, !oldJavaClass_set_);
> }
>
> /**
> @@ -162,7 +162,7 @@
> javaClass = JAVA_CLASS_DEFAULT_;
> javaClass_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, JAVA_CLASS, oldJavaClass, JAVA_CLASS_DEFAULT_, oldJavaClass_set_);
> + notify(ChangeKind.UNSET, INTERNAL_JAVA_CLASS, oldJavaClass, JAVA_CLASS_DEFAULT_, oldJavaClass_set_);
> }
>
> /**
>
> Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java?view=diff&rev=558163&r1=558162&r2=558163
> ==============================================================================
> --- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java (original)
> +++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java Fri Jul 20 14:51:12 2007
> @@ -26,17 +26,17 @@
> import commonj.sdo.Property;
> import commonj.sdo.Type;
>
> -import org.apache.tuscany.sdo.SDOFactory;
> -
> import org.apache.tuscany.sdo.impl.FactoryBase;
>
> import org.apache.tuscany.sdo.model.ModelFactory;
>
> import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
>
> -import org.apache.tuscany.sdo.model.xml.*;
> +import org.apache.tuscany.sdo.model.internal.InternalFactory;
>
> -import org.apache.tuscany.sdo.util.SDOUtil;
> +import org.apache.tuscany.sdo.model.internal.impl.InternalFactoryImpl;
> +
> +import org.apache.tuscany.sdo.model.xml.*;
>
> /**
> * <!-- begin-user-doc -->
> @@ -45,7 +45,8 @@
> * Until the SDO code generator supports name conflicts and regen/merge, follow the following steps to regenerate this model:
> * 1. Regenerate the model into a temporary directory:
> * XSD2JavaGenerator -generateBuiltIn commonj.sdo/xml -prefix XML -targetDirectory <temp-dir> -javaPackage org.apache.tuscany.sdo.model.xml <sdo-api-dir>/src/main/resources/xml/sdoXML.xsd
> - * 2. Move this JavaDoc comment into the newly generated XMLFactoryImpl class.
> + * 2. Make sure the top of each generated file contains the ASF License.
> + * 3. Move this JavaDoc comment into the newly generated XMLFactoryImpl class.
> * <!-- end-user-doc -->
> * @generated
> */
> @@ -74,7 +75,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 XML_INFO = 1;
>
> @@ -95,11 +96,18 @@
> * <!-- begin-user-doc -->
> * <!-- end-user-doc -->
> * @generated
> - */
> - public void register(HelperContext scope) {
> + */
> + public void register(HelperContext scope)
> + {
> if(scope == null) {
> - throw new IllegalArgumentException("Scope can not be null");
> - }
> + throw new IllegalArgumentException("Scope can not be null");
> + }
> +
> + //Register dependent packages with provided scope
> + ModelFactory.INSTANCE.register(scope);
> + InternalFactory.INSTANCE.register(scope);
> +
> + // Initialize this package
> TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
> th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
> }
> @@ -139,28 +147,26 @@
> }
>
>
> - private static boolean isInited = false;
> -
> + private static XMLFactoryImpl instance = null;
> public static XMLFactoryImpl init()
> {
> - if (isInited) return (XMLFactoryImpl)FactoryBase.getStaticFactory(XMLFactoryImpl.NAMESPACE_URI);
> - XMLFactoryImpl theXMLFactoryImpl = new XMLFactoryImpl();
> - isInited = true;
> -
> - // Initialize simple dependencies
> - SDOUtil.registerStaticTypes(SDOFactory.class);
> - SDOUtil.registerStaticTypes(ModelFactory.class);
> + if (instance != null ) return instance;
> + instance = new XMLFactoryImpl();
>
> + // Initialize dependent packages
> + ModelFactory ModelFactoryInstance = ModelFactory.INSTANCE;
> + InternalFactory InternalFactoryInstance = InternalFactory.INSTANCE;
> +
> // Create package meta-data objects
> - theXMLFactoryImpl.createMetaData();
> + instance.createMetaData();
>
> // Initialize created meta-data
> - theXMLFactoryImpl.initializeMetaData();
> -
> + instance.initializeMetaData();
> +
> // Mark meta-data to indicate it can't be changed
> //theXMLFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
>
> - return theXMLFactoryImpl;
> + return instance;
> }
>
> private boolean isCreated = false;
> @@ -171,7 +177,7 @@
> isCreated = true;
>
> // Create types and their properties
> - xmlInfoType = createType(false, XML_INFO);
> + xmlInfoType = createType(false, XML_INFO);
> createProperty(true, xmlInfoType,XMLInfoImpl.INTERNAL_XML_ELEMENT);
> }
>
> @@ -183,20 +189,21 @@
> isInitialized = true;
>
> // Obtain other dependent packages
> - ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)FactoryBase.getStaticFactory(ModelFactoryImpl.NAMESPACE_URI);
> + ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactory.INSTANCE;
> + InternalFactoryImpl theInternalPackageImpl = (InternalFactoryImpl)InternalFactory.INSTANCE;
> Property property = null;
>
> // Add supertypes to types
>
> // Initialize types and properties
> initializeType(xmlInfoType, XMLInfo.class, "XMLInfo", false);
> - property = getProperty(xmlInfoType, XMLInfoImpl.INTERNAL_XML_ELEMENT);
> + property = getLocalProperty(xmlInfoType, 0);
> initializeProperty(property, theModelPackageImpl.getBoolean(), "xmlElement", null, 0, 1, XMLInfo.class, false, true, false);
>
> - createXSDMetaData(theModelPackageImpl);
> + createXSDMetaData(theModelPackageImpl, theInternalPackageImpl);
> }
>
> - protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl)
> + protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl, InternalFactoryImpl theInternalPackageImpl)
> {
> super.initXSD();
>
> @@ -216,7 +223,7 @@
>
> property = createGlobalProperty
> ("dataType",
> - theModelPackageImpl.getURI(),
> + theInternalPackageImpl.getQName(),
> new String[]
> {
> "kind", "attribute",
> @@ -260,7 +267,7 @@
>
> property = createGlobalProperty
> ("propertyType",
> - theModelPackageImpl.getURI(),
> + theInternalPackageImpl.getQName(),
> new String[]
> {
> "kind", "attribute",
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -147,7 +147,7 @@
> boolean oldXmlElement_set_ = xmlElement_set_;
> xmlElement_set_ = true;
> if (isNotifying())
> - notify(ChangeKind.SET, XML_ELEMENT, oldXmlElement, xmlElement, !oldXmlElement_set_);
> + notify(ChangeKind.SET, INTERNAL_XML_ELEMENT, oldXmlElement, xmlElement, !oldXmlElement_set_);
> }
>
> /**
> @@ -162,7 +162,7 @@
> xmlElement = XML_ELEMENT_DEFAULT_;
> xmlElement_set_ = false;
> if (isNotifying())
> - notify(ChangeKind.UNSET, XML_ELEMENT, oldXmlElement, XML_ELEMENT_DEFAULT_, oldXmlElement_set_);
> + notify(ChangeKind.UNSET, INTERNAL_XML_ELEMENT, oldXmlElement, XML_ELEMENT_DEFAULT_, oldXmlElement_set_);
> }
>
> /**
>
> Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java?view=diff&rev=558163&r1=558162&r2=558163
> ==============================================================================
> --- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java (original)
> +++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java Fri Jul 20 14:51:12 2007
> @@ -37,6 +37,7 @@
> import org.apache.tuscany.sdo.SDOFactory;
> import org.apache.tuscany.sdo.SDOPackage;
> import org.apache.tuscany.sdo.api.SDOUtil;
> +import org.apache.tuscany.sdo.helper.HelperContextImpl;
> import org.apache.tuscany.sdo.impl.ClassImpl;
> import org.apache.tuscany.sdo.impl.DataGraphImpl;
> import org.apache.tuscany.sdo.model.ModelFactory;
> @@ -55,6 +56,7 @@
> import org.eclipse.emf.ecore.EReference;
> import org.eclipse.emf.ecore.EStructuralFeature;
> import org.eclipse.emf.ecore.EcorePackage;
> +import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
> import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
> import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.ecore.resource.ResourceSet;
> @@ -2537,6 +2539,7 @@
> protected static void configureResourceSet(ResourceSet resourceSet)
> {
> resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().putAll(getRegistrations());
> + resourceSet.setPackageRegistry(new EPackageRegistryImpl(HelperContextImpl.getBuiltInModelRegistry()));
> // resourceSet.setURIConverter(new SDOURIConverterImpl());
> }
>
>
> 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=558163&r1=558162&r2=558163
> ==============================================================================
> --- 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 Fri Jul 20 14:51:12 2007
> @@ -17,7 +17,7 @@
> return result;
> }
>
> - protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
> + public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
> protected final String TEXT_1 = "";
> protected final String TEXT_2 = "/**" + NL + " * <copyright>" + NL + " * </copyright>" + NL + " *" + NL + " * ";
> protected final String TEXT_3 = "Id";
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-commits-help@ws.apache.org
>
>
--
Luciano Resende
Apache Tuscany Committer
http://people.apache.org/~lresende
http://lresende.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org