diff options
-rw-r--r-- | plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml | 1 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml b/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml index 4c4c43b24e..82f03c2e9e 100644 --- a/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml +++ b/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml @@ -2,6 +2,7 @@ <repositories> <repository name="repo1"> + <property name="overrideUUID" value="1ff5d226-b1f0-40fb-aba2-0c31b38c764f"/> <property name="supportingAudits" value="true"/> <property name="verifyingRevisions" value="false"/> diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java index 4847fef352..7ab37aa061 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java @@ -130,13 +130,12 @@ public final class ModelUtil String packageURI = ePackage.getNsURI(); String name = ePackage.getName(); boolean dynamic = EMFUtil.isDynamicEPackage(ePackage); - String ecore = dynamic ? EMFUtil.ePackageToString(ePackage) : null; - // String ecore = EMFUtil.ePackageToString(ePackage); + // String ecore = dynamic ? EMFUtil.ePackageToString(ePackage) : null; + String ecore = EcorePackage.eINSTANCE.getNsURI().equals(packageURI) ? null : EMFUtil.ePackageToString(ePackage); CDOIDRange idRange = packageManager.getSession().registerEPackage(ePackage); CDOPackageImpl cdoPackage = new CDOPackageImpl(packageManager, packageURI, name, ecore, dynamic, idRange); initializeCDOPackage(ePackage, cdoPackage); - return cdoPackage; } @@ -301,6 +300,7 @@ public final class ModelUtil resourceClass.getCDOPathFeature().setClientInfo(EresourcePackage.eINSTANCE.getCDOResource_Path()); } + @Deprecated public static void removeModelInfos(CDOSessionPackageManager packageManager) { // Ecore |