Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java34
5 files changed, 22 insertions, 22 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
index f4472db8e3..b90150b2c2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
import org.eclipse.emf.cdo.tests.model1.Category;
import org.eclipse.emf.cdo.tests.model1.Company;
import org.eclipse.emf.cdo.tests.model1.Model1Factory;
import org.eclipse.emf.cdo.tests.model1.Product1;
import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
import org.eclipse.emf.cdo.tests.model1.Supplier;
+import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package;
import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
@@ -30,6 +29,7 @@ import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
import org.eclipse.emf.cdo.tests.model4.model4Factory;
+import org.eclipse.emf.cdo.tests.model4.legacy.model4Package;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.util.CommitException;
import org.eclipse.emf.cdo.util.CommitIntegrityException;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java
index 514f1a7993..c104c0f4d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java
@@ -14,8 +14,8 @@ import org.eclipse.emf.cdo.common.model.EMFUtil;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package;
import org.eclipse.emf.cdo.tests.model1.VAT;
+import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.util.CommitException;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java
index 103067f8ba..76f2edd0f5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_359992_Test.java
@@ -18,9 +18,9 @@ import org.eclipse.emf.cdo.net4j.CDONet4jSession.Options;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.tests.AbstractCDOTest;
import org.eclipse.emf.cdo.tests.config.IModelConfig;
-import org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory;
import org.eclipse.emf.cdo.tests.model1.Customer;
import org.eclipse.emf.cdo.tests.model1.SalesOrder;
+import org.eclipse.emf.cdo.tests.model1.legacy.Model1Factory;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.util.CommitException;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java
index 0b853621f3..4a26178e41 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_376620_Test.java
@@ -17,8 +17,8 @@ import org.eclipse.emf.cdo.net4j.CDONet4jSession.Options;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.tests.AbstractCDOTest;
import org.eclipse.emf.cdo.tests.config.IModelConfig;
-import org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory;
import org.eclipse.emf.cdo.tests.model1.Supplier;
+import org.eclipse.emf.cdo.tests.model1.legacy.Model1Factory;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.util.CommitException;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java
index 461da26ebd..ba4794ee57 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ModelConfig.java
@@ -173,87 +173,87 @@ public abstract class ModelConfig extends Config implements IModelConfig
public MangoFactory getMangoFactory()
{
- return org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoFactoryImpl.eINSTANCE;
}
public MangoPackage getMangoPackage()
{
- return org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.mango.legacy.impl.MangoPackageImpl.eINSTANCE;
}
public Model1Factory getModel1Factory()
{
- return org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model1.legacy.Model1Factory.eINSTANCE;
}
public Model1Package getModel1Package()
{
- return org.eclipse.emf.cdo.tests.legacy.model1.Model1Package.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model1.legacy.Model1Package.eINSTANCE;
}
public Model2Factory getModel2Factory()
{
- return org.eclipse.emf.cdo.tests.legacy.model2.Model2Factory.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model2.legacy.Model2Factory.eINSTANCE;
}
public Model2Package getModel2Package()
{
- return org.eclipse.emf.cdo.tests.legacy.model2.Model2Package.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model2.legacy.Model2Package.eINSTANCE;
}
public Model3Factory getModel3Factory()
{
- return org.eclipse.emf.cdo.tests.legacy.model3.Model3Factory.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model3.legacy.Model3Factory.eINSTANCE;
}
public Model3Package getModel3Package()
{
- return org.eclipse.emf.cdo.tests.legacy.model3.Model3Package.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model3.legacy.Model3Package.eINSTANCE;
}
public SubpackageFactory getModel3SubPackageFactory()
{
- return org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackageFactory.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackageFactory.eINSTANCE;
}
public SubpackagePackage getModel3SubPackagePackage()
{
- return org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model3.subpackage.legacy.SubpackagePackage.eINSTANCE;
}
public model4Factory getModel4Factory()
{
- return org.eclipse.emf.cdo.tests.legacy.model4.model4Factory.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model4.legacy.model4Factory.eINSTANCE;
}
public model4Package getModel4Package()
{
- return org.eclipse.emf.cdo.tests.legacy.model4.model4Package.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model4.legacy.model4Package.eINSTANCE;
}
public model4interfacesPackage getModel4InterfacesPackage()
{
- return org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model4interfaces.legacy.model4interfacesPackage.eINSTANCE;
}
public Model5Factory getModel5Factory()
{
- return org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model5.legacy.Model5Factory.eINSTANCE;
}
public Model5Package getModel5Package()
{
- return org.eclipse.emf.cdo.tests.legacy.model5.Model5Package.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model5.legacy.Model5Package.eINSTANCE;
}
public Model6Factory getModel6Factory()
{
- return org.eclipse.emf.cdo.tests.legacy.model6.Model6Factory.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model6.legacy.Model6Factory.eINSTANCE;
}
public Model6Package getModel6Package()
{
- return org.eclipse.emf.cdo.tests.legacy.model6.Model6Package.eINSTANCE;
+ return org.eclipse.emf.cdo.tests.model6.legacy.Model6Package.eINSTANCE;
}
}
}

Back to the top