[246623] Create Definition model as alternative configuration/wiring mechanism

https://bugs.eclipse.org/bugs/show_bug.cgi?id=246623

16 files changed, 0 insertions, 2031 deletions

diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Def.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Def.java
deleted file mode 100644
index 354ca991ae..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Def.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Def.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getDef()
- * @model abstract="true"
- * @generated
- */
-public interface Def extends EObject {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	Object getInstance();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void unsetInstance();
-
-	public boolean isTouched();
-} // Def
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefException.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefException.java
deleted file mode 100644
index 3574259b79..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.net4j.util.net4jutildefs;
-
-public class DefException extends RuntimeException
-{
-
-  private static final long serialVersionUID = 1L;
-
-  public DefException(String message, Throwable cause)
-  {
-    super(message, cause);
-  }
-
-  public DefException(Throwable cause)
-  {
-    super(cause);
-  }
-
-}
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefsContainer.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefsContainer.java
deleted file mode 100644
index 741c04c5c8..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/DefsContainer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DefsContainer.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Defs Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefinitions <em>Definitions</em>}</li>
- *   <li>{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefaultDefinition <em>Default Definition</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getDefsContainer()
- * @model
- * @generated
- */
-public interface DefsContainer extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Definitions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.net4j.util.net4jutildefs.Def}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Definitions</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>Definitions</em>' containment reference list.
-	 * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getDefsContainer_Definitions()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	EList<Def> getDefinitions();
-
-	/**
-	 * Returns the value of the '<em><b>Default Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Definition</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Definition</em>' reference.
-	 * @see #setDefaultDefinition(Def)
-	 * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getDefsContainer_DefaultDefinition()
-	 * @model
-	 * @generated
-	 */
-	Def getDefaultDefinition();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefaultDefinition <em>Default Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Definition</em>' reference.
-	 * @see #getDefaultDefinition()
-	 * @generated
-	 */
-	void setDefaultDefinition(Def value);
-
-} // DefsContainer
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ExecutorServiceDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ExecutorServiceDef.java
deleted file mode 100644
index 0ba08d23da..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ExecutorServiceDef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExecutorServiceDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Executor Service Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getExecutorServiceDef()
- * @model abstract="true"
- * @generated
- */
-public interface ExecutorServiceDef extends Def {
-} // ExecutorServiceDef
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsFactory.java
deleted file mode 100644
index c6d285f085..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsFactory.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- 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 -->
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage
- * @generated
- */
-public interface Net4jUtilDefsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Net4jUtilDefsFactory eINSTANCE = org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Defs Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Defs Container</em>'.
-	 * @generated
-	 */
-	DefsContainer createDefsContainer();
-
-	/**
-	 * Returns a new object of class '<em>Thread Pool Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Thread Pool Def</em>'.
-	 * @generated
-	 */
-	ThreadPoolDef createThreadPoolDef();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	Net4jUtilDefsPackage getNet4jUtilDefsPackage();
-
-} //Net4jUtilDefsFactory
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsPackage.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsPackage.java
deleted file mode 100644
index 1a3915864c..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/Net4jUtilDefsPackage.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsPackage.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory
- * @model kind="package"
- * @generated
- */
-public interface Net4jUtilDefsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "net4jutildefs";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/NET4J/util/defs/1.0.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "net4jutildefs";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Net4jUtilDefsPackage eINSTANCE = org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl <em>Defs Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getDefsContainer()
-	 * @generated
-	 */
-	int DEFS_CONTAINER = 0;
-
-	/**
-	 * The feature id for the '<em><b>Definitions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFS_CONTAINER__DEFINITIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Default Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFS_CONTAINER__DEFAULT_DEFINITION = 1;
-
-	/**
-	 * The number of structural features of the '<em>Defs Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFS_CONTAINER_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.DefImpl <em>Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.DefImpl
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getDef()
-	 * @generated
-	 */
-	int DEF = 1;
-
-	/**
-	 * The number of structural features of the '<em>Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEF_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.ExecutorServiceDefImpl <em>Executor Service Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.ExecutorServiceDefImpl
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getExecutorServiceDef()
-	 * @generated
-	 */
-	int EXECUTOR_SERVICE_DEF = 2;
-
-	/**
-	 * The number of structural features of the '<em>Executor Service Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTOR_SERVICE_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.ThreadPoolDefImpl <em>Thread Pool Def</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.ThreadPoolDefImpl
-	 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getThreadPoolDef()
-	 * @generated
-	 */
-	int THREAD_POOL_DEF = 3;
-
-	/**
-	 * The number of structural features of the '<em>Thread Pool Def</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int THREAD_POOL_DEF_FEATURE_COUNT = EXECUTOR_SERVICE_DEF_FEATURE_COUNT + 0;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer <em>Defs Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Defs Container</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.DefsContainer
-	 * @generated
-	 */
-	EClass getDefsContainer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefinitions <em>Definitions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Definitions</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefinitions()
-	 * @see #getDefsContainer()
-	 * @generated
-	 */
-	EReference getDefsContainer_Definitions();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefaultDefinition <em>Default Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Default Definition</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.DefsContainer#getDefaultDefinition()
-	 * @see #getDefsContainer()
-	 * @generated
-	 */
-	EReference getDefsContainer_DefaultDefinition();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.util.net4jutildefs.Def <em>Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Def</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.Def
-	 * @generated
-	 */
-	EClass getDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef <em>Executor Service Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Executor Service Def</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef
-	 * @generated
-	 */
-	EClass getExecutorServiceDef();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef <em>Thread Pool Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Thread Pool Def</em>'.
-	 * @see org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef
-	 * @generated
-	 */
-	EClass getThreadPoolDef();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	Net4jUtilDefsFactory getNet4jUtilDefsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl <em>Defs Container</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getDefsContainer()
-		 * @generated
-		 */
-		EClass DEFS_CONTAINER = eINSTANCE.getDefsContainer();
-
-		/**
-		 * The meta object literal for the '<em><b>Definitions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEFS_CONTAINER__DEFINITIONS = eINSTANCE.getDefsContainer_Definitions();
-
-		/**
-		 * The meta object literal for the '<em><b>Default Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEFS_CONTAINER__DEFAULT_DEFINITION = eINSTANCE.getDefsContainer_DefaultDefinition();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.DefImpl <em>Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.DefImpl
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getDef()
-		 * @generated
-		 */
-		EClass DEF = eINSTANCE.getDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.ExecutorServiceDefImpl <em>Executor Service Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.ExecutorServiceDefImpl
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getExecutorServiceDef()
-		 * @generated
-		 */
-		EClass EXECUTOR_SERVICE_DEF = eINSTANCE.getExecutorServiceDef();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.net4j.util.net4jutildefs.impl.ThreadPoolDefImpl <em>Thread Pool Def</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.ThreadPoolDefImpl
-		 * @see org.eclipse.net4j.util.net4jutildefs.impl.Net4jUtilDefsPackageImpl#getThreadPoolDef()
-		 * @generated
-		 */
-		EClass THREAD_POOL_DEF = eINSTANCE.getThreadPoolDef();
-
-	}
-
-} //Net4jUtilDefsPackage
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ThreadPoolDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ThreadPoolDef.java
deleted file mode 100644
index 0fc07438ab..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/ThreadPoolDef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ThreadPoolDef.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Thread Pool Def</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#getThreadPoolDef()
- * @model
- * @generated
- */
-public interface ThreadPoolDef extends ExecutorServiceDef {
-} // ThreadPoolDef
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefImpl.java
deleted file mode 100644
index 04956d3e63..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DefImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.event.EventUtil;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
-import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.util.Net4jUtilDefsUtil;
-import org.eclipse.net4j.util.net4jutildefs.util.Net4jUtilDefsUtil.IVisitor;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Definition</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
- * 
- * @generated
- */
-public abstract class DefImpl extends EObjectImpl implements Def
-{
-
-  /** The instance. */
-  private Object instance;
-
-  private boolean touched;
-
-  protected IListener instanceListener = new LifecycleEventAdapter()
-  {
-    @Override
-    protected void onDeactivated(ILifecycle lifecycle)
-    {
-      if (lifecycle == instance)
-      {
-        handleDeactivation(instance);
-      }
-    }
-  };
-
-  /**
-   * this might be changed to a content adapter across non-containment references
-   * 
-   * @see Recipe: Subclass EContentAdapter to receive notifications across non-containment references
-   * @see http://wiki.eclipse.org/EMF/Recipes#Recipe:_Data_Migration
-   */
-  /** adapter that tracks if this def was touched */
-  protected Adapter touchedAdapter = new AdapterImpl()
-  {
-
-    @Override
-    public void notifyChanged(Notification msg)
-    {
-      switch (msg.getEventType())
-      {
-      case Notification.SET:
-      case Notification.UNSET:
-      case Notification.ADD:
-      case Notification.REMOVE:
-        touched = true;
-      }
-    }
-  };
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
-   * @generated
-   */
-  protected DefImpl()
-  {
-    super();
-    eAdapters().add(touchedAdapter);
-  }
-
-  public Object getInternalInstance()
-  {
-    return instance;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->.
-   * 
-   * @return the e class
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Net4jUtilDefsPackage.Literals.DEF;
-  }
-
-  /**
-   * returns an instance that is created for the given definition. Instances are stored and reused. The instance is
-   * activated before it is returned. A later call to #getInstace
-   * 
-   * @return the instance that this definition defines
-   * @see #createInstance()
-   * @see #wireInstance(Object)
-   * @see LifecycleUtil#activate(Object)
-   * @generated NOT
-   */
-  public Object getInstance()
-  {
-    synchronized (this)
-    {
-      if (!isSetInstance())
-      {
-        // instance is not created yet
-        setInstance();
-      }
-      else if (isSetInstance() && isTouched())
-      {
-        // instance is created but def settings were changed afterwards
-        unsetInstance();
-        setInstance();
-      }
-      touched = false;
-      return instance;
-    }
-  }
-
-  private void setInstance()
-  {
-    validateDefinition();
-    instance = createInstance();
-    wireInstance(instance);
-    activateInstance(instance);
-  }
-
-  protected void activateInstance(Object instance)
-  {
-    LifecycleUtil.activate(instance);
-  }
-
-  protected void deactivateInstance()
-  {
-    LifecycleUtil.deactivate(instance);
-  }
-
-  /**
-   * <!-- begin-user-doc -->Unsets the instance managed by this Definition. The internal reference to it is cleared and
-   * internal listeners to it are removed <!-- end-user-doc -->
-   * 
-   * @generated NOT
-   */
-  public void unsetInstance()
-  {
-    deactivateInstance();
-  }
-
-  /**
-   * Checks if the the instance in this <em>definition</em> is set. In other words, if the instance handled by this
-   * <em>defintion</em> is present
-   * 
-   * @return <code>true</code>, if the instance in this definition is set
-   */
-  public boolean isSetInstance()
-  {
-    return instance != null;
-  }
-
-  /**
-   * Returns whether this definition (and all its nested, referenced defs) was touched since it created its internal
-   * instance.
-   * 
-   * @return true, if this definition was touched since it created its internal instance
-   */
-  public boolean isTouched()
-  {
-    IVisitor<EStructuralFeature> structuralFeaturesVisitor = new Net4jUtilDefsUtil.IVisitor<EStructuralFeature>()
-    {
-      public void visit(EStructuralFeature structuralFeature)
-      {
-        if (structuralFeature.getEType().eClass() == Net4jUtilDefsPackage.eINSTANCE.getDef().eClass())
-        {
-          Object referencedObject = eGet(structuralFeature, true);
-          if (referencedObject != null)
-          {
-            if (structuralFeature.getUpperBound() != -1)
-            {
-              touched |= ((Def)referencedObject).isTouched();
-            }
-            else
-            {
-              List referenceList = (List)referencedObject;
-              for (Object reference : referenceList)
-              {
-                touched |= ((Def)reference).isTouched();
-              }
-            }
-          }
-        }
-      }
-    };
-
-    Net4jUtilDefsUtil.doForAllStructuralFeatures(structuralFeaturesVisitor, eClass().getEStructuralFeatures());
-    return touched;
-  }
-
-  protected void wireInstance(Object instance)
-  {
-    EventUtil.addListener(instance, instanceListener);
-  }
-
-  protected void unwireInstance(Object instance)
-  {
-    EventUtil.removeListener(instance, instanceListener);
-  }
-
-  protected void handleDeactivation(Object instance)
-  {
-    synchronized (this)
-    {
-      unwireInstance(instance);
-      this.instance = null;
-    }
-  }
-
-  /**
-   * validates the present definition. Subclasses have to provide an implementation
-   * 
-   * @throws IllegalStateException
-   */
-  protected void validateDefinition()
-  {
-  }
-
-  /**
-   * Creates a new instance. Subclasses have to provide an implementation
-   * 
-   * @return a new instance
-   */
-  /**
-   * Creates a new instance. Subclasses have to provide an implementation
-   * 
-   * @return a new instance
-   */
-  protected abstract Object createInstance();
-
-} // DefinitionImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefsContainerImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefsContainerImpl.java
deleted file mode 100644
index 6dacb44613..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/DefsContainerImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DefsContainerImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Defs Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl#getDefinitions <em>Definitions</em>}</li>
- *   <li>{@link org.eclipse.net4j.util.net4jutildefs.impl.DefsContainerImpl#getDefaultDefinition <em>Default Definition</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefsContainerImpl extends EObjectImpl implements DefsContainer {
-	/**
-	 * The cached value of the '{@link #getDefinitions() <em>Definitions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefinitions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Def> definitions;
-	/**
-	 * The cached value of the '{@link #getDefaultDefinition() <em>Default Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultDefinition()
-	 * @generated
-	 * @ordered
-	 */
-	protected Def defaultDefinition;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefsContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jUtilDefsPackage.Literals.DEFS_CONTAINER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public EList<Def> getDefinitions() {
-		if (definitions == null) {
-			definitions = new EObjectContainmentEList<Def>(Def.class, this, Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS);
-		}
-		return definitions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Def getDefaultDefinition() {
-		if (defaultDefinition != null && defaultDefinition.eIsProxy()) {
-			InternalEObject oldDefaultDefinition = (InternalEObject)defaultDefinition;
-			defaultDefinition = (Def)eResolveProxy(oldDefaultDefinition);
-			if (defaultDefinition != oldDefaultDefinition) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition));
-			}
-		}
-		return defaultDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Def basicGetDefaultDefinition() {
-		return defaultDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultDefinition(Def newDefaultDefinition) {
-		Def oldDefaultDefinition = defaultDefinition;
-		defaultDefinition = newDefaultDefinition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				return ((InternalEList<?>)getDefinitions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				return getDefinitions();
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION:
-				if (resolve) return getDefaultDefinition();
-				return basicGetDefaultDefinition();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				getDefinitions().clear();
-				getDefinitions().addAll((Collection<? extends Def>)newValue);
-				return;
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION:
-				setDefaultDefinition((Def)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				getDefinitions().clear();
-				return;
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION:
-				setDefaultDefinition((Def)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFINITIONS:
-				return definitions != null && !definitions.isEmpty();
-			case Net4jUtilDefsPackage.DEFS_CONTAINER__DEFAULT_DEFINITION:
-				return defaultDefinition != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DefsContainerImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ExecutorServiceDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ExecutorServiceDefImpl.java
deleted file mode 100644
index 2b6e0c40cc..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ExecutorServiceDefImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExecutorServiceDefImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Executor Service Def</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ExecutorServiceDefImpl extends DefImpl implements ExecutorServiceDef {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExecutorServiceDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jUtilDefsPackage.Literals.EXECUTOR_SERVICE_DEF;
-	}
-
-} //ExecutorServiceDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsFactoryImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsFactoryImpl.java
deleted file mode 100644
index 3b4b103081..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsFactoryImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsFactoryImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilDefsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Net4jUtilDefsFactory init() {
-		try {
-			Net4jUtilDefsFactory theNet4jUtilDefsFactory = (Net4jUtilDefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/NET4J/util/defs/1.0.0"); 
-			if (theNet4jUtilDefsFactory != null) {
-				return theNet4jUtilDefsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new Net4jUtilDefsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER: return createDefsContainer();
-			case Net4jUtilDefsPackage.THREAD_POOL_DEF: return createThreadPoolDef();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DefsContainer createDefsContainer() {
-		DefsContainerImpl defsContainer = new DefsContainerImpl();
-		return defsContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ThreadPoolDef createThreadPoolDef() {
-		ThreadPoolDefImpl threadPoolDef = new ThreadPoolDefImpl();
-		return threadPoolDef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsPackage getNet4jUtilDefsPackage() {
-		return (Net4jUtilDefsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static Net4jUtilDefsPackage getPackage() {
-		return Net4jUtilDefsPackage.eINSTANCE;
-	}
-
-} //Net4jUtilDefsFactoryImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsPackageImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsPackageImpl.java
deleted file mode 100644
index 8547a71bba..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/Net4jUtilDefsPackageImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsPackageImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsFactory;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilDefsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass defsContainerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass defEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass executorServiceDefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass threadPoolDefEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private Net4jUtilDefsPackageImpl() {
-		super(eNS_URI, Net4jUtilDefsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static Net4jUtilDefsPackage init() {
-		if (isInited) return (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		Net4jUtilDefsPackageImpl theNet4jUtilDefsPackage = (Net4jUtilDefsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Net4jUtilDefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new Net4jUtilDefsPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theNet4jUtilDefsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNet4jUtilDefsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNet4jUtilDefsPackage.freeze();
-
-		return theNet4jUtilDefsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDefsContainer() {
-		return defsContainerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDefsContainer_Definitions() {
-		return (EReference)defsContainerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDefsContainer_DefaultDefinition() {
-		return (EReference)defsContainerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDef() {
-		return defEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExecutorServiceDef() {
-		return executorServiceDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getThreadPoolDef() {
-		return threadPoolDefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsFactory getNet4jUtilDefsFactory() {
-		return (Net4jUtilDefsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		defsContainerEClass = createEClass(DEFS_CONTAINER);
-		createEReference(defsContainerEClass, DEFS_CONTAINER__DEFINITIONS);
-		createEReference(defsContainerEClass, DEFS_CONTAINER__DEFAULT_DEFINITION);
-
-		defEClass = createEClass(DEF);
-
-		executorServiceDefEClass = createEClass(EXECUTOR_SERVICE_DEF);
-
-		threadPoolDefEClass = createEClass(THREAD_POOL_DEF);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		executorServiceDefEClass.getESuperTypes().add(this.getDef());
-		threadPoolDefEClass.getESuperTypes().add(this.getExecutorServiceDef());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(defsContainerEClass, DefsContainer.class, "DefsContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDefsContainer_Definitions(), this.getDef(), null, "definitions", null, 1, -1, DefsContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDefsContainer_DefaultDefinition(), this.getDef(), null, "defaultDefinition", null, 0, 1, DefsContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(defEClass, Def.class, "Def", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		addEOperation(defEClass, ecorePackage.getEJavaObject(), "getInstance", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(defEClass, null, "unsetInstance", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(executorServiceDefEClass, ExecutorServiceDef.class, "ExecutorServiceDef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(threadPoolDefEClass, ThreadPoolDef.class, "ThreadPoolDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //Net4jUtilDefsPackageImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ThreadPoolDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ThreadPoolDefImpl.java
deleted file mode 100644
index c15de7cefc..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/impl/ThreadPoolDefImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ThreadPoolDefImpl.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.impl;
-
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.ecore.EClass;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Thread Pool Def</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadPoolDef {
-
-	private static final String THREADGROUP_IDENTIFIER = "net4j";
-	private ThreadGroup threadGroup;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ThreadPoolDefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return Net4jUtilDefsPackage.Literals.THREAD_POOL_DEF;
-	}
-
-	/**
-	 * Gets a executor service instance. The current implementation does not
-	 * reuse an instance created in a former call TODO: reuse instances
-	 * 
-	 * @return the instance
-	 * 
-	 */
-	@Override
-	protected Object createInstance() {
-		ExecutorService executorService = Executors
-				.newCachedThreadPool(new DaemonThreadFactory(
-						THREADGROUP_IDENTIFIER));
-		return executorService;
-	}
-
-	private static class DaemonThreadFactory implements ThreadFactory {
-		private ThreadGroup threadGroup;
-
-		public DaemonThreadFactory(String threadGroupIdentifier) {
-			super();
-			this.threadGroup = new ThreadGroup(threadGroupIdentifier);
-		}
-
-		public Thread newThread(Runnable r) {
-			Thread thread = new Thread(threadGroup, r);
-			thread.setDaemon(true);
-			return thread;
-		}
-	}
-
-} //ThreadPoolDefImpl
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsAdapterFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsAdapterFactory.java
deleted file mode 100644
index ac1788c581..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsAdapterFactory.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsAdapterFactory.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.util;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage
- * @generated
- */
-public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Net4jUtilDefsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = Net4jUtilDefsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Net4jUtilDefsSwitch<Adapter> modelSwitch =
-		new Net4jUtilDefsSwitch<Adapter>() {
-			@Override
-			public Adapter caseDefsContainer(DefsContainer object) {
-				return createDefsContainerAdapter();
-			}
-			@Override
-			public Adapter caseDef(Def object) {
-				return createDefAdapter();
-			}
-			@Override
-			public Adapter caseExecutorServiceDef(ExecutorServiceDef object) {
-				return createExecutorServiceDefAdapter();
-			}
-			@Override
-			public Adapter caseThreadPoolDef(ThreadPoolDef object) {
-				return createThreadPoolDefAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.DefsContainer <em>Defs Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.net4j.util.net4jutildefs.DefsContainer
-	 * @generated
-	 */
-	public Adapter createDefsContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.Def <em>Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.net4j.util.net4jutildefs.Def
-	 * @generated
-	 */
-	public Adapter createDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef <em>Executor Service Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef
-	 * @generated
-	 */
-	public Adapter createExecutorServiceDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef <em>Thread Pool Def</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef
-	 * @generated
-	 */
-	public Adapter createThreadPoolDefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //Net4jUtilDefsAdapterFactory
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsSwitch.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsSwitch.java
deleted file mode 100644
index 878d5501cc..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsSwitch.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Net4jUtilDefsSwitch.java,v 1.1 2008-12-28 18:07:29 estepper Exp $
- */
-package org.eclipse.net4j.util.net4jutildefs.util;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-import org.eclipse.net4j.util.net4jutildefs.DefsContainer;
-import org.eclipse.net4j.util.net4jutildefs.ExecutorServiceDef;
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-import org.eclipse.net4j.util.net4jutildefs.ThreadPoolDef;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage
- * @generated
- */
-public class Net4jUtilDefsSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Net4jUtilDefsPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Net4jUtilDefsSwitch() {
-		if (modelPackage == null) {
-			modelPackage = Net4jUtilDefsPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case Net4jUtilDefsPackage.DEFS_CONTAINER: {
-				DefsContainer defsContainer = (DefsContainer)theEObject;
-				T result = caseDefsContainer(defsContainer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jUtilDefsPackage.DEF: {
-				Def def = (Def)theEObject;
-				T result = caseDef(def);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jUtilDefsPackage.EXECUTOR_SERVICE_DEF: {
-				ExecutorServiceDef executorServiceDef = (ExecutorServiceDef)theEObject;
-				T result = caseExecutorServiceDef(executorServiceDef);
-				if (result == null) result = caseDef(executorServiceDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case Net4jUtilDefsPackage.THREAD_POOL_DEF: {
-				ThreadPoolDef threadPoolDef = (ThreadPoolDef)theEObject;
-				T result = caseThreadPoolDef(threadPoolDef);
-				if (result == null) result = caseExecutorServiceDef(threadPoolDef);
-				if (result == null) result = caseDef(threadPoolDef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Defs Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Defs Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDefsContainer(DefsContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDef(Def object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Executor Service Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Executor Service Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseExecutorServiceDef(ExecutorServiceDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Thread Pool Def</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Thread Pool Def</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseThreadPoolDef(ThreadPoolDef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //Net4jUtilDefsSwitch
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsUtil.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsUtil.java
deleted file mode 100644
index 24504fc3a9..0000000000
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/net4jutildefs/util/Net4jUtilDefsUtil.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.eclipse.net4j.util.net4jutildefs.util;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * The Class Net4jUtilDefsUtil.
- */
-public class Net4jUtilDefsUtil
-{
-
-  /**
-   * Are equal.
-   * 
-   * @param thisObject
-   *          the this object
-   * @param thatObject
-   *          the that object
-   * @return true, if successful
-   */
-  public static boolean areEqual(Object thisObject, Object thatObject)
-  {
-    boolean areEqual = false;
-    if (thisObject == null && thatObject == null)
-    {
-      areEqual = true;
-    }
-    else if (thisObject != null && thisObject != null)
-    {
-      areEqual = thisObject.equals(thatObject);
-    }
-    return areEqual;
-  }
-
-  /**
-   * Are equal.
-   * 
-   * @param thisList
-   *          the this list
-   * @param thatList
-   *          the that list
-   * @return true, if successful
-   */
-  public static boolean areEqual(List<?> thisList, List<?> thatList)
-  {
-    boolean areEqual = false;
-    if (thisList != null && thatList != null && thisList.size() == thatList.size())
-    {
-      for (int i = 0; i < thisList.size(); i++)
-      {
-        if (!areEqual(thisList.get(i), thatList.get(i)))
-        {
-          areEqual = false;
-          break;
-        }
-      }
-    }
-    return areEqual;
-  }
-
-  /**
-   * Do for all structural features.
-   * 
-   * @param visitor
-   *          the visitor
-   * @param structuralFeaturesList
-   *          the structural features list
-   */
-  public static <EStructuralFeature> void doForAllStructuralFeatures(IVisitor<EStructuralFeature> visitor,
-      Collection<EStructuralFeature> structuralFeatures)
-  {
-    new VisitorDelegator<EStructuralFeature>(structuralFeatures).visit(visitor);
-  }
-
-  /**
-   * The Class VisitorDelegator. It visits all members of a Collection
-   */
-  private static class VisitorDelegator<V>
-  {
-
-    /** The visited list. */
-    private Collection<V> visitedCollection;
-
-    /**
-     * Instantiates a new visitor delegator.
-     * 
-     * @param list
-     *          the list
-     */
-    private VisitorDelegator(Collection<V> collection)
-    {
-      this.visitedCollection = collection;
-    }
-
-    /**
-     * Visit a member.
-     * 
-     * @param visitor
-     *          the visitor
-     */
-    private void visit(IVisitor<V> visitor)
-    {
-      for (V visitedMember : visitedCollection)
-      {
-        visitor.visit(visitedMember);
-      }
-    }
-
-    /**
-     * Visit a member and break the visits if the current visitor returns <code>flase</code>.
-     * 
-     * @param visitor
-     *          the visitor
-     */
-    private void breakableVisit(IBreakingVisitor<V> visitor)
-    {
-      for (V visitedMember : visitedCollection)
-      {
-        if (!visitor.visit(visitedMember))
-        {
-          break;
-        }
-      }
-    }
-  }
-
-  /**
-   * The Interface IVisitor.
-   */
-  public interface IVisitor<V>
-  {
-
-    /**
-     * Visit.
-     * 
-     * @param visitedMember
-     *          the visited member
-     */
-    public void visit(V visitedMember);
-  }
-
-  /**
-   * The Interface IBreakingVisitor.
-   */
-  public interface IBreakingVisitor<V>
-  {
-
-    /**
-     * Visit.
-     * 
-     * @param visitedMember
-     *          the visited member
-     * @return true, if successful
-     */
-    public boolean visit(V visitedMember);
-  }
-}