You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2006/02/09 16:33:01 UTC

svn commit: r376322 [5/5] - in /incubator/tuscany/java/das/rdb/src: main/java/org/apache/tuscany/das/rdb/ main/java/org/apache/tuscany/das/rdb/generator/impl/ main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ main/java/org/apache/tuscany/das/rdb/...

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerFactoryImpl.java?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerFactoryImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerFactoryImpl.java Thu Feb  9 07:32:58 2006
@@ -1,18 +1,8 @@
 /**
+ * <copyright>
+ * </copyright>
  *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed 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.
+ * $Id$
  */
 package org.apache.tuscany.das.rdb.test.customer.impl;
 
@@ -20,88 +10,131 @@
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
  * @generated
  */
-public class CustomerFactoryImpl extends EFactoryImpl implements CustomerFactory {
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomerFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case CustomerPackage.AN_ORDER: return (EObject)createAnOrder();
-			case CustomerPackage.CUSTOMER: return (EObject)createCustomer();
-			case CustomerPackage.DATA_GRAPH_ROOT: return (EObject)createDataGraphRoot();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AnOrder createAnOrder() {
-		AnOrderImpl anOrder = new AnOrderImpl();
-		return anOrder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Customer createCustomer() {
-		CustomerImpl customer = new CustomerImpl();
-		return customer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DataGraphRoot createDataGraphRoot() {
-		DataGraphRootImpl dataGraphRoot = new DataGraphRootImpl();
-		return dataGraphRoot;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomerPackage getCustomerPackage() {
-		return (CustomerPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static CustomerPackage getPackage() {
-		return CustomerPackage.eINSTANCE;
-	}
+public class CustomerFactoryImpl extends EFactoryImpl implements CustomerFactory
+{
+  /**
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final CustomerFactoryImpl eINSTANCE = init();
+
+  /**
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static CustomerFactoryImpl init()
+  {
+    try
+    {
+      CustomerFactoryImpl theCustomerFactory = (CustomerFactoryImpl)EPackage.Registry.INSTANCE.getEFactory("http:///org.apache.tuscany.das.rdb.test/customer.xsd"); 
+      if (theCustomerFactory != null)
+      {
+        return theCustomerFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new CustomerFactoryImpl();
+  }
+
+  /**
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public CustomerFactoryImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EObject create(EClass eClass)
+  {
+    switch (eClass.getClassifierID())
+    {
+      case CustomerPackageImpl.AN_ORDER: return (EObject)createAnOrder();
+      case CustomerPackageImpl.CUSTOMER: return (EObject)createCustomer();
+      case CustomerPackageImpl.DATA_GRAPH_ROOT: return (EObject)createDataGraphRoot();
+      default:
+        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public AnOrder createAnOrder()
+  {
+    AnOrderImpl anOrder = new AnOrderImpl();
+    return anOrder;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Customer createCustomer()
+  {
+    CustomerImpl customer = new CustomerImpl();
+    return customer;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public DataGraphRoot createDataGraphRoot()
+  {
+    DataGraphRootImpl dataGraphRoot = new DataGraphRootImpl();
+    return dataGraphRoot;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public CustomerPackageImpl getCustomerPackageImpl()
+  {
+    return (CustomerPackageImpl)getEPackage();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @deprecated
+   * @generated
+   */
+  public static CustomerPackageImpl getPackage()
+  {
+    return CustomerPackageImpl.eINSTANCE;
+  }
 
 } //CustomerFactoryImpl

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerImpl.java?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerImpl.java Thu Feb  9 07:32:58 2006
@@ -1,18 +1,8 @@
 /**
+ * <copyright>
+ * </copyright>
  *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed 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.
+ * $Id$
  */
 package org.apache.tuscany.das.rdb.test.customer.impl;
 
@@ -21,7 +11,8 @@
 
 import org.apache.tuscany.das.rdb.test.customer.AnOrder;
 import org.apache.tuscany.das.rdb.test.customer.Customer;
-import org.apache.tuscany.das.rdb.test.customer.CustomerPackage;
+
+import org.apache.tuscany.sdo.impl.DataObjectImpl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -29,13 +20,10 @@
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
@@ -55,323 +43,343 @@
  *
  * @generated
  */
-public class CustomerImpl extends EDataObjectImpl implements Customer {
-	/**
-	 * The default value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected int iD = ID_EDEFAULT;
-
-	/**
-	 * This is true if the ID attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean iDESet = false;
-
-	/**
-	 * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLastName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LAST_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLastName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lastName = LAST_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADDRESS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddress()
-	 * @generated
-	 * @ordered
-	 */
-	protected String address = ADDRESS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getOrders() <em>Orders</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrders()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList orders = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CustomerPackage.eINSTANCE.getCustomer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getID() {
-		return iD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setID(int newID) {
-		int oldID = iD;
-		iD = newID;
-		boolean oldIDESet = iDESet;
-		iDESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CustomerPackage.CUSTOMER__ID, oldID, iD, !oldIDESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetID() {
-		int oldID = iD;
-		boolean oldIDESet = iDESet;
-		iD = ID_EDEFAULT;
-		iDESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CustomerPackage.CUSTOMER__ID, oldID, ID_EDEFAULT, oldIDESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetID() {
-		return iDESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLastName() {
-		return lastName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLastName(String newLastName) {
-		String oldLastName = lastName;
-		lastName = newLastName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CustomerPackage.CUSTOMER__LAST_NAME, oldLastName, lastName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAddress() {
-		return address;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAddress(String newAddress) {
-		String oldAddress = address;
-		address = newAddress;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CustomerPackage.CUSTOMER__ADDRESS, oldAddress, address));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getOrders() {
-		if (orders == null) {
-			orders = new EObjectContainmentEList(AnOrder.class, this, CustomerPackage.CUSTOMER__ORDERS);
-		}
-		return orders;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CustomerPackage.CUSTOMER__ORDERS:
-					return ((InternalEList)getOrders()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CustomerPackage.CUSTOMER__ID:
-				return new Integer(getID());
-			case CustomerPackage.CUSTOMER__LAST_NAME:
-				return getLastName();
-			case CustomerPackage.CUSTOMER__ADDRESS:
-				return getAddress();
-			case CustomerPackage.CUSTOMER__ORDERS:
-				return getOrders();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CustomerPackage.CUSTOMER__ID:
-				setID(((Integer)newValue).intValue());
-				return;
-			case CustomerPackage.CUSTOMER__LAST_NAME:
-				setLastName((String)newValue);
-				return;
-			case CustomerPackage.CUSTOMER__ADDRESS:
-				setAddress((String)newValue);
-				return;
-			case CustomerPackage.CUSTOMER__ORDERS:
-				getOrders().clear();
-				getOrders().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CustomerPackage.CUSTOMER__ID:
-				unsetID();
-				return;
-			case CustomerPackage.CUSTOMER__LAST_NAME:
-				setLastName(LAST_NAME_EDEFAULT);
-				return;
-			case CustomerPackage.CUSTOMER__ADDRESS:
-				setAddress(ADDRESS_EDEFAULT);
-				return;
-			case CustomerPackage.CUSTOMER__ORDERS:
-				getOrders().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CustomerPackage.CUSTOMER__ID:
-				return isSetID();
-			case CustomerPackage.CUSTOMER__LAST_NAME:
-				return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
-			case CustomerPackage.CUSTOMER__ADDRESS:
-				return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
-			case CustomerPackage.CUSTOMER__ORDERS:
-				return orders != null && !orders.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (iD: ");
-		if (iDESet) result.append(iD); else result.append("<unset>");
-		result.append(", lastName: ");
-		result.append(lastName);
-		result.append(", address: ");
-		result.append(address);
-		result.append(')');
-		return result.toString();
-	}
+public class CustomerImpl extends DataObjectImpl implements Customer
+{
+  /**
+   * The default value of the '{@link #getID() <em>ID</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getID()
+   * @generated
+   * @ordered
+   */
+  protected static final int ID_EDEFAULT = 0;
+
+  /**
+   * The cached value of the '{@link #getID() <em>ID</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getID()
+   * @generated
+   * @ordered
+   */
+  protected int iD = ID_EDEFAULT;
+
+  /**
+   * This is true if the ID attribute has been set.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  protected boolean iDESet = false;
+
+  /**
+   * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLastName()
+   * @generated
+   * @ordered
+   */
+  protected static final String LAST_NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLastName()
+   * @generated
+   * @ordered
+   */
+  protected String lastName = LAST_NAME_EDEFAULT;
+
+  /**
+   * The default value of the '{@link #getAddress() <em>Address</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getAddress()
+   * @generated
+   * @ordered
+   */
+  protected static final String ADDRESS_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getAddress() <em>Address</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getAddress()
+   * @generated
+   * @ordered
+   */
+  protected String address = ADDRESS_EDEFAULT;
+
+  /**
+   * The cached value of the '{@link #getOrders() <em>Orders</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOrders()
+   * @generated
+   * @ordered
+   */
+  protected EList orders = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected CustomerImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected EClass eStaticClass()
+  {
+    return CustomerPackageImpl.Literals.CUSTOMER;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public int getID()
+  {
+    return iD;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setID(int newID)
+  {
+    int oldID = iD;
+    iD = newID;
+    boolean oldIDESet = iDESet;
+    iDESet = true;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CustomerPackageImpl.CUSTOMER__ID, oldID, iD, !oldIDESet));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void unsetID()
+  {
+    int oldID = iD;
+    boolean oldIDESet = iDESet;
+    iD = ID_EDEFAULT;
+    iDESet = false;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.UNSET, CustomerPackageImpl.CUSTOMER__ID, oldID, ID_EDEFAULT, oldIDESet));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public boolean isSetID()
+  {
+    return iDESet;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getLastName()
+  {
+    return lastName;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setLastName(String newLastName)
+  {
+    String oldLastName = lastName;
+    lastName = newLastName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CustomerPackageImpl.CUSTOMER__LAST_NAME, oldLastName, lastName));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getAddress()
+  {
+    return address;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setAddress(String newAddress)
+  {
+    String oldAddress = address;
+    address = newAddress;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, CustomerPackageImpl.CUSTOMER__ADDRESS, oldAddress, address));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public List getOrders()
+  {
+    if (orders == null)
+    {
+      orders = new EObjectContainmentEList(AnOrder.class, this, CustomerPackageImpl.CUSTOMER__ORDERS);
+    }
+    return orders;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.CUSTOMER__ORDERS:
+        return ((InternalEList)getOrders()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.CUSTOMER__ID:
+        return new Integer(getID());
+      case CustomerPackageImpl.CUSTOMER__LAST_NAME:
+        return getLastName();
+      case CustomerPackageImpl.CUSTOMER__ADDRESS:
+        return getAddress();
+      case CustomerPackageImpl.CUSTOMER__ORDERS:
+        return getOrders();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.CUSTOMER__ID:
+        setID(((Integer)newValue).intValue());
+        return;
+      case CustomerPackageImpl.CUSTOMER__LAST_NAME:
+        setLastName((String)newValue);
+        return;
+      case CustomerPackageImpl.CUSTOMER__ADDRESS:
+        setAddress((String)newValue);
+        return;
+      case CustomerPackageImpl.CUSTOMER__ORDERS:
+        getOrders().clear();
+        getOrders().addAll((Collection)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.CUSTOMER__ID:
+        unsetID();
+        return;
+      case CustomerPackageImpl.CUSTOMER__LAST_NAME:
+        setLastName(LAST_NAME_EDEFAULT);
+        return;
+      case CustomerPackageImpl.CUSTOMER__ADDRESS:
+        setAddress(ADDRESS_EDEFAULT);
+        return;
+      case CustomerPackageImpl.CUSTOMER__ORDERS:
+        getOrders().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.CUSTOMER__ID:
+        return isSetID();
+      case CustomerPackageImpl.CUSTOMER__LAST_NAME:
+        return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
+      case CustomerPackageImpl.CUSTOMER__ADDRESS:
+        return ADDRESS_EDEFAULT == null ? address != null : !ADDRESS_EDEFAULT.equals(address);
+      case CustomerPackageImpl.CUSTOMER__ORDERS:
+        return orders != null && !orders.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (iD: ");
+    if (iDESet) result.append(iD); else result.append("<unset>");
+    result.append(", lastName: ");
+    result.append(lastName);
+    result.append(", address: ");
+    result.append(address);
+    result.append(')');
+    return result.toString();
+  }
 
 } //CustomerImpl

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerPackageImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerPackageImpl.java?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerPackageImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/CustomerPackageImpl.java Thu Feb  9 07:32:58 2006
@@ -1,29 +1,19 @@
 /**
+ * <copyright>
+ * </copyright>
  *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed 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.
+ * $Id$
  */
 package org.apache.tuscany.das.rdb.test.customer.impl;
 
 import org.apache.tuscany.das.rdb.test.customer.AnOrder;
 import org.apache.tuscany.das.rdb.test.customer.Customer;
 import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
-import org.apache.tuscany.das.rdb.test.customer.CustomerPackage;
 import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -31,421 +21,817 @@
 
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 
-import org.eclipse.emf.ecore.xml.type.impl.XMLTypePackageImpl;
-
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
  * <!-- end-user-doc -->
+ * @see org.apache.tuscany.das.rdb.test.customer.CustomerFactory
  * @generated
  */
-public class CustomerPackageImpl extends EPackageImpl implements CustomerPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass anOrderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass dataGraphRootEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.apache.tuscany.das.rdb.test.customer.CustomerPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private CustomerPackageImpl() {
-		super(eNS_URI, CustomerFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static CustomerPackage init() {
-		if (isInited) return (CustomerPackage)EPackage.Registry.INSTANCE.getEPackage(CustomerPackage.eNS_URI);
-
-		// Obtain or create and register package
-		CustomerPackageImpl theCustomerPackage = (CustomerPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CustomerPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CustomerPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		XMLTypePackageImpl.init();
-
-		// Create package meta-data objects
-		theCustomerPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theCustomerPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theCustomerPackage.freeze();
-
-		return theCustomerPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAnOrder() {
-		return anOrderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAnOrder_ID() {
-		return (EAttribute)anOrderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAnOrder_Product() {
-		return (EAttribute)anOrderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAnOrder_Quantity() {
-		return (EAttribute)anOrderEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAnOrder_CustomerID() {
-		return (EAttribute)anOrderEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomer() {
-		return customerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomer_ID() {
-		return (EAttribute)customerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomer_LastName() {
-		return (EAttribute)customerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomer_Address() {
-		return (EAttribute)customerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCustomer_Orders() {
-		return (EReference)customerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDataGraphRoot() {
-		return dataGraphRootEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDataGraphRoot_Customers() {
-		return (EReference)dataGraphRootEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDataGraphRoot_Orders() {
-		return (EReference)dataGraphRootEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomerFactory getCustomerFactory() {
-		return (CustomerFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		anOrderEClass = createEClass(AN_ORDER);
-		createEAttribute(anOrderEClass, AN_ORDER__ID);
-		createEAttribute(anOrderEClass, AN_ORDER__PRODUCT);
-		createEAttribute(anOrderEClass, AN_ORDER__QUANTITY);
-		createEAttribute(anOrderEClass, AN_ORDER__CUSTOMER_ID);
-
-		customerEClass = createEClass(CUSTOMER);
-		createEAttribute(customerEClass, CUSTOMER__ID);
-		createEAttribute(customerEClass, CUSTOMER__LAST_NAME);
-		createEAttribute(customerEClass, CUSTOMER__ADDRESS);
-		createEReference(customerEClass, CUSTOMER__ORDERS);
-
-		dataGraphRootEClass = createEClass(DATA_GRAPH_ROOT);
-		createEReference(dataGraphRootEClass, DATA_GRAPH_ROOT__CUSTOMERS);
-		createEReference(dataGraphRootEClass, DATA_GRAPH_ROOT__ORDERS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		XMLTypePackageImpl theXMLTypePackage = (XMLTypePackageImpl)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(anOrderEClass, AnOrder.class, "AnOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAnOrder_ID(), theXMLTypePackage.getInt(), "iD", null, 1, 1, AnOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAnOrder_Product(), theXMLTypePackage.getString(), "product", null, 1, 1, AnOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAnOrder_Quantity(), theXMLTypePackage.getInt(), "quantity", null, 1, 1, AnOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAnOrder_CustomerID(), theXMLTypePackage.getInt(), "customerID", null, 1, 1, AnOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCustomer_ID(), theXMLTypePackage.getInt(), "iD", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCustomer_LastName(), theXMLTypePackage.getString(), "lastName", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCustomer_Address(), theXMLTypePackage.getString(), "address", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCustomer_Orders(), this.getAnOrder(), null, "orders", null, 1, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(dataGraphRootEClass, DataGraphRoot.class, "DataGraphRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDataGraphRoot_Customers(), this.getCustomer(), null, "customers", null, 0, -1, DataGraphRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDataGraphRoot_Orders(), this.getAnOrder(), null, "orders", null, 0, -1, DataGraphRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-		createExtendedMetaDataAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createExtendedMetaDataAnnotations() {
-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
-		addAnnotation
-		  (anOrderEClass, 
-		   source, 
-		   new String[] {
-			 "name", "AnOrder",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getAnOrder_ID(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ID"
-		   });		
-		addAnnotation
-		  (getAnOrder_Product(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Product"
-		   });		
-		addAnnotation
-		  (getAnOrder_Quantity(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Quantity"
-		   });		
-		addAnnotation
-		  (getAnOrder_CustomerID(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "Customer_ID"
-		   });		
-		addAnnotation
-		  (customerEClass, 
-		   source, 
-		   new String[] {
-			 "name", "Customer",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getCustomer_ID(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "ID"
-		   });		
-		addAnnotation
-		  (getCustomer_LastName(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "lastName"
-		   });		
-		addAnnotation
-		  (getCustomer_Address(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "address"
-		   });		
-		addAnnotation
-		  (getCustomer_Orders(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "orders"
-		   });		
-		addAnnotation
-		  (dataGraphRootEClass, 
-		   source, 
-		   new String[] {
-			 "name", "DataGraphRoot",
-			 "kind", "elementOnly"
-		   });		
-		addAnnotation
-		  (getDataGraphRoot_Customers(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "customers"
-		   });		
-		addAnnotation
-		  (getDataGraphRoot_Orders(), 
-		   source, 
-		   new String[] {
-			 "kind", "element",
-			 "name", "orders"
-		   });
-	}
+public class CustomerPackageImpl extends EPackageImpl
+{
+  /**
+   * The package name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final String eNAME = "customer";
+
+  /**
+   * The package namespace URI.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final String eNS_URI = "http:///org.apache.tuscany.das.rdb.test/customer.xsd";
+
+  /**
+   * The package namespace name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final String eNS_PREFIX = "customer";
+
+  /**
+   * The singleton instance of the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final CustomerPackageImpl eINSTANCE = org.apache.tuscany.das.rdb.test.customer.impl.CustomerPackageImpl.init();
+
+  /**
+   * The meta object id for the '{@link org.apache.tuscany.das.rdb.test.customer.impl.AnOrderImpl <em>An Order</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.apache.tuscany.das.rdb.test.customer.impl.AnOrderImpl
+   * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerPackageImpl#getAnOrder()
+   * @generated
+   */
+  public static final int AN_ORDER = 0;
+
+  /**
+   * The feature id for the '<em><b>ID</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int AN_ORDER__ID = 0;
+
+  /**
+   * The feature id for the '<em><b>Product</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int AN_ORDER__PRODUCT = 1;
+
+  /**
+   * The feature id for the '<em><b>Quantity</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int AN_ORDER__QUANTITY = 2;
+
+  /**
+   * The feature id for the '<em><b>Customer ID</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int AN_ORDER__CUSTOMER_ID = 3;
+
+  /**
+   * The number of structural features of the '<em>An Order</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int AN_ORDER_FEATURE_COUNT = 4;
+
+  /**
+   * The meta object id for the '{@link org.apache.tuscany.das.rdb.test.customer.impl.CustomerImpl <em>Customer</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerImpl
+   * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerPackageImpl#getCustomer()
+   * @generated
+   */
+  public static final int CUSTOMER = 1;
+
+  /**
+   * The feature id for the '<em><b>ID</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int CUSTOMER__ID = 0;
+
+  /**
+   * The feature id for the '<em><b>Last Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int CUSTOMER__LAST_NAME = 1;
+
+  /**
+   * The feature id for the '<em><b>Address</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int CUSTOMER__ADDRESS = 2;
+
+  /**
+   * The feature id for the '<em><b>Orders</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int CUSTOMER__ORDERS = 3;
+
+  /**
+   * The number of structural features of the '<em>Customer</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int CUSTOMER_FEATURE_COUNT = 4;
+
+  /**
+   * The meta object id for the '{@link org.apache.tuscany.das.rdb.test.customer.impl.DataGraphRootImpl <em>Data Graph Root</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.apache.tuscany.das.rdb.test.customer.impl.DataGraphRootImpl
+   * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerPackageImpl#getDataGraphRoot()
+   * @generated
+   */
+  public static final int DATA_GRAPH_ROOT = 2;
+
+  /**
+   * The feature id for the '<em><b>Customers</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int DATA_GRAPH_ROOT__CUSTOMERS = 0;
+
+  /**
+   * The feature id for the '<em><b>Orders</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int DATA_GRAPH_ROOT__ORDERS = 1;
+
+  /**
+   * The number of structural features of the '<em>Data Graph Root</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  public static final int DATA_GRAPH_ROOT_FEATURE_COUNT = 2;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass anOrderEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass customerEClass = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private EClass dataGraphRootEClass = null;
+
+  /**
+   * Creates an instance of the model <b>Package</b>, registered with
+   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+   * package URI value.
+   * <p>Note: the correct way to create the package is via the static
+   * factory method {@link #init init()}, which also performs
+   * initialization of the package, or returns the registered package,
+   * if one already exists.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.ecore.EPackage.Registry
+   * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerPackageImpl#eNS_URI
+   * @see #init()
+   * @generated
+   */
+  private CustomerPackageImpl()
+  {
+    super(eNS_URI, ((EFactory)CustomerFactory.INSTANCE));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static boolean isInited = false;
+
+  /**
+   * Creates, registers, and initializes the <b>Package</b> for this
+   * model, and for any others upon which it depends.  Simple
+   * dependencies are satisfied by calling this method on all
+   * dependent packages before doing anything else.  This method drives
+   * initialization for interdependent packages directly, in parallel
+   * with this package, itself.
+   * <p>Of this package and its interdependencies, all packages which
+   * have not yet been registered by their URI values are first created
+   * and registered.  The packages are then initialized in two steps:
+   * meta-model objects for all of the packages are created before any
+   * are initialized, since one package's meta-model objects may refer to
+   * those of another.
+   * <p>Invocation of this method will not affect any packages that have
+   * already been initialized.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #eNS_URI
+   * @see #createPackageContents()
+   * @see #initializePackageContents()
+   * @generated
+   */
+  public static CustomerPackageImpl init()
+  {
+    if (isInited) return (CustomerPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CustomerPackageImpl.eNS_URI);
+
+    // Obtain or create and register package
+    CustomerPackageImpl theCustomerPackageImpl = (CustomerPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CustomerPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CustomerPackageImpl());
+
+    isInited = true;
+
+    // Initialize simple dependencies
+    XMLTypePackage.eINSTANCE.eClass();
+
+    // Create package meta-data objects
+    theCustomerPackageImpl.createPackageContents();
+
+    // Initialize created meta-data
+    theCustomerPackageImpl.initializePackageContents();
+
+    // Mark meta-data to indicate it can't be changed
+    theCustomerPackageImpl.freeze();
+
+    return theCustomerPackageImpl;
+  }
+
+
+  /**
+   * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.test.customer.AnOrder <em>An Order</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>An Order</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.AnOrder
+   * @generated
+   */
+  public EClass getAnOrder()
+  {
+    return anOrderEClass;
+  }
+
+  /**
+   * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.test.customer.AnOrder#getID <em>ID</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>ID</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.AnOrder#getID()
+   * @see #getAnOrder()
+   * @generated
+   */
+  public EAttribute getAnOrder_ID()
+  {
+    return (EAttribute)anOrderEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.test.customer.AnOrder#getProduct <em>Product</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Product</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.AnOrder#getProduct()
+   * @see #getAnOrder()
+   * @generated
+   */
+  public EAttribute getAnOrder_Product()
+  {
+    return (EAttribute)anOrderEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.test.customer.AnOrder#getQuantity <em>Quantity</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Quantity</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.AnOrder#getQuantity()
+   * @see #getAnOrder()
+   * @generated
+   */
+  public EAttribute getAnOrder_Quantity()
+  {
+    return (EAttribute)anOrderEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.test.customer.AnOrder#getCustomerID <em>Customer ID</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Customer ID</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.AnOrder#getCustomerID()
+   * @see #getAnOrder()
+   * @generated
+   */
+  public EAttribute getAnOrder_CustomerID()
+  {
+    return (EAttribute)anOrderEClass.getEStructuralFeatures().get(3);
+  }
+
+  /**
+   * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.test.customer.Customer <em>Customer</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Customer</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.Customer
+   * @generated
+   */
+  public EClass getCustomer()
+  {
+    return customerEClass;
+  }
+
+  /**
+   * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.test.customer.Customer#getID <em>ID</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>ID</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.Customer#getID()
+   * @see #getCustomer()
+   * @generated
+   */
+  public EAttribute getCustomer_ID()
+  {
+    return (EAttribute)customerEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.test.customer.Customer#getLastName <em>Last Name</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Last Name</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.Customer#getLastName()
+   * @see #getCustomer()
+   * @generated
+   */
+  public EAttribute getCustomer_LastName()
+  {
+    return (EAttribute)customerEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * Returns the meta object for the attribute '{@link org.apache.tuscany.das.rdb.test.customer.Customer#getAddress <em>Address</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Address</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.Customer#getAddress()
+   * @see #getCustomer()
+   * @generated
+   */
+  public EAttribute getCustomer_Address()
+  {
+    return (EAttribute)customerEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.test.customer.Customer#getOrders <em>Orders</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Orders</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.Customer#getOrders()
+   * @see #getCustomer()
+   * @generated
+   */
+  public EReference getCustomer_Orders()
+  {
+    return (EReference)customerEClass.getEStructuralFeatures().get(3);
+  }
+
+  /**
+   * Returns the meta object for class '{@link org.apache.tuscany.das.rdb.test.customer.DataGraphRoot <em>Data Graph Root</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Data Graph Root</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.DataGraphRoot
+   * @generated
+   */
+  public EClass getDataGraphRoot()
+  {
+    return dataGraphRootEClass;
+  }
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.test.customer.DataGraphRoot#getCustomers <em>Customers</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Customers</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.DataGraphRoot#getCustomers()
+   * @see #getDataGraphRoot()
+   * @generated
+   */
+  public EReference getDataGraphRoot_Customers()
+  {
+    return (EReference)dataGraphRootEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * Returns the meta object for the containment reference list '{@link org.apache.tuscany.das.rdb.test.customer.DataGraphRoot#getOrders <em>Orders</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Orders</em>'.
+   * @see org.apache.tuscany.das.rdb.test.customer.DataGraphRoot#getOrders()
+   * @see #getDataGraphRoot()
+   * @generated
+   */
+  public EReference getDataGraphRoot_Orders()
+  {
+    return (EReference)dataGraphRootEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the factory that creates the instances of the model.
+   * @generated
+   */
+  public CustomerFactory getCustomerFactory()
+  {
+    return (CustomerFactory)getEFactoryInstance();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private boolean isCreated = false;
+
+  /**
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void createPackageContents()
+  {
+    if (isCreated) return;
+    isCreated = true;
+
+    // Create classes and their features
+    anOrderEClass = createEClass(AN_ORDER);
+    createEAttribute(anOrderEClass, AN_ORDER__ID);
+    createEAttribute(anOrderEClass, AN_ORDER__PRODUCT);
+    createEAttribute(anOrderEClass, AN_ORDER__QUANTITY);
+    createEAttribute(anOrderEClass, AN_ORDER__CUSTOMER_ID);
+
+    customerEClass = createEClass(CUSTOMER);
+    createEAttribute(customerEClass, CUSTOMER__ID);
+    createEAttribute(customerEClass, CUSTOMER__LAST_NAME);
+    createEAttribute(customerEClass, CUSTOMER__ADDRESS);
+    createEReference(customerEClass, CUSTOMER__ORDERS);
+
+    dataGraphRootEClass = createEClass(DATA_GRAPH_ROOT);
+    createEReference(dataGraphRootEClass, DATA_GRAPH_ROOT__CUSTOMERS);
+    createEReference(dataGraphRootEClass, DATA_GRAPH_ROOT__ORDERS);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private boolean isInitialized = false;
+
+  /**
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void initializePackageContents()
+  {
+    if (isInitialized) return;
+    isInitialized = true;
+
+    // Initialize package
+    setName(eNAME);
+    setNsPrefix(eNS_PREFIX);
+    setNsURI(eNS_URI);
+
+    // Obtain other dependent packages
+    XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
+
+    // Add supertypes to classes
+
+    // Initialize classes and features; add operations and parameters
+    initEClass(anOrderEClass, AnOrder.class, "AnOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getAnOrder_ID(), theXMLTypePackage.getInt(), "iD", null, 1, 1, AnOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAnOrder_Product(), theXMLTypePackage.getString(), "product", null, 1, 1, AnOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAnOrder_Quantity(), theXMLTypePackage.getInt(), "quantity", null, 1, 1, AnOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAnOrder_CustomerID(), theXMLTypePackage.getInt(), "customerID", null, 1, 1, AnOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getCustomer_ID(), theXMLTypePackage.getInt(), "iD", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCustomer_LastName(), theXMLTypePackage.getString(), "lastName", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCustomer_Address(), theXMLTypePackage.getString(), "address", null, 1, 1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCustomer_Orders(), this.getAnOrder(), null, "orders", null, 1, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(dataGraphRootEClass, DataGraphRoot.class, "DataGraphRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getDataGraphRoot_Customers(), this.getCustomer(), null, "customers", null, 0, -1, DataGraphRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDataGraphRoot_Orders(), this.getAnOrder(), null, "orders", null, 0, -1, DataGraphRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    // Create resource
+    createResource(eNS_URI);
+
+    // Create annotations
+    // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+    createExtendedMetaDataAnnotations();
+  }
+
+  /**
+   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected void createExtendedMetaDataAnnotations()
+  {
+    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
+    addAnnotation
+      (anOrderEClass, 
+       source, 
+       new String[] 
+       {
+       "name", "AnOrder",
+       "kind", "elementOnly"
+       });		
+    addAnnotation
+      (getAnOrder_ID(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "ID"
+       });		
+    addAnnotation
+      (getAnOrder_Product(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "Product"
+       });		
+    addAnnotation
+      (getAnOrder_Quantity(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "Quantity"
+       });		
+    addAnnotation
+      (getAnOrder_CustomerID(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "Customer_ID"
+       });		
+    addAnnotation
+      (customerEClass, 
+       source, 
+       new String[] 
+       {
+       "name", "Customer",
+       "kind", "elementOnly"
+       });		
+    addAnnotation
+      (getCustomer_ID(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "ID"
+       });		
+    addAnnotation
+      (getCustomer_LastName(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "lastName"
+       });		
+    addAnnotation
+      (getCustomer_Address(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "address"
+       });		
+    addAnnotation
+      (getCustomer_Orders(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "orders"
+       });		
+    addAnnotation
+      (dataGraphRootEClass, 
+       source, 
+       new String[] 
+       {
+       "name", "DataGraphRoot",
+       "kind", "elementOnly"
+       });		
+    addAnnotation
+      (getDataGraphRoot_Customers(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "customers"
+       });		
+    addAnnotation
+      (getDataGraphRoot_Orders(), 
+       source, 
+       new String[] 
+       {
+       "kind", "element",
+       "name", "orders"
+       });
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * Defines literals for the meta objects that represent
+   * <ul>
+   *   <li>each class,</li>
+   *   <li>each feature of each class,</li>
+   *   <li>each enum,</li>
+   *   <li>and each data type</li>
+   * </ul>
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public interface Literals
+  {
+    /**
+     * The meta object literal for the '{@link org.apache.tuscany.das.rdb.test.customer.impl.AnOrderImpl <em>An Order</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.apache.tuscany.das.rdb.test.customer.impl.AnOrderImpl
+     * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerPackageImpl#getAnOrder()
+     * @generated
+     */
+    public static final EClass AN_ORDER = eINSTANCE.getAnOrder();
+
+    /**
+     * The meta object literal for the '<em><b>ID</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EAttribute AN_ORDER__ID = eINSTANCE.getAnOrder_ID();
+
+    /**
+     * The meta object literal for the '<em><b>Product</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EAttribute AN_ORDER__PRODUCT = eINSTANCE.getAnOrder_Product();
+
+    /**
+     * The meta object literal for the '<em><b>Quantity</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EAttribute AN_ORDER__QUANTITY = eINSTANCE.getAnOrder_Quantity();
+
+    /**
+     * The meta object literal for the '<em><b>Customer ID</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EAttribute AN_ORDER__CUSTOMER_ID = eINSTANCE.getAnOrder_CustomerID();
+
+    /**
+     * The meta object literal for the '{@link org.apache.tuscany.das.rdb.test.customer.impl.CustomerImpl <em>Customer</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerImpl
+     * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerPackageImpl#getCustomer()
+     * @generated
+     */
+    public static final EClass CUSTOMER = eINSTANCE.getCustomer();
+
+    /**
+     * The meta object literal for the '<em><b>ID</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EAttribute CUSTOMER__ID = eINSTANCE.getCustomer_ID();
+
+    /**
+     * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EAttribute CUSTOMER__LAST_NAME = eINSTANCE.getCustomer_LastName();
+
+    /**
+     * The meta object literal for the '<em><b>Address</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EAttribute CUSTOMER__ADDRESS = eINSTANCE.getCustomer_Address();
+
+    /**
+     * The meta object literal for the '<em><b>Orders</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EReference CUSTOMER__ORDERS = eINSTANCE.getCustomer_Orders();
+
+    /**
+     * The meta object literal for the '{@link org.apache.tuscany.das.rdb.test.customer.impl.DataGraphRootImpl <em>Data Graph Root</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.apache.tuscany.das.rdb.test.customer.impl.DataGraphRootImpl
+     * @see org.apache.tuscany.das.rdb.test.customer.impl.CustomerPackageImpl#getDataGraphRoot()
+     * @generated
+     */
+    public static final EClass DATA_GRAPH_ROOT = eINSTANCE.getDataGraphRoot();
+
+    /**
+     * The meta object literal for the '<em><b>Customers</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EReference DATA_GRAPH_ROOT__CUSTOMERS = eINSTANCE.getDataGraphRoot_Customers();
+
+    /**
+     * The meta object literal for the '<em><b>Orders</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public static final EReference DATA_GRAPH_ROOT__ORDERS = eINSTANCE.getDataGraphRoot_Orders();
+
+  }
 
 } //CustomerPackageImpl

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/DataGraphRootImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/DataGraphRootImpl.java?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/DataGraphRootImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/customer/impl/DataGraphRootImpl.java Thu Feb  9 07:32:58 2006
@@ -1,18 +1,8 @@
 /**
+ * <copyright>
+ * </copyright>
  *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed 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.
+ * $Id$
  */
 package org.apache.tuscany.das.rdb.test.customer.impl;
 
@@ -21,19 +11,17 @@
 
 import org.apache.tuscany.das.rdb.test.customer.AnOrder;
 import org.apache.tuscany.das.rdb.test.customer.Customer;
-import org.apache.tuscany.das.rdb.test.customer.CustomerPackage;
 import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
 
+import org.apache.tuscany.sdo.impl.DataObjectImpl;
+
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 
-import org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
@@ -51,152 +39,165 @@
  *
  * @generated
  */
-public class DataGraphRootImpl extends EDataObjectImpl implements DataGraphRoot {
-	/**
-	 * The cached value of the '{@link #getCustomers() <em>Customers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList customers = null;
-
-	/**
-	 * The cached value of the '{@link #getOrders() <em>Orders</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOrders()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList orders = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DataGraphRootImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CustomerPackage.eINSTANCE.getDataGraphRoot();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getCustomers() {
-		if (customers == null) {
-			customers = new EObjectContainmentEList(Customer.class, this, CustomerPackage.DATA_GRAPH_ROOT__CUSTOMERS);
-		}
-		return customers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List getOrders() {
-		if (orders == null) {
-			orders = new EObjectContainmentEList(AnOrder.class, this, CustomerPackage.DATA_GRAPH_ROOT__ORDERS);
-		}
-		return orders;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CustomerPackage.DATA_GRAPH_ROOT__CUSTOMERS:
-					return ((InternalEList)getCustomers()).basicRemove(otherEnd, msgs);
-				case CustomerPackage.DATA_GRAPH_ROOT__ORDERS:
-					return ((InternalEList)getOrders()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CustomerPackage.DATA_GRAPH_ROOT__CUSTOMERS:
-				return getCustomers();
-			case CustomerPackage.DATA_GRAPH_ROOT__ORDERS:
-				return getOrders();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CustomerPackage.DATA_GRAPH_ROOT__CUSTOMERS:
-				getCustomers().clear();
-				getCustomers().addAll((Collection)newValue);
-				return;
-			case CustomerPackage.DATA_GRAPH_ROOT__ORDERS:
-				getOrders().clear();
-				getOrders().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CustomerPackage.DATA_GRAPH_ROOT__CUSTOMERS:
-				getCustomers().clear();
-				return;
-			case CustomerPackage.DATA_GRAPH_ROOT__ORDERS:
-				getOrders().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CustomerPackage.DATA_GRAPH_ROOT__CUSTOMERS:
-				return customers != null && !customers.isEmpty();
-			case CustomerPackage.DATA_GRAPH_ROOT__ORDERS:
-				return orders != null && !orders.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
+public class DataGraphRootImpl extends DataObjectImpl implements DataGraphRoot
+{
+  /**
+   * The cached value of the '{@link #getCustomers() <em>Customers</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getCustomers()
+   * @generated
+   * @ordered
+   */
+  protected EList customers = null;
+
+  /**
+   * The cached value of the '{@link #getOrders() <em>Orders</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOrders()
+   * @generated
+   * @ordered
+   */
+  protected EList orders = null;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DataGraphRootImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected EClass eStaticClass()
+  {
+    return CustomerPackageImpl.Literals.DATA_GRAPH_ROOT;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public List getCustomers()
+  {
+    if (customers == null)
+    {
+      customers = new EObjectContainmentEList(Customer.class, this, CustomerPackageImpl.DATA_GRAPH_ROOT__CUSTOMERS);
+    }
+    return customers;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public List getOrders()
+  {
+    if (orders == null)
+    {
+      orders = new EObjectContainmentEList(AnOrder.class, this, CustomerPackageImpl.DATA_GRAPH_ROOT__ORDERS);
+    }
+    return orders;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__CUSTOMERS:
+        return ((InternalEList)getCustomers()).basicRemove(otherEnd, msgs);
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__ORDERS:
+        return ((InternalEList)getOrders()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__CUSTOMERS:
+        return getCustomers();
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__ORDERS:
+        return getOrders();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__CUSTOMERS:
+        getCustomers().clear();
+        getCustomers().addAll((Collection)newValue);
+        return;
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__ORDERS:
+        getOrders().clear();
+        getOrders().addAll((Collection)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__CUSTOMERS:
+        getCustomers().clear();
+        return;
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__ORDERS:
+        getOrders().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__CUSTOMERS:
+        return customers != null && !customers.isEmpty();
+      case CustomerPackageImpl.DATA_GRAPH_ROOT__ORDERS:
+        return orders != null && !orders.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
 
 } //DataGraphRootImpl

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java Thu Feb  9 07:32:58 2006
@@ -16,14 +16,17 @@
  */
 package org.apache.tuscany.das.rdb.test.typed;
 
+import java.io.InputStream;
 import java.util.Collection;
 
 import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.test.customer.CustomerPackage;
+import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
 import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
 import org.apache.tuscany.das.rdb.test.data.CustomerData;
 import org.apache.tuscany.das.rdb.test.framework.DasTest;
-import org.eclipse.emf.ecore.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
+import commonj.sdo.helper.TypeHelper;
 
 
 /**
@@ -36,11 +39,15 @@
 	}
 	
 	public void testRead() throws Exception {
-		
-		Command select = Command.FACTORY.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where LASTNAME = :LASTNAME");
+		SDOUtil.registerStaticTypes(CustomerFactory.class);
+		InputStream mapping = getClass().getClassLoader().getResourceAsStream("basicStaticCustomer.xml");
+		Command select = Command.FACTORY.createCommand("Select ID, LASTNAME, ADDRESS from CUSTOMER where LASTNAME = :LASTNAME",mapping);
 		select.setConnection(getConnection());
 		select.setParameterValue("LASTNAME", "Williams");
-		select.setDataObjectModel(SDOUtil.adaptType(CustomerPackage.eINSTANCE.getDataGraphRoot()));
+		TypeHelper helper = TypeHelper.INSTANCE;
+		
+		select.setDataObjectModel(helper.getType(DataGraphRoot.class));
+		
 		DataGraphRoot root = (DataGraphRoot) select.executeQuery();
 		
 		Collection customers = root.getCustomers();

Added: incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml?rev=376322&view=auto
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml (added)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml Thu Feb  9 07:32:58 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ASCII"?>
+<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  
+  <Table name="CUSTOMER" propertyName="Customer">
+    <Column name="ID" primaryKey="true"/>
+    <Column name="LASTNAME"/>
+    <Column name="ADDRESS"/> 
+  </Table>
+	
+</Config>

Propchange: incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: incubator/tuscany/java/das/rdb/src/test/resources/company.genmodel
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/company.genmodel?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/company.genmodel (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/company.genmodel Thu Feb  9 07:32:58 2006
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/das.tests/src"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/rdbdas2/src/test/java"
     modelPluginID="das.tests" modelName="Company" rootExtendsInterface="" rootExtendsClass="org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl"
     rootImplementsInterface="org.eclipse.emf.ecore.sdo.InternalEDataObject" suppressEMFTypes="true"
-    featureMapWrapperInterface="commonj.sdo.Sequence" featureMapWrapperInternalInterface="org.eclipse.emf.ecore.sdo.util.ESequence"
+    suppressEMFMetaData="true" featureMapWrapperInterface="commonj.sdo.Sequence" featureMapWrapperInternalInterface="org.eclipse.emf.ecore.sdo.util.ESequence"
     featureMapWrapperClass="org.eclipse.emf.ecore.sdo.util.BasicESequence" importerID="org.eclipse.xsd.ecore.importer">
   <foreignModel>company.xsd</foreignModel>
   <staticPackages>http://www.eclipse.org/emf/2003/SDO</staticPackages>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/company.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/company.xsd?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/company.xsd (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/company.xsd Thu Feb  9 07:32:58 2006
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="org.apache.tuscany.das.rdb.test/company.xsd" xmlns:company="org.apache.tuscany.das.rdb.test/company.xsd" 
+<xsd:schema targetNamespace="org.apache.tuscany.das.rdb.test/company.xsd" 
+	xmlns:company="org.apache.tuscany.das.rdb.test/company.xsd" 
 		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 		xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
+		
+	<xsd:complexType name="DatagraphRoot">		
+	 	<xsd:sequence>	 	
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="companies" type="company:CompanyType"/>
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="departments" type="company:DepartmentType"/>
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="employees" type="company:EmployeeType"/>
+    	</xsd:sequence>
+	</xsd:complexType>
+	
       <xsd:element name="company" type="company:CompanyType"/>
+      
       <xsd:complexType name="CompanyType">
         <xsd:sequence>
           <xsd:element maxOccurs="unbounded" name="departments" type="company:DepartmentType"/>
@@ -10,6 +21,7 @@
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="employeeOfTheMonth" type="xsd:IDREF" ecore:reference="EmployeeType"/>
       </xsd:complexType>
+      
       <xsd:complexType name="DepartmentType">
         <xsd:sequence>
           <xsd:element maxOccurs="unbounded" name="employees" type="company:EmployeeType"/>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/customer.genmodel
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/customer.genmodel?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customer.genmodel (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customer.genmodel Thu Feb  9 07:32:58 2006
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/das.tests/src"
-    modelPluginID="das.tests" modelName="Customer" rootExtendsInterface="" rootExtendsClass="org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/rdbdas2/src"
+    modelPluginID="rdbdas2" modelName="Customer" rootExtendsInterface="" rootExtendsClass="org.eclipse.emf.ecore.sdo.impl.EDataObjectImpl"
     rootImplementsInterface="org.eclipse.emf.ecore.sdo.InternalEDataObject" suppressEMFTypes="true"
-    featureMapWrapperInterface="commonj.sdo.Sequence" featureMapWrapperInternalInterface="org.eclipse.emf.ecore.sdo.util.ESequence"
+    suppressEMFMetaData="true" featureMapWrapperInterface="commonj.sdo.Sequence" featureMapWrapperInternalInterface="org.eclipse.emf.ecore.sdo.util.ESequence"
     featureMapWrapperClass="org.eclipse.emf.ecore.sdo.util.BasicESequence" importerID="org.eclipse.xsd.ecore.importer">
   <foreignModel>customer.xsd</foreignModel>
   <staticPackages>http://www.eclipse.org/emf/2003/SDO</staticPackages>

Modified: incubator/tuscany/java/das/rdb/src/test/resources/customer.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/customer.xsd?rev=376322&r1=376321&r2=376322&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customer.xsd (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customer.xsd Thu Feb  9 07:32:58 2006
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http:///org.apache.tuscany.das.rdb.test/customer.xsd" xmlns:this="http:///org.apache.tuscany.das.rdb.test/customer.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<xsd:complexType name="DataGraphRoot">
-		
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:this="http:///org.apache.tuscany.das.rdb.test/customer.xsd" targetNamespace="http:///org.apache.tuscany.das.rdb.test/customer.xsd">
+	<xsd:complexType name="DataGraphRoot">		
 	 	<xsd:sequence>
 	 		
             <xsd:element maxOccurs="unbounded" minOccurs="0" name="customers" type="this:Customer"/>