Added support for mixed content and auditing

2 files changed, 5 insertions, 3 deletions

diff --git a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/extension/ExtensionUtil.java b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/extension/ExtensionUtil.java
index e873a1f52..f1c4b0ca0 100755
--- a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/extension/ExtensionUtil.java
+++ b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/extension/ExtensionUtil.java
@@ -130,6 +130,9 @@ public class ExtensionUtil {
 
 		// from the hibernate plugin
 		em.registerExtension(createExtension(
+"org.eclipse.emf.teneo.hibernate.auditing.AuditHandler",
+				"org.eclipse.emf.teneo.hibernate.auditing.AuditHandler", false));
+		em.registerExtension(createExtension(
 				"org.eclipse.emf.teneo.hibernate.auditing.AuditProcessHandler",
 				"org.eclipse.emf.teneo.hibernate.auditing.AuditProcessHandler", false));
 		em.registerExtension(createExtension(
diff --git a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
index 78a0f97f3..12ccecd72 100755
--- a/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
+++ b/core/org.eclipse.emf.teneo/src/org/eclipse/emf/teneo/util/StoreUtil.java
@@ -379,7 +379,7 @@ public class StoreUtil {
 	}
 
 	/** Translates a string to a eclass */
-	public static EClass stringToEClass(String strid) {
+	public static EClass stringToEClass(EPackage.Registry registry, String strid) {
 		int lastIndex = strid.lastIndexOf(PATH_SEPARATOR);
 
 		if (lastIndex == -1) {
@@ -389,8 +389,7 @@ public class StoreUtil {
 		final String nsuri = strid.substring(0, lastIndex);
 		final String eclassName = strid.substring(lastIndex + 1);
 
-		final EPackage epack = PackageRegistryProvider.getInstance().getPackageRegistry()
-				.getEPackage(nsuri);
+		final EPackage epack = registry.getEPackage(nsuri);
 		if (epack == null) {
 			throw new TeneoException("The strid " + strid + " and nsuri: " + nsuri
 					+ " does not resolve to an epackage");