moving SDO branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@834615 13f79535-47bb-0310-9956-ffa450edef68

28 files changed, 0 insertions, 5608 deletions

diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/RCType.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/RCType.java
deleted file mode 100644
index 29a558b5a2..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/RCType.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.repchoice;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>RC Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link com.example.repchoice.RCType#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.repchoice.RCType#getS <em>S</em>}</li>
- *   <li>{@link com.example.repchoice.RCType#getI <em>I</em>}</li>
- *   <li>{@link com.example.repchoice.RCType#getF <em>F</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface RCType extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Group</em>' attribute list.
-   * @generated
-   */
-  Sequence getGroup();
-
-  /**
-   * Returns the value of the '<em><b>S</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>S</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>S</em>' attribute list.
-   * @generated
-   */
-  List getS();
-
-  /**
-   * Returns the value of the '<em><b>I</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.Integer}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>I</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>I</em>' attribute list.
-   * @generated
-   */
-  List getI();
-
-  /**
-   * Returns the value of the '<em><b>F</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.Float}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>F</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>F</em>' attribute list.
-   * @generated
-   */
-  List getF();
-
-} // RCType
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java
deleted file mode 100644
index 9a7c3033a5..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.repchoice;
-
-import commonj.sdo.helper.HelperContext;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface RepchoiceFactory
-{
-
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  RepchoiceFactory INSTANCE = com.example.repchoice.impl.RepchoiceFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>RC Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>RC Type</em>'.
-   * @generated
-   */
-  RCType createRCType();
-
-  /**
-   * Registers the types supported by this Factory within the supplied scope.argument
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param scope an instance of HelperContext used to manage the scoping of types.
-   * @generated
-   */
-  public void register(HelperContext scope);
-   
-} //RepchoiceFactory
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
deleted file mode 100644
index 322dc5a8e0..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.repchoice.impl;
-
-import com.example.repchoice.RCType;
-import com.example.repchoice.RepchoiceFactory;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>RC Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link com.example.repchoice.impl.RCTypeImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.repchoice.impl.RCTypeImpl#getS <em>S</em>}</li>
- *   <li>{@link com.example.repchoice.impl.RCTypeImpl#getI <em>I</em>}</li>
- *   <li>{@link com.example.repchoice.impl.RCTypeImpl#getF <em>F</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RCTypeImpl extends DataObjectBase implements RCType
-{
-
-  public final static int GROUP = -1;
-
-  public final static int S = 0;
-
-  public final static int I = 1;
-
-  public final static int F = 2;
-
-  public final static int SDO_PROPERTY_COUNT = 3;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -1;
-
-
-  /**
-   * The internal feature id for the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_GROUP = 0;
-
-  /**
-   * The internal feature id for the '<em><b>S</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_S = 1;
-
-  /**
-   * The internal feature id for the '<em><b>I</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_I = 2;
-
-  /**
-   * The internal feature id for the '<em><b>F</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_F = 3;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 4;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_GROUP: return GROUP;
-      case INTERNAL_S: return S;
-      case INTERNAL_I: return I;
-      case INTERNAL_F: return F;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getGroup()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence group = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public RCTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((RepchoiceFactoryImpl)RepchoiceFactory.INSTANCE).getRCType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getStaticPropertyCount()
-  {
-    return INTERNAL_PROPERTY_COUNT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getGroup()
-  {
-    if (group == null)
-    {
-      group = createSequence(INTERNAL_GROUP);
-    }
-    return group;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getS()
-  {
-    return getList(getGroup(), getType(), INTERNAL_S);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getI()
-  {
-    return getList(getGroup(), getType(), INTERNAL_I);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getF()
-  {
-    return getList(getGroup(), getType(), INTERNAL_F);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        return removeFromSequence(getGroup(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getGroup();
-      case S:
-        return getS();
-      case I:
-        return getI();
-      case F:
-        return getF();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-      	setSequence(getGroup(), newValue);
-        return;
-      case S:
-        getS().clear();
-        getS().addAll((Collection)newValue);
-        return;
-      case I:
-        getI().clear();
-        getI().addAll((Collection)newValue);
-        return;
-      case F:
-        getF().clear();
-        getF().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        unsetSequence(getGroup());
-        return;
-      case S:
-        getS().clear();
-        return;
-      case I:
-        getI().clear();
-        return;
-      case F:
-        getF().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        return group != null && !isSequenceEmpty(getGroup());
-      case S:
-        return !getS().isEmpty();
-      case I:
-        return !getI().isEmpty();
-      case F:
-        return !getF().isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (group: ");
-    result.append(group);
-    result.append(')');
-    return result.toString();
-  }
-
-} //RCTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
deleted file mode 100644
index 40d3e9eeec..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.repchoice.impl;
-
-import commonj.sdo.helper.HelperContext;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-
-import com.example.repchoice.*;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.FactoryBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * Generator information:
- * patternVersion=1.2;
- * <!-- end-user-doc -->
- * @generated
- */
-public class RepchoiceFactoryImpl extends FactoryBase implements RepchoiceFactory
-{
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_URI = "http://www.example.com/repchoice";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_PREFIX = "repchoice";
-
-  /**
-   * The version of the generator pattern used to generate this class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String PATTERN_VERSION = "1.2";
-  
-  public static final int RC_TYPE = 1;
-  
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public RepchoiceFactoryImpl()
-  {
-    super(NAMESPACE_URI, NAMESPACE_PREFIX, "com.example.repchoice");
-  }
-
-  /**
-   * Registers the Factory instance so that it is available within the supplied scope.
-   * @argument scope a HelperContext instance that will make the types supported by this Factory available.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void register(HelperContext scope) 
-  {
-    if(scope == 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);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject create(int typeNumber)
-  {
-    switch (typeNumber)
-    {
-      case RC_TYPE: return (DataObject)createRCType();
-      default:
-        return super.create(typeNumber);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public RCType createRCType()
-  {
-    RCTypeImpl rcType = new RCTypeImpl();
-    return rcType;
-  }
-  
-  // Following creates and initializes SDO metadata for the supported types.			
-  protected Type rcTypeType = null;
-
-  public Type getRCType()
-  {
-    return rcTypeType;
-  }
-  
-
-  private static RepchoiceFactoryImpl instance = null; 
-  public static RepchoiceFactoryImpl init()
-  {
-    if (instance != null ) return instance;
-    instance = new RepchoiceFactoryImpl();
-
-    // Initialize dependent packages
-    ModelFactory ModelFactoryInstance = ModelFactory.INSTANCE;
-    
-    // Create package meta-data objects
-    instance.createMetaData();
-
-    // Initialize created meta-data
-    instance.initializeMetaData();
-    
-    // Mark meta-data to indicate it can't be changed
-    //theRepchoiceFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
-
-    return instance;
-  }
-  
-  private boolean isCreated = false;
-
-  public void createMetaData()
-  {
-    if (isCreated) return;
-    isCreated = true;	
-
-    // Create types and their properties
-    rcTypeType = createType(false, RC_TYPE);
-    createProperty(true, rcTypeType,RCTypeImpl.INTERNAL_GROUP); 
-    createProperty(true, rcTypeType,RCTypeImpl.INTERNAL_S); 
-    createProperty(true, rcTypeType,RCTypeImpl.INTERNAL_I); 
-    createProperty(true, rcTypeType,RCTypeImpl.INTERNAL_F); 
-  }
-  
-  private boolean isInitialized = false;
-
-  public void initializeMetaData()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Obtain other dependent packages
-    ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactory.INSTANCE;
-    Property property = null;
-
-    // Add supertypes to types
-
-    // Initialize types and properties
-    initializeType(rcTypeType, RCType.class, "RCType", false);
-    property = getLocalProperty(rcTypeType, 0);
-    initializeProperty(property, getSequence(), "group", null, 0, -1, RCType.class, false, false, false);
-
-    property = getLocalProperty(rcTypeType, 1);
-    initializeProperty(property, theModelPackageImpl.getString(), "s", null, 0, -1, RCType.class, false, false, true);
-
-    property = getLocalProperty(rcTypeType, 2);
-    initializeProperty(property, theModelPackageImpl.getInt(), "i", null, 0, -1, RCType.class, false, false, true);
-
-    property = getLocalProperty(rcTypeType, 3);
-    initializeProperty(property, theModelPackageImpl.getFloat(), "f", null, 0, -1, RCType.class, false, false, true);
-
-    createXSDMetaData(theModelPackageImpl);
-  }
-    
-  protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl)
-  {
-    super.initXSD();
-    
-    Property property = null;
-    
-
-    property = createGlobalProperty
-      ("rc",
-      this.getRCType(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "rc",
-       "namespace", "##targetNamespace"
-       });
-                
-    addXSDMapping
-      (rcTypeType,
-       new String[] 
-       {
-       "name", "RCType",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(rcTypeType, RCTypeImpl.INTERNAL_GROUP),
-       new String[]
-       {
-       "kind", "group",
-       "name", "group:0"
-       });
-
-    addXSDMapping
-      (getProperty(rcTypeType, RCTypeImpl.INTERNAL_S),
-       new String[]
-       {
-       "kind", "element",
-       "name", "s",
-       "group", "#group:0"
-       });
-
-    addXSDMapping
-      (getProperty(rcTypeType, RCTypeImpl.INTERNAL_I),
-       new String[]
-       {
-       "kind", "element",
-       "name", "i",
-       "group", "#group:0"
-       });
-
-    addXSDMapping
-      (getProperty(rcTypeType, RCTypeImpl.INTERNAL_F),
-       new String[]
-       {
-       "kind", "element",
-       "name", "f",
-       "group", "#group:0"
-       });
-
-  }
-    
-} //RepchoiceFactoryImpl
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/MixedQuote.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/MixedQuote.java
deleted file mode 100644
index f1882ba616..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/MixedQuote.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-import java.math.BigDecimal;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mixed Quote</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link com.example.sequences.MixedQuote#getMixed <em>Mixed</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getCompanyName <em>Company Name</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getPrice <em>Price</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getOpen1 <em>Open1</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getHigh <em>High</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getLow <em>Low</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getVolume <em>Volume</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getChange1 <em>Change1</em>}</li>
- *   <li>{@link com.example.sequences.MixedQuote#getQuotes <em>Quotes</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface MixedQuote extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Mixed</em>' attribute list.
-   * @generated
-   */
-  Sequence getMixed();
-
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Symbol</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' attribute.
-   * @see #isSetSymbol()
-   * @see #unsetSymbol()
-   * @see #setSymbol(String)
-   * @generated
-   */
-  String getSymbol();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.MixedQuote#getSymbol <em>Symbol</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' attribute.
-   * @see #isSetSymbol()
-   * @see #unsetSymbol()
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(String value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.MixedQuote#getSymbol <em>Symbol</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetSymbol()
-   * @see #getSymbol()
-   * @see #setSymbol(String)
-   * @generated
-   */
-  void unsetSymbol();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.MixedQuote#getSymbol <em>Symbol</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Symbol</em>' attribute is set.
-   * @see #unsetSymbol()
-   * @see #getSymbol()
-   * @see #setSymbol(String)
-   * @generated
-   */
-  boolean isSetSymbol();
-
-  /**
-   * Returns the value of the '<em><b>Company Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Company Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Company Name</em>' attribute.
-   * @see #isSetCompanyName()
-   * @see #unsetCompanyName()
-   * @see #setCompanyName(String)
-   * @generated
-   */
-  String getCompanyName();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.MixedQuote#getCompanyName <em>Company Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Company Name</em>' attribute.
-   * @see #isSetCompanyName()
-   * @see #unsetCompanyName()
-   * @see #getCompanyName()
-   * @generated
-   */
-  void setCompanyName(String value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.MixedQuote#getCompanyName <em>Company Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetCompanyName()
-   * @see #getCompanyName()
-   * @see #setCompanyName(String)
-   * @generated
-   */
-  void unsetCompanyName();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.MixedQuote#getCompanyName <em>Company Name</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Company Name</em>' attribute is set.
-   * @see #unsetCompanyName()
-   * @see #getCompanyName()
-   * @see #setCompanyName(String)
-   * @generated
-   */
-  boolean isSetCompanyName();
-
-  /**
-   * Returns the value of the '<em><b>Price</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Price</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Price</em>' attribute.
-   * @see #isSetPrice()
-   * @see #unsetPrice()
-   * @see #setPrice(BigDecimal)
-   * @generated
-   */
-  BigDecimal getPrice();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.MixedQuote#getPrice <em>Price</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Price</em>' attribute.
-   * @see #isSetPrice()
-   * @see #unsetPrice()
-   * @see #getPrice()
-   * @generated
-   */
-  void setPrice(BigDecimal value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.MixedQuote#getPrice <em>Price</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetPrice()
-   * @see #getPrice()
-   * @see #setPrice(BigDecimal)
-   * @generated
-   */
-  void unsetPrice();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.MixedQuote#getPrice <em>Price</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Price</em>' attribute is set.
-   * @see #unsetPrice()
-   * @see #getPrice()
-   * @see #setPrice(BigDecimal)
-   * @generated
-   */
-  boolean isSetPrice();
-
-  /**
-   * Returns the value of the '<em><b>Open1</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Open1</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Open1</em>' attribute.
-   * @see #isSetOpen1()
-   * @see #unsetOpen1()
-   * @see #setOpen1(BigDecimal)
-   * @generated
-   */
-  BigDecimal getOpen1();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.MixedQuote#getOpen1 <em>Open1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Open1</em>' attribute.
-   * @see #isSetOpen1()
-   * @see #unsetOpen1()
-   * @see #getOpen1()
-   * @generated
-   */
-  void setOpen1(BigDecimal value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.MixedQuote#getOpen1 <em>Open1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetOpen1()
-   * @see #getOpen1()
-   * @see #setOpen1(BigDecimal)
-   * @generated
-   */
-  void unsetOpen1();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.MixedQuote#getOpen1 <em>Open1</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Open1</em>' attribute is set.
-   * @see #unsetOpen1()
-   * @see #getOpen1()
-   * @see #setOpen1(BigDecimal)
-   * @generated
-   */
-  boolean isSetOpen1();
-
-  /**
-   * Returns the value of the '<em><b>High</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>High</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>High</em>' attribute.
-   * @see #isSetHigh()
-   * @see #unsetHigh()
-   * @see #setHigh(BigDecimal)
-   * @generated
-   */
-  BigDecimal getHigh();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.MixedQuote#getHigh <em>High</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>High</em>' attribute.
-   * @see #isSetHigh()
-   * @see #unsetHigh()
-   * @see #getHigh()
-   * @generated
-   */
-  void setHigh(BigDecimal value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.MixedQuote#getHigh <em>High</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetHigh()
-   * @see #getHigh()
-   * @see #setHigh(BigDecimal)
-   * @generated
-   */
-  void unsetHigh();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.MixedQuote#getHigh <em>High</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>High</em>' attribute is set.
-   * @see #unsetHigh()
-   * @see #getHigh()
-   * @see #setHigh(BigDecimal)
-   * @generated
-   */
-  boolean isSetHigh();
-
-  /**
-   * Returns the value of the '<em><b>Low</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Low</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Low</em>' attribute.
-   * @see #isSetLow()
-   * @see #unsetLow()
-   * @see #setLow(BigDecimal)
-   * @generated
-   */
-  BigDecimal getLow();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.MixedQuote#getLow <em>Low</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Low</em>' attribute.
-   * @see #isSetLow()
-   * @see #unsetLow()
-   * @see #getLow()
-   * @generated
-   */
-  void setLow(BigDecimal value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.MixedQuote#getLow <em>Low</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetLow()
-   * @see #getLow()
-   * @see #setLow(BigDecimal)
-   * @generated
-   */
-  void unsetLow();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.MixedQuote#getLow <em>Low</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Low</em>' attribute is set.
-   * @see #unsetLow()
-   * @see #getLow()
-   * @see #setLow(BigDecimal)
-   * @generated
-   */
-  boolean isSetLow();
-
-  /**
-   * Returns the value of the '<em><b>Volume</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Volume</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Volume</em>' attribute.
-   * @see #isSetVolume()
-   * @see #unsetVolume()
-   * @see #setVolume(double)
-   * @generated
-   */
-  double getVolume();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.MixedQuote#getVolume <em>Volume</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Volume</em>' attribute.
-   * @see #isSetVolume()
-   * @see #unsetVolume()
-   * @see #getVolume()
-   * @generated
-   */
-  void setVolume(double value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.MixedQuote#getVolume <em>Volume</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetVolume()
-   * @see #getVolume()
-   * @see #setVolume(double)
-   * @generated
-   */
-  void unsetVolume();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.MixedQuote#getVolume <em>Volume</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Volume</em>' attribute is set.
-   * @see #unsetVolume()
-   * @see #getVolume()
-   * @see #setVolume(double)
-   * @generated
-   */
-  boolean isSetVolume();
-
-  /**
-   * Returns the value of the '<em><b>Change1</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Change1</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Change1</em>' attribute.
-   * @see #isSetChange1()
-   * @see #unsetChange1()
-   * @see #setChange1(double)
-   * @generated
-   */
-  double getChange1();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.MixedQuote#getChange1 <em>Change1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Change1</em>' attribute.
-   * @see #isSetChange1()
-   * @see #unsetChange1()
-   * @see #getChange1()
-   * @generated
-   */
-  void setChange1(double value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.MixedQuote#getChange1 <em>Change1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetChange1()
-   * @see #getChange1()
-   * @see #setChange1(double)
-   * @generated
-   */
-  void unsetChange1();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.MixedQuote#getChange1 <em>Change1</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Change1</em>' attribute is set.
-   * @see #unsetChange1()
-   * @see #getChange1()
-   * @see #setChange1(double)
-   * @generated
-   */
-  boolean isSetChange1();
-
-  /**
-   * Returns the value of the '<em><b>Quotes</b></em>' containment reference list.
-   * The list contents are of type {@link com.example.sequences.MixedQuote}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Quotes</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Quotes</em>' containment reference list.
-   * @generated
-   */
-  List getQuotes();
-
-} // MixedQuote
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
deleted file mode 100644
index dba64b0487..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mixed Repeating Choice</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link com.example.sequences.MixedRepeatingChoice#getMixed <em>Mixed</em>}</li>
- *   <li>{@link com.example.sequences.MixedRepeatingChoice#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.sequences.MixedRepeatingChoice#getA <em>A</em>}</li>
- *   <li>{@link com.example.sequences.MixedRepeatingChoice#getB <em>B</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface MixedRepeatingChoice extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Mixed</em>' attribute list.
-   * @generated
-   */
-  Sequence getMixed();
-
-  /**
-   * Returns the value of the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Group</em>' attribute list.
-   * @generated
-   */
-  Sequence getGroup();
-
-  /**
-   * Returns the value of the '<em><b>A</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>A</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>A</em>' attribute list.
-   * @generated
-   */
-  List getA();
-
-  /**
-   * Returns the value of the '<em><b>B</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.Integer}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>B</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>B</em>' attribute list.
-   * @generated
-   */
-  List getB();
-
-} // MixedRepeatingChoice
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/RepeatingChoice.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/RepeatingChoice.java
deleted file mode 100644
index 3f0b0839f2..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/RepeatingChoice.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Repeating Choice</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link com.example.sequences.RepeatingChoice#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.sequences.RepeatingChoice#getA <em>A</em>}</li>
- *   <li>{@link com.example.sequences.RepeatingChoice#getB <em>B</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface RepeatingChoice extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Group</em>' attribute list.
-   * @generated
-   */
-  Sequence getGroup();
-
-  /**
-   * Returns the value of the '<em><b>A</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>A</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>A</em>' attribute list.
-   * @generated
-   */
-  List getA();
-
-  /**
-   * Returns the value of the '<em><b>B</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.Integer}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>B</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>B</em>' attribute list.
-   * @generated
-   */
-  List getB();
-
-} // RepeatingChoice
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/SequencesFactory.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/SequencesFactory.java
deleted file mode 100644
index 900b51ddc3..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/SequencesFactory.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences;
-
-import commonj.sdo.helper.HelperContext;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface SequencesFactory
-{
-
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  SequencesFactory INSTANCE = com.example.sequences.impl.SequencesFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Mixed Quote</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Mixed Quote</em>'.
-   * @generated
-   */
-  MixedQuote createMixedQuote();
-
-  /**
-   * Returns a new object of class '<em>Mixed Repeating Choice</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Mixed Repeating Choice</em>'.
-   * @generated
-   */
-  MixedRepeatingChoice createMixedRepeatingChoice();
-
-  /**
-   * Returns a new object of class '<em>Repeating Choice</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Repeating Choice</em>'.
-   * @generated
-   */
-  RepeatingChoice createRepeatingChoice();
-
-  /**
-   * Returns a new object of class '<em>Two RCs</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Two RCs</em>'.
-   * @generated
-   */
-  TwoRCs createTwoRCs();
-
-  /**
-   * Returns a new object of class '<em>Two RCs Mixed</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Two RCs Mixed</em>'.
-   * @generated
-   */
-  TwoRCsMixed createTwoRCsMixed();
-
-  /**
-   * Registers the types supported by this Factory within the supplied scope.argument
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param scope an instance of HelperContext used to manage the scoping of types.
-   * @generated
-   */
-  public void register(HelperContext scope);
-   
-} //SequencesFactory
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/TwoRCs.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/TwoRCs.java
deleted file mode 100644
index c6e54e6598..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/TwoRCs.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Two RCs</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link com.example.sequences.TwoRCs#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCs#getA <em>A</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCs#getB <em>B</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCs#getSplit <em>Split</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCs#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCs#getY <em>Y</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCs#getZ <em>Z</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface TwoRCs extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Group</em>' attribute list.
-   * @generated
-   */
-  Sequence getGroup();
-
-  /**
-   * Returns the value of the '<em><b>A</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>A</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>A</em>' attribute list.
-   * @generated
-   */
-  List getA();
-
-  /**
-   * Returns the value of the '<em><b>B</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.Integer}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>B</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>B</em>' attribute list.
-   * @generated
-   */
-  List getB();
-
-  /**
-   * Returns the value of the '<em><b>Split</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Split</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Split</em>' attribute.
-   * @see #isSetSplit()
-   * @see #unsetSplit()
-   * @see #setSplit(String)
-   * @generated
-   */
-  String getSplit();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.TwoRCs#getSplit <em>Split</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Split</em>' attribute.
-   * @see #isSetSplit()
-   * @see #unsetSplit()
-   * @see #getSplit()
-   * @generated
-   */
-  void setSplit(String value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.TwoRCs#getSplit <em>Split</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetSplit()
-   * @see #getSplit()
-   * @see #setSplit(String)
-   * @generated
-   */
-  void unsetSplit();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.TwoRCs#getSplit <em>Split</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Split</em>' attribute is set.
-   * @see #unsetSplit()
-   * @see #getSplit()
-   * @see #setSplit(String)
-   * @generated
-   */
-  boolean isSetSplit();
-
-  /**
-   * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Group1</em>' attribute list.
-   * @generated
-   */
-  Sequence getGroup1();
-
-  /**
-   * Returns the value of the '<em><b>Y</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Y</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Y</em>' attribute list.
-   * @generated
-   */
-  List getY();
-
-  /**
-   * Returns the value of the '<em><b>Z</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.Integer}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Z</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Z</em>' attribute list.
-   * @generated
-   */
-  List getZ();
-
-} // TwoRCs
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/TwoRCsMixed.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
deleted file mode 100644
index 90d5f942b6..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Two RCs Mixed</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link com.example.sequences.TwoRCsMixed#getMixed <em>Mixed</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCsMixed#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCsMixed#getA <em>A</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCsMixed#getB <em>B</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCsMixed#getSplit <em>Split</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCsMixed#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCsMixed#getY <em>Y</em>}</li>
- *   <li>{@link com.example.sequences.TwoRCsMixed#getZ <em>Z</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface TwoRCsMixed extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Mixed</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Mixed</em>' attribute list.
-   * @generated
-   */
-  Sequence getMixed();
-
-  /**
-   * Returns the value of the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Group</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Group</em>' attribute list.
-   * @generated
-   */
-  Sequence getGroup();
-
-  /**
-   * Returns the value of the '<em><b>A</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>A</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>A</em>' attribute list.
-   * @generated
-   */
-  List getA();
-
-  /**
-   * Returns the value of the '<em><b>B</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.Integer}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>B</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>B</em>' attribute list.
-   * @generated
-   */
-  List getB();
-
-  /**
-   * Returns the value of the '<em><b>Split</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Split</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Split</em>' attribute.
-   * @see #isSetSplit()
-   * @see #unsetSplit()
-   * @see #setSplit(String)
-   * @generated
-   */
-  String getSplit();
-
-  /**
-   * Sets the value of the '{@link com.example.sequences.TwoRCsMixed#getSplit <em>Split</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Split</em>' attribute.
-   * @see #isSetSplit()
-   * @see #unsetSplit()
-   * @see #getSplit()
-   * @generated
-   */
-  void setSplit(String value);
-
-  /**
-   * Unsets the value of the '{@link com.example.sequences.TwoRCsMixed#getSplit <em>Split</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetSplit()
-   * @see #getSplit()
-   * @see #setSplit(String)
-   * @generated
-   */
-  void unsetSplit();
-
-  /**
-   * Returns whether the value of the '{@link com.example.sequences.TwoRCsMixed#getSplit <em>Split</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Split</em>' attribute is set.
-   * @see #unsetSplit()
-   * @see #getSplit()
-   * @see #setSplit(String)
-   * @generated
-   */
-  boolean isSetSplit();
-
-  /**
-   * Returns the value of the '<em><b>Group1</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Group1</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Group1</em>' attribute list.
-   * @generated
-   */
-  Sequence getGroup1();
-
-  /**
-   * Returns the value of the '<em><b>Y</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Y</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Y</em>' attribute list.
-   * @generated
-   */
-  List getY();
-
-  /**
-   * Returns the value of the '<em><b>Z</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.Integer}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Z</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Z</em>' attribute list.
-   * @generated
-   */
-  List getZ();
-
-} // TwoRCsMixed
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
deleted file mode 100644
index 96fe832ef3..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
+++ /dev/null
@@ -1,766 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences.impl;
-
-import com.example.sequences.MixedQuote;
-import com.example.sequences.SequencesFactory;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mixed Quote</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getCompanyName <em>Company Name</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getPrice <em>Price</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getOpen1 <em>Open1</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getHigh <em>High</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getLow <em>Low</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getVolume <em>Volume</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getChange1 <em>Change1</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedQuoteImpl#getQuotes <em>Quotes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MixedQuoteImpl extends DataObjectBase implements MixedQuote
-{
-
-  public final static int MIXED = -1;
-
-  public final static int SYMBOL = 0;
-
-  public final static int COMPANY_NAME = 1;
-
-  public final static int PRICE = 2;
-
-  public final static int OPEN1 = 3;
-
-  public final static int HIGH = 4;
-
-  public final static int LOW = 5;
-
-  public final static int VOLUME = 6;
-
-  public final static int CHANGE1 = 7;
-
-  public final static int QUOTES = 8;
-
-  public final static int SDO_PROPERTY_COUNT = 9;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -1;
-
-
-  /**
-   * The internal feature id for the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_MIXED = 0;
-
-  /**
-   * The internal feature id for the '<em><b>Symbol</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_SYMBOL = 1;
-
-  /**
-   * The internal feature id for the '<em><b>Company Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_COMPANY_NAME = 2;
-
-  /**
-   * The internal feature id for the '<em><b>Price</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_PRICE = 3;
-
-  /**
-   * The internal feature id for the '<em><b>Open1</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_OPEN1 = 4;
-
-  /**
-   * The internal feature id for the '<em><b>High</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_HIGH = 5;
-
-  /**
-   * The internal feature id for the '<em><b>Low</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_LOW = 6;
-
-  /**
-   * The internal feature id for the '<em><b>Volume</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_VOLUME = 7;
-
-  /**
-   * The internal feature id for the '<em><b>Change1</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_CHANGE1 = 8;
-
-  /**
-   * The internal feature id for the '<em><b>Quotes</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_QUOTES = 9;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 10;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_MIXED: return MIXED;
-      case INTERNAL_SYMBOL: return SYMBOL;
-      case INTERNAL_COMPANY_NAME: return COMPANY_NAME;
-      case INTERNAL_PRICE: return PRICE;
-      case INTERNAL_OPEN1: return OPEN1;
-      case INTERNAL_HIGH: return HIGH;
-      case INTERNAL_LOW: return LOW;
-      case INTERNAL_VOLUME: return VOLUME;
-      case INTERNAL_CHANGE1: return CHANGE1;
-      case INTERNAL_QUOTES: return QUOTES;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMixed()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence mixed = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public MixedQuoteImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((SequencesFactoryImpl)SequencesFactory.INSTANCE).getMixedQuote();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getStaticPropertyCount()
-  {
-    return INTERNAL_PROPERTY_COUNT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getMixed()
-  {
-    if (mixed == null)
-    {
-      mixed = createSequence(INTERNAL_MIXED);
-    }
-    return mixed;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getSymbol()
-  {
-    return (String)get(getMixed(), getType(), INTERNAL_SYMBOL);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSymbol(String newSymbol)
-  {
-    set(getMixed(), getType(), INTERNAL_SYMBOL, newSymbol);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetSymbol()
-  {
-        unset(getMixed(), getType(), INTERNAL_SYMBOL);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetSymbol()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_SYMBOL);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getCompanyName()
-  {
-    return (String)get(getMixed(), getType(), INTERNAL_COMPANY_NAME);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setCompanyName(String newCompanyName)
-  {
-    set(getMixed(), getType(), INTERNAL_COMPANY_NAME, newCompanyName);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetCompanyName()
-  {
-        unset(getMixed(), getType(), INTERNAL_COMPANY_NAME);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetCompanyName()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_COMPANY_NAME);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BigDecimal getPrice()
-  {
-    return (BigDecimal)get(getMixed(), getType(), INTERNAL_PRICE);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPrice(BigDecimal newPrice)
-  {
-    set(getMixed(), getType(), INTERNAL_PRICE, newPrice);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetPrice()
-  {
-        unset(getMixed(), getType(), INTERNAL_PRICE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetPrice()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_PRICE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BigDecimal getOpen1()
-  {
-    return (BigDecimal)get(getMixed(), getType(), INTERNAL_OPEN1);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setOpen1(BigDecimal newOpen1)
-  {
-    set(getMixed(), getType(), INTERNAL_OPEN1, newOpen1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetOpen1()
-  {
-        unset(getMixed(), getType(), INTERNAL_OPEN1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetOpen1()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_OPEN1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BigDecimal getHigh()
-  {
-    return (BigDecimal)get(getMixed(), getType(), INTERNAL_HIGH);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setHigh(BigDecimal newHigh)
-  {
-    set(getMixed(), getType(), INTERNAL_HIGH, newHigh);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetHigh()
-  {
-        unset(getMixed(), getType(), INTERNAL_HIGH);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetHigh()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_HIGH);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BigDecimal getLow()
-  {
-    return (BigDecimal)get(getMixed(), getType(), INTERNAL_LOW);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLow(BigDecimal newLow)
-  {
-    set(getMixed(), getType(), INTERNAL_LOW, newLow);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetLow()
-  {
-        unset(getMixed(), getType(), INTERNAL_LOW);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetLow()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_LOW);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public double getVolume()
-  {
-    return ((Double)get(getMixed(), getType(), INTERNAL_VOLUME)).doubleValue();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setVolume(double newVolume)
-  {
-    set(getMixed(), getType(), INTERNAL_VOLUME,  new Double(newVolume));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetVolume()
-  {
-        unset(getMixed(), getType(), INTERNAL_VOLUME);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetVolume()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_VOLUME);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public double getChange1()
-  {
-    return ((Double)get(getMixed(), getType(), INTERNAL_CHANGE1)).doubleValue();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setChange1(double newChange1)
-  {
-    set(getMixed(), getType(), INTERNAL_CHANGE1,  new Double(newChange1));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetChange1()
-  {
-        unset(getMixed(), getType(), INTERNAL_CHANGE1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetChange1()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_CHANGE1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getQuotes()
-  {
-    return getList(getMixed(), getType(), INTERNAL_QUOTES);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        return removeFromSequence(getMixed(), otherEnd, changeContext);
-      case QUOTES:
-        return removeFromList(getQuotes(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getMixed();
-      case SYMBOL:
-        return getSymbol();
-      case COMPANY_NAME:
-        return getCompanyName();
-      case PRICE:
-        return getPrice();
-      case OPEN1:
-        return getOpen1();
-      case HIGH:
-        return getHigh();
-      case LOW:
-        return getLow();
-      case VOLUME:
-        return new Double(getVolume());
-      case CHANGE1:
-        return new Double(getChange1());
-      case QUOTES:
-        return getQuotes();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-      	setSequence(getMixed(), newValue);
-        return;
-      case SYMBOL:
-        setSymbol((String)newValue);
-        return;
-      case COMPANY_NAME:
-        setCompanyName((String)newValue);
-        return;
-      case PRICE:
-        setPrice((BigDecimal)newValue);
-        return;
-      case OPEN1:
-        setOpen1((BigDecimal)newValue);
-        return;
-      case HIGH:
-        setHigh((BigDecimal)newValue);
-        return;
-      case LOW:
-        setLow((BigDecimal)newValue);
-        return;
-      case VOLUME:
-        setVolume(((Double)newValue).doubleValue());
-        return;
-      case CHANGE1:
-        setChange1(((Double)newValue).doubleValue());
-        return;
-      case QUOTES:
-        getQuotes().clear();
-        getQuotes().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        unsetSequence(getMixed());
-        return;
-      case SYMBOL:
-        unsetSymbol();
-        return;
-      case COMPANY_NAME:
-        unsetCompanyName();
-        return;
-      case PRICE:
-        unsetPrice();
-        return;
-      case OPEN1:
-        unsetOpen1();
-        return;
-      case HIGH:
-        unsetHigh();
-        return;
-      case LOW:
-        unsetLow();
-        return;
-      case VOLUME:
-        unsetVolume();
-        return;
-      case CHANGE1:
-        unsetChange1();
-        return;
-      case QUOTES:
-        getQuotes().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        return mixed != null && !isSequenceEmpty(getMixed());
-      case SYMBOL:
-        return isSetSymbol();
-      case COMPANY_NAME:
-        return isSetCompanyName();
-      case PRICE:
-        return isSetPrice();
-      case OPEN1:
-        return isSetOpen1();
-      case HIGH:
-        return isSetHigh();
-      case LOW:
-        return isSetLow();
-      case VOLUME:
-        return isSetVolume();
-      case CHANGE1:
-        return isSetChange1();
-      case QUOTES:
-        return !getQuotes().isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (mixed: ");
-    result.append(mixed);
-    result.append(')');
-    return result.toString();
-  }
-
-} //MixedQuoteImpl
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
deleted file mode 100644
index d9cb3ac080..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences.impl;
-
-import com.example.sequences.MixedRepeatingChoice;
-import com.example.sequences.SequencesFactory;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mixed Repeating Choice</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link com.example.sequences.impl.MixedRepeatingChoiceImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedRepeatingChoiceImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedRepeatingChoiceImpl#getA <em>A</em>}</li>
- *   <li>{@link com.example.sequences.impl.MixedRepeatingChoiceImpl#getB <em>B</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MixedRepeatingChoiceImpl extends DataObjectBase implements MixedRepeatingChoice
-{
-
-  public final static int MIXED = -1;
-
-  public final static int GROUP = -2;
-
-  public final static int A = 0;
-
-  public final static int B = 1;
-
-  public final static int SDO_PROPERTY_COUNT = 2;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -2;
-
-
-  /**
-   * The internal feature id for the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_MIXED = 0;
-
-  /**
-   * The internal feature id for the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_GROUP = 1;
-
-  /**
-   * The internal feature id for the '<em><b>A</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_A = 2;
-
-  /**
-   * The internal feature id for the '<em><b>B</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_B = 3;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 4;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_MIXED: return MIXED;
-      case INTERNAL_GROUP: return GROUP;
-      case INTERNAL_A: return A;
-      case INTERNAL_B: return B;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMixed()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence mixed = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public MixedRepeatingChoiceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((SequencesFactoryImpl)SequencesFactory.INSTANCE).getMixedRepeatingChoice();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getStaticPropertyCount()
-  {
-    return INTERNAL_PROPERTY_COUNT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getMixed()
-  {
-    if (mixed == null)
-    {
-      mixed = createSequence(INTERNAL_MIXED);
-    }
-    return mixed;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getGroup()
-  {
-    return createSequence(getMixed(), getType(), INTERNAL_GROUP);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getA()
-  {
-    return getList(getGroup(), getType(), INTERNAL_A);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getB()
-  {
-    return getList(getGroup(), getType(), INTERNAL_B);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        return removeFromSequence(getMixed(), otherEnd, changeContext);
-      case GROUP:
-        return removeFromSequence(getGroup(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getMixed();
-      case GROUP:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getGroup();
-      case A:
-        return getA();
-      case B:
-        return getB();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-      	setSequence(getMixed(), newValue);
-        return;
-      case GROUP:
-      	setSequence(getGroup(), newValue);
-        return;
-      case A:
-        getA().clear();
-        getA().addAll((Collection)newValue);
-        return;
-      case B:
-        getB().clear();
-        getB().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        unsetSequence(getMixed());
-        return;
-      case GROUP:
-        unsetSequence(getGroup());
-        return;
-      case A:
-        getA().clear();
-        return;
-      case B:
-        getB().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        return mixed != null && !isSequenceEmpty(getMixed());
-      case GROUP:
-        return !isSequenceEmpty(getGroup());
-      case A:
-        return !getA().isEmpty();
-      case B:
-        return !getB().isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (mixed: ");
-    result.append(mixed);
-    result.append(')');
-    return result.toString();
-  }
-
-} //MixedRepeatingChoiceImpl
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
deleted file mode 100644
index 376a8471cf..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences.impl;
-
-import com.example.sequences.RepeatingChoice;
-import com.example.sequences.SequencesFactory;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Repeating Choice</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link com.example.sequences.impl.RepeatingChoiceImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.sequences.impl.RepeatingChoiceImpl#getA <em>A</em>}</li>
- *   <li>{@link com.example.sequences.impl.RepeatingChoiceImpl#getB <em>B</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RepeatingChoiceImpl extends DataObjectBase implements RepeatingChoice
-{
-
-  public final static int GROUP = -1;
-
-  public final static int A = 0;
-
-  public final static int B = 1;
-
-  public final static int SDO_PROPERTY_COUNT = 2;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -1;
-
-
-  /**
-   * The internal feature id for the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_GROUP = 0;
-
-  /**
-   * The internal feature id for the '<em><b>A</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_A = 1;
-
-  /**
-   * The internal feature id for the '<em><b>B</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_B = 2;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 3;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_GROUP: return GROUP;
-      case INTERNAL_A: return A;
-      case INTERNAL_B: return B;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getGroup()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence group = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public RepeatingChoiceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((SequencesFactoryImpl)SequencesFactory.INSTANCE).getRepeatingChoice();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getStaticPropertyCount()
-  {
-    return INTERNAL_PROPERTY_COUNT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getGroup()
-  {
-    if (group == null)
-    {
-      group = createSequence(INTERNAL_GROUP);
-    }
-    return group;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getA()
-  {
-    return getList(getGroup(), getType(), INTERNAL_A);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getB()
-  {
-    return getList(getGroup(), getType(), INTERNAL_B);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        return removeFromSequence(getGroup(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getGroup();
-      case A:
-        return getA();
-      case B:
-        return getB();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-      	setSequence(getGroup(), newValue);
-        return;
-      case A:
-        getA().clear();
-        getA().addAll((Collection)newValue);
-        return;
-      case B:
-        getB().clear();
-        getB().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        unsetSequence(getGroup());
-        return;
-      case A:
-        getA().clear();
-        return;
-      case B:
-        getB().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        return group != null && !isSequenceEmpty(getGroup());
-      case A:
-        return !getA().isEmpty();
-      case B:
-        return !getB().isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (group: ");
-    result.append(group);
-    result.append(')');
-    return result.toString();
-  }
-
-} //RepeatingChoiceImpl
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
deleted file mode 100644
index 84631cb06d..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
+++ /dev/null
@@ -1,770 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences.impl;
-
-import commonj.sdo.helper.HelperContext;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-
-import com.example.sequences.*;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.FactoryBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * Generator information:
- * patternVersion=1.2; -prefix Sequences
- * <!-- end-user-doc -->
- * @generated
- */
-public class SequencesFactoryImpl extends FactoryBase implements SequencesFactory
-{
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_URI = "http://www.example.com/sequences";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_PREFIX = "seq";
-
-  /**
-   * The version of the generator pattern used to generate this class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String PATTERN_VERSION = "1.2";
-  
-  public static final int MIXED_QUOTE = 1;	
-  public static final int MIXED_REPEATING_CHOICE = 2;	
-  public static final int REPEATING_CHOICE = 3;	
-  public static final int TWO_RCS = 4;	
-  public static final int TWO_RCS_MIXED = 5;
-  
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SequencesFactoryImpl()
-  {
-    super(NAMESPACE_URI, NAMESPACE_PREFIX, "com.example.sequences");
-  }
-
-  /**
-   * Registers the Factory instance so that it is available within the supplied scope.
-   * @argument scope a HelperContext instance that will make the types supported by this Factory available.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void register(HelperContext scope) 
-  {
-    if(scope == 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);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject create(int typeNumber)
-  {
-    switch (typeNumber)
-    {
-      case MIXED_QUOTE: return (DataObject)createMixedQuote();
-      case MIXED_REPEATING_CHOICE: return (DataObject)createMixedRepeatingChoice();
-      case REPEATING_CHOICE: return (DataObject)createRepeatingChoice();
-      case TWO_RCS: return (DataObject)createTwoRCs();
-      case TWO_RCS_MIXED: return (DataObject)createTwoRCsMixed();
-      default:
-        return super.create(typeNumber);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public MixedQuote createMixedQuote()
-  {
-    MixedQuoteImpl mixedQuote = new MixedQuoteImpl();
-    return mixedQuote;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public MixedRepeatingChoice createMixedRepeatingChoice()
-  {
-    MixedRepeatingChoiceImpl mixedRepeatingChoice = new MixedRepeatingChoiceImpl();
-    return mixedRepeatingChoice;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public RepeatingChoice createRepeatingChoice()
-  {
-    RepeatingChoiceImpl repeatingChoice = new RepeatingChoiceImpl();
-    return repeatingChoice;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TwoRCs createTwoRCs()
-  {
-    TwoRCsImpl twoRCs = new TwoRCsImpl();
-    return twoRCs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TwoRCsMixed createTwoRCsMixed()
-  {
-    TwoRCsMixedImpl twoRCsMixed = new TwoRCsMixedImpl();
-    return twoRCsMixed;
-  }
-  
-  // Following creates and initializes SDO metadata for the supported types.			
-  protected Type mixedQuoteType = null;
-
-  public Type getMixedQuote()
-  {
-    return mixedQuoteType;
-  }
-    
-  protected Type mixedRepeatingChoiceType = null;
-
-  public Type getMixedRepeatingChoice()
-  {
-    return mixedRepeatingChoiceType;
-  }
-    
-  protected Type repeatingChoiceType = null;
-
-  public Type getRepeatingChoice()
-  {
-    return repeatingChoiceType;
-  }
-    
-  protected Type twoRCsType = null;
-
-  public Type getTwoRCs()
-  {
-    return twoRCsType;
-  }
-    
-  protected Type twoRCsMixedType = null;
-
-  public Type getTwoRCsMixed()
-  {
-    return twoRCsMixedType;
-  }
-  
-
-  private static SequencesFactoryImpl instance = null; 
-  public static SequencesFactoryImpl init()
-  {
-    if (instance != null ) return instance;
-    instance = new SequencesFactoryImpl();
-
-    // Initialize dependent packages
-    ModelFactory ModelFactoryInstance = ModelFactory.INSTANCE;
-    
-    // Create package meta-data objects
-    instance.createMetaData();
-
-    // Initialize created meta-data
-    instance.initializeMetaData();
-    
-    // Mark meta-data to indicate it can't be changed
-    //theSequencesFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
-
-    return instance;
-  }
-  
-  private boolean isCreated = false;
-
-  public void createMetaData()
-  {
-    if (isCreated) return;
-    isCreated = true;	
-
-    // Create types and their properties
-    mixedQuoteType = createType(false, MIXED_QUOTE);
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_MIXED); 
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_SYMBOL); 
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_COMPANY_NAME); 
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_PRICE); 
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_OPEN1); 
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_HIGH); 
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_LOW); 
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_VOLUME); 
-    createProperty(true, mixedQuoteType,MixedQuoteImpl.INTERNAL_CHANGE1); 
-    createProperty(false, mixedQuoteType,MixedQuoteImpl.INTERNAL_QUOTES); 
-    mixedRepeatingChoiceType = createType(false, MIXED_REPEATING_CHOICE);
-    createProperty(true, mixedRepeatingChoiceType,MixedRepeatingChoiceImpl.INTERNAL_MIXED); 
-    createProperty(true, mixedRepeatingChoiceType,MixedRepeatingChoiceImpl.INTERNAL_GROUP); 
-    createProperty(true, mixedRepeatingChoiceType,MixedRepeatingChoiceImpl.INTERNAL_A); 
-    createProperty(true, mixedRepeatingChoiceType,MixedRepeatingChoiceImpl.INTERNAL_B); 
-    repeatingChoiceType = createType(false, REPEATING_CHOICE);
-    createProperty(true, repeatingChoiceType,RepeatingChoiceImpl.INTERNAL_GROUP); 
-    createProperty(true, repeatingChoiceType,RepeatingChoiceImpl.INTERNAL_A); 
-    createProperty(true, repeatingChoiceType,RepeatingChoiceImpl.INTERNAL_B); 
-    twoRCsType = createType(false, TWO_RCS);
-    createProperty(true, twoRCsType,TwoRCsImpl.INTERNAL_GROUP); 
-    createProperty(true, twoRCsType,TwoRCsImpl.INTERNAL_A); 
-    createProperty(true, twoRCsType,TwoRCsImpl.INTERNAL_B); 
-    createProperty(true, twoRCsType,TwoRCsImpl.INTERNAL_SPLIT); 
-    createProperty(true, twoRCsType,TwoRCsImpl.INTERNAL_GROUP1); 
-    createProperty(true, twoRCsType,TwoRCsImpl.INTERNAL_Y); 
-    createProperty(true, twoRCsType,TwoRCsImpl.INTERNAL_Z); 
-    twoRCsMixedType = createType(false, TWO_RCS_MIXED);
-    createProperty(true, twoRCsMixedType,TwoRCsMixedImpl.INTERNAL_MIXED); 
-    createProperty(true, twoRCsMixedType,TwoRCsMixedImpl.INTERNAL_GROUP); 
-    createProperty(true, twoRCsMixedType,TwoRCsMixedImpl.INTERNAL_A); 
-    createProperty(true, twoRCsMixedType,TwoRCsMixedImpl.INTERNAL_B); 
-    createProperty(true, twoRCsMixedType,TwoRCsMixedImpl.INTERNAL_SPLIT); 
-    createProperty(true, twoRCsMixedType,TwoRCsMixedImpl.INTERNAL_GROUP1); 
-    createProperty(true, twoRCsMixedType,TwoRCsMixedImpl.INTERNAL_Y); 
-    createProperty(true, twoRCsMixedType,TwoRCsMixedImpl.INTERNAL_Z); 
-  }
-  
-  private boolean isInitialized = false;
-
-  public void initializeMetaData()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Obtain other dependent packages
-    ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactory.INSTANCE;
-    Property property = null;
-
-    // Add supertypes to types
-
-    // Initialize types and properties
-    initializeType(mixedQuoteType, MixedQuote.class, "MixedQuote", false);
-    property = getLocalProperty(mixedQuoteType, 0);
-    initializeProperty(property, getSequence(), "mixed", null, 0, -1, MixedQuote.class, false, false, false);
-
-    property = getLocalProperty(mixedQuoteType, 1);
-    initializeProperty(property, theModelPackageImpl.getString(), "symbol", null, 1, 1, MixedQuote.class, false, true, true);
-
-    property = getLocalProperty(mixedQuoteType, 2);
-    initializeProperty(property, theModelPackageImpl.getString(), "companyName", null, 1, 1, MixedQuote.class, false, true, true);
-
-    property = getLocalProperty(mixedQuoteType, 3);
-    initializeProperty(property, theModelPackageImpl.getDecimal(), "price", null, 1, 1, MixedQuote.class, false, true, true);
-
-    property = getLocalProperty(mixedQuoteType, 4);
-    initializeProperty(property, theModelPackageImpl.getDecimal(), "open1", null, 1, 1, MixedQuote.class, false, true, true);
-
-    property = getLocalProperty(mixedQuoteType, 5);
-    initializeProperty(property, theModelPackageImpl.getDecimal(), "high", null, 1, 1, MixedQuote.class, false, true, true);
-
-    property = getLocalProperty(mixedQuoteType, 6);
-    initializeProperty(property, theModelPackageImpl.getDecimal(), "low", null, 1, 1, MixedQuote.class, false, true, true);
-
-    property = getLocalProperty(mixedQuoteType, 7);
-    initializeProperty(property, theModelPackageImpl.getDouble(), "volume", null, 1, 1, MixedQuote.class, false, true, true);
-
-    property = getLocalProperty(mixedQuoteType, 8);
-    initializeProperty(property, theModelPackageImpl.getDouble(), "change1", null, 1, 1, MixedQuote.class, false, true, true);
-
-    property = getLocalProperty(mixedQuoteType, 9);
-    initializeProperty(property, this.getMixedQuote(), "quotes", null, 0, -1, MixedQuote.class, false, false, true, true , null);
-
-    initializeType(mixedRepeatingChoiceType, MixedRepeatingChoice.class, "MixedRepeatingChoice", false);
-    property = getLocalProperty(mixedRepeatingChoiceType, 0);
-    initializeProperty(property, getSequence(), "mixed", null, 0, -1, MixedRepeatingChoice.class, false, false, false);
-
-    property = getLocalProperty(mixedRepeatingChoiceType, 1);
-    initializeProperty(property, getSequence(), "group", null, 0, -1, MixedRepeatingChoice.class, false, false, true);
-
-    property = getLocalProperty(mixedRepeatingChoiceType, 2);
-    initializeProperty(property, theModelPackageImpl.getString(), "a", null, 0, -1, MixedRepeatingChoice.class, false, false, true);
-
-    property = getLocalProperty(mixedRepeatingChoiceType, 3);
-    initializeProperty(property, theModelPackageImpl.getInt(), "b", null, 0, -1, MixedRepeatingChoice.class, false, false, true);
-
-    initializeType(repeatingChoiceType, RepeatingChoice.class, "RepeatingChoice", false);
-    property = getLocalProperty(repeatingChoiceType, 0);
-    initializeProperty(property, getSequence(), "group", null, 0, -1, RepeatingChoice.class, false, false, false);
-
-    property = getLocalProperty(repeatingChoiceType, 1);
-    initializeProperty(property, theModelPackageImpl.getString(), "a", null, 0, -1, RepeatingChoice.class, false, false, true);
-
-    property = getLocalProperty(repeatingChoiceType, 2);
-    initializeProperty(property, theModelPackageImpl.getInt(), "b", null, 0, -1, RepeatingChoice.class, false, false, true);
-
-    initializeType(twoRCsType, TwoRCs.class, "TwoRCs", false);
-    property = getLocalProperty(twoRCsType, 0);
-    initializeProperty(property, getSequence(), "group", null, 0, -1, TwoRCs.class, false, false, false);
-
-    property = getLocalProperty(twoRCsType, 1);
-    initializeProperty(property, theModelPackageImpl.getString(), "a", null, 0, -1, TwoRCs.class, false, false, true);
-
-    property = getLocalProperty(twoRCsType, 2);
-    initializeProperty(property, theModelPackageImpl.getInt(), "b", null, 0, -1, TwoRCs.class, false, false, true);
-
-    property = getLocalProperty(twoRCsType, 3);
-    initializeProperty(property, theModelPackageImpl.getString(), "split", null, 1, 1, TwoRCs.class, false, true, false);
-
-    property = getLocalProperty(twoRCsType, 4);
-    initializeProperty(property, getSequence(), "group1", null, 0, -1, TwoRCs.class, false, false, false);
-
-    property = getLocalProperty(twoRCsType, 5);
-    initializeProperty(property, theModelPackageImpl.getString(), "y", null, 0, -1, TwoRCs.class, false, false, true);
-
-    property = getLocalProperty(twoRCsType, 6);
-    initializeProperty(property, theModelPackageImpl.getInt(), "z", null, 0, -1, TwoRCs.class, false, false, true);
-
-    initializeType(twoRCsMixedType, TwoRCsMixed.class, "TwoRCsMixed", false);
-    property = getLocalProperty(twoRCsMixedType, 0);
-    initializeProperty(property, getSequence(), "mixed", null, 0, -1, TwoRCsMixed.class, false, false, false);
-
-    property = getLocalProperty(twoRCsMixedType, 1);
-    initializeProperty(property, getSequence(), "group", null, 0, -1, TwoRCsMixed.class, false, false, true);
-
-    property = getLocalProperty(twoRCsMixedType, 2);
-    initializeProperty(property, theModelPackageImpl.getString(), "a", null, 0, -1, TwoRCsMixed.class, false, false, true);
-
-    property = getLocalProperty(twoRCsMixedType, 3);
-    initializeProperty(property, theModelPackageImpl.getInt(), "b", null, 0, -1, TwoRCsMixed.class, false, false, true);
-
-    property = getLocalProperty(twoRCsMixedType, 4);
-    initializeProperty(property, theModelPackageImpl.getString(), "split", null, 1, 1, TwoRCsMixed.class, false, true, true);
-
-    property = getLocalProperty(twoRCsMixedType, 5);
-    initializeProperty(property, getSequence(), "group1", null, 0, -1, TwoRCsMixed.class, false, false, true);
-
-    property = getLocalProperty(twoRCsMixedType, 6);
-    initializeProperty(property, theModelPackageImpl.getString(), "y", null, 0, -1, TwoRCsMixed.class, false, false, true);
-
-    property = getLocalProperty(twoRCsMixedType, 7);
-    initializeProperty(property, theModelPackageImpl.getInt(), "z", null, 0, -1, TwoRCsMixed.class, false, false, true);
-
-    createXSDMetaData(theModelPackageImpl);
-  }
-    
-  protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl)
-  {
-    super.initXSD();
-    
-    Property property = null;
-    
-
-    property = createGlobalProperty
-      ("mixedStockQuote",
-      this.getMixedQuote(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "mixedStockQuote",
-       "namespace", "##targetNamespace"
-       });
-                
-    property = createGlobalProperty
-      ("mrc",
-      this.getMixedRepeatingChoice(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "mrc",
-       "namespace", "##targetNamespace"
-       });
-                
-    property = createGlobalProperty
-      ("mrc2",
-      this.getTwoRCsMixed(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "mrc2",
-       "namespace", "##targetNamespace"
-       });
-                
-    property = createGlobalProperty
-      ("rc",
-      this.getRepeatingChoice(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "rc",
-       "namespace", "##targetNamespace"
-       });
-                
-    property = createGlobalProperty
-      ("rc2",
-      this.getTwoRCs(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "rc2",
-       "namespace", "##targetNamespace"
-       });
-                
-    addXSDMapping
-      (mixedQuoteType,
-       new String[] 
-       {
-       "name", "MixedQuote",
-       "kind", "mixed"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_MIXED),
-       new String[]
-       {
-       "kind", "elementWildcard",
-       "name", ":mixed"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_SYMBOL),
-       new String[]
-       {
-       "kind", "element",
-       "name", "symbol"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_COMPANY_NAME),
-       new String[]
-       {
-       "kind", "element",
-       "name", "companyName"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_PRICE),
-       new String[]
-       {
-       "kind", "element",
-       "name", "price"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_OPEN1),
-       new String[]
-       {
-       "kind", "element",
-       "name", "open1"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_HIGH),
-       new String[]
-       {
-       "kind", "element",
-       "name", "high"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_LOW),
-       new String[]
-       {
-       "kind", "element",
-       "name", "low"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_VOLUME),
-       new String[]
-       {
-       "kind", "element",
-       "name", "volume"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_CHANGE1),
-       new String[]
-       {
-       "kind", "element",
-       "name", "change1"
-       });
-
-    addXSDMapping
-      (getProperty(mixedQuoteType, MixedQuoteImpl.INTERNAL_QUOTES),
-       new String[]
-       {
-       "kind", "element",
-       "name", "quotes"
-       });
-
-    addXSDMapping
-      (mixedRepeatingChoiceType,
-       new String[] 
-       {
-       "name", "MixedRepeatingChoice",
-       "kind", "mixed"
-       });
-
-    addXSDMapping
-      (getProperty(mixedRepeatingChoiceType, MixedRepeatingChoiceImpl.INTERNAL_MIXED),
-       new String[]
-       {
-       "kind", "elementWildcard",
-       "name", ":mixed"
-       });
-
-    addXSDMapping
-      (getProperty(mixedRepeatingChoiceType, MixedRepeatingChoiceImpl.INTERNAL_GROUP),
-       new String[]
-       {
-       "kind", "group",
-       "name", "group:1"
-       });
-
-    addXSDMapping
-      (getProperty(mixedRepeatingChoiceType, MixedRepeatingChoiceImpl.INTERNAL_A),
-       new String[]
-       {
-       "kind", "element",
-       "name", "a",
-       "group", "#group:1"
-       });
-
-    addXSDMapping
-      (getProperty(mixedRepeatingChoiceType, MixedRepeatingChoiceImpl.INTERNAL_B),
-       new String[]
-       {
-       "kind", "element",
-       "name", "b",
-       "group", "#group:1"
-       });
-
-    addXSDMapping
-      (repeatingChoiceType,
-       new String[] 
-       {
-       "name", "RepeatingChoice",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(repeatingChoiceType, RepeatingChoiceImpl.INTERNAL_GROUP),
-       new String[]
-       {
-       "kind", "group",
-       "name", "group:0"
-       });
-
-    addXSDMapping
-      (getProperty(repeatingChoiceType, RepeatingChoiceImpl.INTERNAL_A),
-       new String[]
-       {
-       "kind", "element",
-       "name", "a",
-       "group", "#group:0"
-       });
-
-    addXSDMapping
-      (getProperty(repeatingChoiceType, RepeatingChoiceImpl.INTERNAL_B),
-       new String[]
-       {
-       "kind", "element",
-       "name", "b",
-       "group", "#group:0"
-       });
-
-    addXSDMapping
-      (twoRCsType,
-       new String[] 
-       {
-       "name", "TwoRCs",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsType, TwoRCsImpl.INTERNAL_GROUP),
-       new String[]
-       {
-       "kind", "group",
-       "name", "group:0"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsType, TwoRCsImpl.INTERNAL_A),
-       new String[]
-       {
-       "kind", "element",
-       "name", "a",
-       "group", "#group:0"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsType, TwoRCsImpl.INTERNAL_B),
-       new String[]
-       {
-       "kind", "element",
-       "name", "b",
-       "group", "#group:0"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsType, TwoRCsImpl.INTERNAL_SPLIT),
-       new String[]
-       {
-       "kind", "element",
-       "name", "split"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsType, TwoRCsImpl.INTERNAL_GROUP1),
-       new String[]
-       {
-       "kind", "group",
-       "name", "group:4"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsType, TwoRCsImpl.INTERNAL_Y),
-       new String[]
-       {
-       "kind", "element",
-       "name", "y",
-       "group", "#group:4"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsType, TwoRCsImpl.INTERNAL_Z),
-       new String[]
-       {
-       "kind", "element",
-       "name", "z",
-       "group", "#group:4"
-       });
-
-    addXSDMapping
-      (twoRCsMixedType,
-       new String[] 
-       {
-       "name", "TwoRCsMixed",
-       "kind", "mixed"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsMixedType, TwoRCsMixedImpl.INTERNAL_MIXED),
-       new String[]
-       {
-       "kind", "elementWildcard",
-       "name", ":mixed"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsMixedType, TwoRCsMixedImpl.INTERNAL_GROUP),
-       new String[]
-       {
-       "kind", "group",
-       "name", "group:1"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsMixedType, TwoRCsMixedImpl.INTERNAL_A),
-       new String[]
-       {
-       "kind", "element",
-       "name", "a",
-       "group", "#group:1"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsMixedType, TwoRCsMixedImpl.INTERNAL_B),
-       new String[]
-       {
-       "kind", "element",
-       "name", "b",
-       "group", "#group:1"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsMixedType, TwoRCsMixedImpl.INTERNAL_SPLIT),
-       new String[]
-       {
-       "kind", "element",
-       "name", "split"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsMixedType, TwoRCsMixedImpl.INTERNAL_GROUP1),
-       new String[]
-       {
-       "kind", "group",
-       "name", "group:5"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsMixedType, TwoRCsMixedImpl.INTERNAL_Y),
-       new String[]
-       {
-       "kind", "element",
-       "name", "y",
-       "group", "#group:5"
-       });
-
-    addXSDMapping
-      (getProperty(twoRCsMixedType, TwoRCsMixedImpl.INTERNAL_Z),
-       new String[]
-       {
-       "kind", "element",
-       "name", "z",
-       "group", "#group:5"
-       });
-
-  }
-    
-} //SequencesFactoryImpl
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
deleted file mode 100644
index c1e385ec63..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences.impl;
-
-import com.example.sequences.SequencesFactory;
-import com.example.sequences.TwoRCs;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Two RCs</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link com.example.sequences.impl.TwoRCsImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsImpl#getA <em>A</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsImpl#getB <em>B</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsImpl#getSplit <em>Split</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsImpl#getY <em>Y</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsImpl#getZ <em>Z</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TwoRCsImpl extends DataObjectBase implements TwoRCs
-{
-
-  public final static int GROUP = -1;
-
-  public final static int A = 0;
-
-  public final static int B = 1;
-
-  public final static int SPLIT = 2;
-
-  public final static int GROUP1 = -2;
-
-  public final static int Y = 3;
-
-  public final static int Z = 4;
-
-  public final static int SDO_PROPERTY_COUNT = 5;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -2;
-
-
-  /**
-   * The internal feature id for the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_GROUP = 0;
-
-  /**
-   * The internal feature id for the '<em><b>A</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_A = 1;
-
-  /**
-   * The internal feature id for the '<em><b>B</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_B = 2;
-
-  /**
-   * The internal feature id for the '<em><b>Split</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_SPLIT = 3;
-
-  /**
-   * The internal feature id for the '<em><b>Group1</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_GROUP1 = 4;
-
-  /**
-   * The internal feature id for the '<em><b>Y</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_Y = 5;
-
-  /**
-   * The internal feature id for the '<em><b>Z</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_Z = 6;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 7;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_GROUP: return GROUP;
-      case INTERNAL_A: return A;
-      case INTERNAL_B: return B;
-      case INTERNAL_SPLIT: return SPLIT;
-      case INTERNAL_GROUP1: return GROUP1;
-      case INTERNAL_Y: return Y;
-      case INTERNAL_Z: return Z;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getGroup()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence group = null;
-  
-  /**
-   * The default value of the '{@link #getSplit() <em>Split</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSplit()
-   * @generated
-   * @ordered
-   */
-  protected static final String SPLIT_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getSplit() <em>Split</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSplit()
-   * @generated
-   * @ordered
-   */
-  protected String split = SPLIT_DEFAULT_;
-
-  /**
-   * This is true if the Split attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean split_set_ = false;
-
-  /**
-   * The cached value of the '{@link #getGroup1() <em>Group1</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getGroup1()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence group1 = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TwoRCsImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((SequencesFactoryImpl)SequencesFactory.INSTANCE).getTwoRCs();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getStaticPropertyCount()
-  {
-    return INTERNAL_PROPERTY_COUNT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getGroup()
-  {
-    if (group == null)
-    {
-      group = createSequence(INTERNAL_GROUP);
-    }
-    return group;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getA()
-  {
-    return getList(getGroup(), getType(), INTERNAL_A);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getB()
-  {
-    return getList(getGroup(), getType(), INTERNAL_B);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getSplit()
-  {
-    return split;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSplit(String newSplit)
-  {
-    String oldSplit = split;
-    split = newSplit;
-    boolean oldSplit_set_ = split_set_;
-    split_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_SPLIT, oldSplit, split, !oldSplit_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetSplit()
-  {
-    String oldSplit = split;
-    boolean oldSplit_set_ = split_set_;
-    split = SPLIT_DEFAULT_;
-    split_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_SPLIT, oldSplit, SPLIT_DEFAULT_, oldSplit_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetSplit()
-  {
-    return split_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getGroup1()
-  {
-    if (group1 == null)
-    {
-      group1 = createSequence(INTERNAL_GROUP1);
-    }
-    return group1;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getY()
-  {
-    return getList(getGroup1(), getType(), INTERNAL_Y);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getZ()
-  {
-    return getList(getGroup1(), getType(), INTERNAL_Z);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        return removeFromSequence(getGroup(), otherEnd, changeContext);
-      case GROUP1:
-        return removeFromSequence(getGroup1(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getGroup();
-      case A:
-        return getA();
-      case B:
-        return getB();
-      case SPLIT:
-        return getSplit();
-      case GROUP1:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getGroup1();
-      case Y:
-        return getY();
-      case Z:
-        return getZ();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-      	setSequence(getGroup(), newValue);
-        return;
-      case A:
-        getA().clear();
-        getA().addAll((Collection)newValue);
-        return;
-      case B:
-        getB().clear();
-        getB().addAll((Collection)newValue);
-        return;
-      case SPLIT:
-        setSplit((String)newValue);
-        return;
-      case GROUP1:
-      	setSequence(getGroup1(), newValue);
-        return;
-      case Y:
-        getY().clear();
-        getY().addAll((Collection)newValue);
-        return;
-      case Z:
-        getZ().clear();
-        getZ().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        unsetSequence(getGroup());
-        return;
-      case A:
-        getA().clear();
-        return;
-      case B:
-        getB().clear();
-        return;
-      case SPLIT:
-        unsetSplit();
-        return;
-      case GROUP1:
-        unsetSequence(getGroup1());
-        return;
-      case Y:
-        getY().clear();
-        return;
-      case Z:
-        getZ().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case GROUP:
-        return group != null && !isSequenceEmpty(getGroup());
-      case A:
-        return !getA().isEmpty();
-      case B:
-        return !getB().isEmpty();
-      case SPLIT:
-        return isSetSplit();
-      case GROUP1:
-        return group1 != null && !isSequenceEmpty(getGroup1());
-      case Y:
-        return !getY().isEmpty();
-      case Z:
-        return !getZ().isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (group: ");
-    result.append(group);
-    result.append(", split: ");
-    if (split_set_) result.append(split); else result.append("<unset>");
-    result.append(", group1: ");
-    result.append(group1);
-    result.append(')');
-    return result.toString();
-  }
-
-} //TwoRCsImpl
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
deleted file mode 100644
index 0d48a9df69..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package com.example.sequences.impl;
-
-import com.example.sequences.SequencesFactory;
-import com.example.sequences.TwoRCsMixed;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Two RCs Mixed</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link com.example.sequences.impl.TwoRCsMixedImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsMixedImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsMixedImpl#getA <em>A</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsMixedImpl#getB <em>B</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsMixedImpl#getSplit <em>Split</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsMixedImpl#getGroup1 <em>Group1</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsMixedImpl#getY <em>Y</em>}</li>
- *   <li>{@link com.example.sequences.impl.TwoRCsMixedImpl#getZ <em>Z</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TwoRCsMixedImpl extends DataObjectBase implements TwoRCsMixed
-{
-
-  public final static int MIXED = -1;
-
-  public final static int GROUP = -2;
-
-  public final static int A = 0;
-
-  public final static int B = 1;
-
-  public final static int SPLIT = 2;
-
-  public final static int GROUP1 = -3;
-
-  public final static int Y = 3;
-
-  public final static int Z = 4;
-
-  public final static int SDO_PROPERTY_COUNT = 5;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -3;
-
-
-  /**
-   * The internal feature id for the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_MIXED = 0;
-
-  /**
-   * The internal feature id for the '<em><b>Group</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_GROUP = 1;
-
-  /**
-   * The internal feature id for the '<em><b>A</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_A = 2;
-
-  /**
-   * The internal feature id for the '<em><b>B</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_B = 3;
-
-  /**
-   * The internal feature id for the '<em><b>Split</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_SPLIT = 4;
-
-  /**
-   * The internal feature id for the '<em><b>Group1</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_GROUP1 = 5;
-
-  /**
-   * The internal feature id for the '<em><b>Y</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_Y = 6;
-
-  /**
-   * The internal feature id for the '<em><b>Z</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_Z = 7;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 8;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_MIXED: return MIXED;
-      case INTERNAL_GROUP: return GROUP;
-      case INTERNAL_A: return A;
-      case INTERNAL_B: return B;
-      case INTERNAL_SPLIT: return SPLIT;
-      case INTERNAL_GROUP1: return GROUP1;
-      case INTERNAL_Y: return Y;
-      case INTERNAL_Z: return Z;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMixed()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence mixed = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TwoRCsMixedImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((SequencesFactoryImpl)SequencesFactory.INSTANCE).getTwoRCsMixed();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getStaticPropertyCount()
-  {
-    return INTERNAL_PROPERTY_COUNT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getMixed()
-  {
-    if (mixed == null)
-    {
-      mixed = createSequence(INTERNAL_MIXED);
-    }
-    return mixed;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getGroup()
-  {
-    return createSequence(getMixed(), getType(), INTERNAL_GROUP);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getA()
-  {
-    return getList(getGroup(), getType(), INTERNAL_A);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getB()
-  {
-    return getList(getGroup(), getType(), INTERNAL_B);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getSplit()
-  {
-    return (String)get(getMixed(), getType(), INTERNAL_SPLIT);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSplit(String newSplit)
-  {
-    set(getMixed(), getType(), INTERNAL_SPLIT, newSplit);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetSplit()
-  {
-        unset(getMixed(), getType(), INTERNAL_SPLIT);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetSplit()
-  {
-        return isSet(getMixed(), getType(), INTERNAL_SPLIT);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getGroup1()
-  {
-    return createSequence(getMixed(), getType(), INTERNAL_GROUP1);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getY()
-  {
-    return getList(getGroup1(), getType(), INTERNAL_Y);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getZ()
-  {
-    return getList(getGroup1(), getType(), INTERNAL_Z);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        return removeFromSequence(getMixed(), otherEnd, changeContext);
-      case GROUP:
-        return removeFromSequence(getGroup(), otherEnd, changeContext);
-      case GROUP1:
-        return removeFromSequence(getGroup1(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getMixed();
-      case GROUP:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getGroup();
-      case A:
-        return getA();
-      case B:
-        return getB();
-      case SPLIT:
-        return getSplit();
-      case GROUP1:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getGroup1();
-      case Y:
-        return getY();
-      case Z:
-        return getZ();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-      	setSequence(getMixed(), newValue);
-        return;
-      case GROUP:
-      	setSequence(getGroup(), newValue);
-        return;
-      case A:
-        getA().clear();
-        getA().addAll((Collection)newValue);
-        return;
-      case B:
-        getB().clear();
-        getB().addAll((Collection)newValue);
-        return;
-      case SPLIT:
-        setSplit((String)newValue);
-        return;
-      case GROUP1:
-      	setSequence(getGroup1(), newValue);
-        return;
-      case Y:
-        getY().clear();
-        getY().addAll((Collection)newValue);
-        return;
-      case Z:
-        getZ().clear();
-        getZ().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        unsetSequence(getMixed());
-        return;
-      case GROUP:
-        unsetSequence(getGroup());
-        return;
-      case A:
-        getA().clear();
-        return;
-      case B:
-        getB().clear();
-        return;
-      case SPLIT:
-        unsetSplit();
-        return;
-      case GROUP1:
-        unsetSequence(getGroup1());
-        return;
-      case Y:
-        getY().clear();
-        return;
-      case Z:
-        getZ().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case MIXED:
-        return mixed != null && !isSequenceEmpty(getMixed());
-      case GROUP:
-        return !isSequenceEmpty(getGroup());
-      case A:
-        return !getA().isEmpty();
-      case B:
-        return !getB().isEmpty();
-      case SPLIT:
-        return isSetSplit();
-      case GROUP1:
-        return !isSequenceEmpty(getGroup1());
-      case Y:
-        return !getY().isEmpty();
-      case Z:
-        return !getZ().isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (mixed: ");
-    result.append(mixed);
-    result.append(')');
-    return result.toString();
-  }
-
-} //TwoRCsMixedImpl
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
deleted file mode 100644
index 67b0e1a3fd..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tuscany.sdo.test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AllTests extends TestCase {
-	
-	
-  public static TestSuite suite() {
-
-        TestSuite suite = new TestSuite();
-      
-        suite.addTestSuite(GeneratedPackagesTestCase.class);
-
-        return suite;
-    }
-
-
-    
-    /**
-     * Runs the test suite using the textual runner.
-     */
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-}
-
-
-
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java b/branches/sdo-1.1.1-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java
deleted file mode 100644
index 290f27338a..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sdo.test;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.sdo.generate.XSD2JavaGenerator;
-
-import junit.framework.TestCase;
-
-
-public class GeneratedPackagesTestCase extends TestCase
-{
-    static String expectedNamespace = "http://www.example.com/sequences";
-    
-    public void testPackageValidity()
-    {
-        XSD2JavaGenerator codeGen = new XSD2JavaGenerator();
-        String [] genArgs = { "-schemaNamespace", "all", "-noGenerate", "src/test/resources/sequences.xsd" };
-        codeGen.generateFromXMLSchema( genArgs );
-        List packages = codeGen.getGeneratedPackageInfo();
-        
-        for (Iterator iter = packages.iterator(); iter.hasNext();)
-        {
-            XSD2JavaGenerator.GeneratedPackage packageInfo = (XSD2JavaGenerator.GeneratedPackage)iter.next();
-            assertTrue(expectedNamespace.equals(packageInfo.getNamespace()));
-            
-            String name;
-            boolean validatedMixedQuote = false;
-            boolean validatedRC = false;
-            for (Iterator iterClass = packageInfo.getClasses().iterator(); iterClass.hasNext();)
-            {
-                XSD2JavaGenerator.GeneratedPackage.PackageClassInfo classInfo = (XSD2JavaGenerator.GeneratedPackage.PackageClassInfo)iterClass.next();
-                name = classInfo.getName();
-                
-                if( "mixedStockQuote".equals(name))
-                {
-                    assertTrue("com.example.sequences.MixedQuote".equals(classInfo.getClassName()));
-                    validatedMixedQuote = true;
-                }
-                
-                if( "rc".equals(name))
-                {
-                    assertTrue("com.example.sequences.RepeatingChoice".equals(classInfo.getClassName()));
-                    validatedRC = true;
-                }
-            }
-            assertTrue(validatedMixedQuote);
-            assertTrue(validatedRC);
-        }    
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/TUSCANY1050.xsd b/branches/sdo-1.1.1-incubating/tools/src/test/resources/TUSCANY1050.xsd
deleted file mode 100644
index a218eb574c..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/TUSCANY1050.xsd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- * -->
-<xsd:schema xmlns:tns="http://test.data" 
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-            elementFormDefault="qualified" 
-            targetNamespace="http://test.data">
-
-   <xsd:element name="description" type="tns:description"/>
-    <xsd:complexType name="description">
-        <xsd:sequence>
-            <xsd:element name="field1" type="xsd:string"/>
-            <xsd:element name="field2" type="xsd:string"/>
-            <xsd:element name="field3" type="xsd:string"/>
-            <xsd:element name="field4" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-
-    <xsd:element name="Wrapper" type="tns:Wrapper"/>
-    <xsd:complexType name="Wrapper">
-        <xsd:sequence>
-            <xsd:element name="description" nillable="true" type="tns:description"/>
-        </xsd:sequence>
-    </xsd:complexType>
-</xsd:schema>
-
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/enum.xsd b/branches/sdo-1.1.1-incubating/tools/src/test/resources/enum.xsd
deleted file mode 100644
index 6c906539a9..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/enum.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
- -->
-<xsd:schema 
-  targetNamespace="http://www.example.com/simple"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:simple="http://www.example.com/simple"> 
-  
-   <xsd:element name="stockQuote" type="simple:Quote"/>
-   
-   <xsd:simpleType name="PriceClass">
-       <xsd:restriction base="xsd:string">
-           <xsd:enumeration value="Large"/>
-           <xsd:enumeration value="Medium"/>
-           <xsd:enumeration value="Small"/>
-       </xsd:restriction>
-   </xsd:simpleType>
-   
-   <xsd:complexType name="Quote">
-       <xsd:sequence>
-          <xsd:element name="symbol" type="xsd:string"/>
-          <xsd:element name="companyName" type="xsd:string"/>
-          <xsd:element name="priceClass" type="simple:PriceClass"/>
-          <xsd:element name="price" type="xsd:decimal"/>
-          <xsd:element name="open1" type="xsd:decimal"/>
-          <xsd:element name="high" type="xsd:decimal"/>
-          <xsd:element name="low" type="xsd:decimal"/>
-          <xsd:element name="volume" type="xsd:double"/>
-          <xsd:element name="change1" type="xsd:double"/>
-          <xsd:element name="quotes" type="simple:Quote" minOccurs="0" maxOccurs="unbounded"/>
-       </xsd:sequence>
-   </xsd:complexType>
-
-</xsd:schema>
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml b/branches/sdo-1.1.1-incubating/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
deleted file mode 100644
index 0aa17bb50a..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-<sequences:mrc xmlns:sequences="http://www.example.com/sequences"><b>1</b><a>foo</a>some mixed text<a>bar</a><b>2</b></sequences:mrc>
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/mixedStaticTestResult.xml b/branches/sdo-1.1.1-incubating/tools/src/test/resources/mixedStaticTestResult.xml
deleted file mode 100644
index 9136f0780d..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/mixedStaticTestResult.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-<sequences:mixedStockQuote xmlns:sequences="http://www.example.com/sequences">
-  <symbol>fbnt</symbol>
-  <companyName>FlyByNightTechnology</companyName>
-  some text
-  <quotes><price>2000.0</price></quotes>
-  more text
-  <price>1000.0</price>
-</sequences:mixedStockQuote>
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/repeatingChoice.xsd b/branches/sdo-1.1.1-incubating/tools/src/test/resources/repeatingChoice.xsd
deleted file mode 100644
index 1d566da671..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/repeatingChoice.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
- -->
-
-<xsd:schema xmlns:repchoice="http://www.example.com/repchoice" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/repchoice"> 
-  
-   <xsd:element name="rc" type="repchoice:RCType"/>
-
-	<xsd:complexType name="RCType">
-	  <xsd:choice maxOccurs="unbounded" minOccurs="0">
-	    <xsd:element name="s" type="xsd:string"/>
-	    <xsd:element name="i" type="xsd:int"/>
-	    <xsd:element name="f" type="xsd:float"/>
-	  </xsd:choice>
-	</xsd:complexType>
-
-</xsd:schema>
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/repeatingChoiceTestResult.xml b/branches/sdo-1.1.1-incubating/tools/src/test/resources/repeatingChoiceTestResult.xml
deleted file mode 100644
index 2719457b6d..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/repeatingChoiceTestResult.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-<sequences:rc xmlns:sequences="http://www.example.com/sequences">
-  <b>1</b>
-  <a>foo</a>
-  <a>bar</a>
-  <b>2</b>
-</sequences:rc>
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/sdoModel.xsd b/branches/sdo-1.1.1-incubating/tools/src/test/resources/sdoModel.xsd
deleted file mode 100644
index 6b596c5b36..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/sdoModel.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sdo="commonj.sdo" xmlns:sdoJava="commonj.sdo/java" targetNamespace="commonj.sdo"> 
-
-  <!-- Dummy XSD definition of special SDO ChangeSummaryType -->
-  <xsd:simpleType name="ChangeSummaryType" sdoJava:instanceClass="commonj.sdo.ChangeSummary">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-
-
-</xsd:schema>
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/sequences.xsd b/branches/sdo-1.1.1-incubating/tools/src/test/resources/sequences.xsd
deleted file mode 100644
index b74a56eab7..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/sequences.xsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
- -->
-<xsd:schema xmlns:seq="http://www.example.com/sequences"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.example.com/sequences">
-
-	<xsd:element name="mixedStockQuote" type="seq:MixedQuote" />
-	<xsd:element name="rc" type="seq:RepeatingChoice" />
-	<xsd:element name="mrc" type="seq:MixedRepeatingChoice" />
-	<xsd:element name="rc2" type="seq:TwoRCs" />
-	<xsd:element name="mrc2" type="seq:TwoRCsMixed" />
-
-
-
-	<xsd:complexType mixed="true" name="MixedQuote">
-		<xsd:sequence>
-			<xsd:element name="symbol" type="xsd:string" />
-			<xsd:element name="companyName" type="xsd:string" />
-			<xsd:element name="price" type="xsd:decimal" />
-			<xsd:element name="open1" type="xsd:decimal" />
-			<xsd:element name="high" type="xsd:decimal" />
-			<xsd:element name="low" type="xsd:decimal" />
-			<xsd:element name="volume" type="xsd:double" />
-			<xsd:element name="change1" type="xsd:double" />
-			<xsd:element maxOccurs="unbounded" minOccurs="0"
-				name="quotes" type="seq:MixedQuote" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="RepeatingChoice">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:element name="a" type="xsd:string" />
-			<xsd:element name="b" type="xsd:int" />
-		</xsd:choice>
-	</xsd:complexType>
-
-
-	<xsd:complexType mixed="true" name="MixedRepeatingChoice">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:element name="a" type="xsd:string" />
-			<xsd:element name="b" type="xsd:int" />
-		</xsd:choice>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="TwoRCs">
-		<xsd:sequence>
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="a" type="xsd:string" />
-				<xsd:element name="b" type="xsd:int" />
-			</xsd:choice>
-
-			<xsd:element name="split" type="xsd:string" />
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="y" type="xsd:string" />
-				<xsd:element name="z" type="xsd:int" />
-			</xsd:choice>
-
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType mixed="true" name="TwoRCsMixed">
-		<xsd:sequence>
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="a" type="xsd:string" />
-				<xsd:element name="b" type="xsd:int" />
-			</xsd:choice>
-
-			<xsd:element name="split" type="xsd:string" />
-
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element name="y" type="xsd:string" />
-				<xsd:element name="z" type="xsd:int" />
-			</xsd:choice>
-
-		</xsd:sequence>
-	</xsd:complexType>
-
-</xsd:schema>
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml b/branches/sdo-1.1.1-incubating/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
deleted file mode 100644
index a62cd66b58..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-<sequences:rc2m xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sequences="http://www.example.com/sequences" xsi:type="sequences:TwoRCsMixed"><b>1</b>where will this appear?<a>foo</a><a>bar</a><b>2</b><split>pea</split><z>99</z><y>fred</y></sequences:rc2m>
diff --git a/branches/sdo-1.1.1-incubating/tools/src/test/resources/twoRepeatingChoicesTestResult.xml b/branches/sdo-1.1.1-incubating/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
deleted file mode 100644
index 3585ad00d3..0000000000
--- a/branches/sdo-1.1.1-incubating/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
- -->
-<sequences:rc2 xmlns:sequences="http://www.example.com/sequences">
-  <b>1</b>
-  <a>foo</a>
-  <a>bar</a>
-  <b>2</b>
-  <split>banana</split>
-  <z>99</z>
-  <y>fred</y>
-</sequences:rc2>