[172963] Replace CMAnnotationFiles API with EMF Based solutionv20070206

Check-in includes:
- replace usages of CMAnnotationFiles with new metadata files and APIs.   Usage of CMAnnotationFiles no supported and will now generate plugin error to log.
- update to metadata ecore model to include entityGroups
- added TraitTypes ecore model for use with Metadata files
- update of JUnits plus new tests

1 files changed, 59 insertions, 9 deletions

diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/AllTests.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/AllTests.java
index 9f15777..caa1122 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/AllTests.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/AllTests.java
@@ -14,11 +14,20 @@ package org.eclipse.jst.jsf.metadata.tests;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.eclipse.jst.jsf.common.metadata.tests.AllMetadataTests;
+import org.eclipse.jst.jsf.common.metadata.tests.EntityImplTests;
+import org.eclipse.jst.jsf.common.metadata.tests.IncludeEntityGroupImplTests;
+import org.eclipse.jst.jsf.common.metadata.tests.MergeTests;
+import org.eclipse.jst.jsf.common.metadata.tests.MetaDataQueryHelperTests;
+import org.eclipse.jst.jsf.common.metadata.tests.ModelImplTests;
+import org.eclipse.jst.jsf.common.metadata.tests.TraitImplTests;
 import org.eclipse.jst.jsf.metadata.tests.annotations.AnnotationHelperTestCases;
 import org.eclipse.jst.jsf.metadata.tests.annotations.AnnotationMapTestCases;
 import org.eclipse.jst.jsf.metadata.tests.annotations.CaseInsensitiveAnnotationsTestCases;
+import org.eclipse.jst.jsf.metadata.tests.annotations.DisableCMAnnotationFilesAPITest;
 import org.eclipse.jst.jsf.metadata.tests.annotations.DuplicateAnnotationsTestCases;
 import org.eclipse.jst.jsf.metadata.tests.annotations.NegativeAnnotationFileTestCases;
+import org.eclipse.jst.jsf.metadata.tests.metadataprocessing.AllMetaDataProcessingTests;
 import org.eclipse.jst.jsf.metadata.tests.metadataprocessing.AttributeValueRuntimeTypeExtensionsTests;
 import org.eclipse.jst.jsf.metadata.tests.metadataprocessing.AttributeValueRuntimeTypeFactoryTests;
 import org.eclipse.jst.jsf.metadata.tests.metadataprocessing.AttributeValueRuntimeTypesRegistryTests;
@@ -34,23 +43,31 @@ public class AllTests {
 
 	public static Test suite() {
 		TestSuite suite = new TestSuite(
-				"Test for org.eclipse.jst.jsf.metadata.tests");
+				"Test Suite for org.eclipse.jst.jsf.metadata.tests");
 		//$JUnit-BEGIN$
 		
-		//annotations 
-		suite.addTestSuite(AnnotationMapTestCases.class);
-		suite.addTestSuite(AnnotationHelperTestCases.class);
-		suite.addTestSuite(DuplicateAnnotationsTestCases.class);
-		suite.addTestSuite(CaseInsensitiveAnnotationsTestCases.class);
-		suite.addTestSuite(NegativeAnnotationFileTestCases.class);
+		//disablement of CMAnnotationFiles
+		suite.addTestSuite(DisableCMAnnotationFilesAPITest.class);
+		
+		//model 
+		suite.addTestSuite(ModelImplTests.class);
+		suite.addTestSuite(EntityImplTests.class);
+		suite.addTestSuite(TraitImplTests.class);
+		suite.addTestSuite(IncludeEntityGroupImplTests.class);
 
-		//metadataprocessing
+//		//query - Main API
+		suite.addTestSuite(MetaDataQueryHelperTests.class);
+		
+		//model merging
+		suite.addTestSuite(MergeTests.class);
+		
+//		//metadataprocessing
 		suite.addTestSuite(MetaDataProcessorsFactoryTests.class);
 		suite.addTestSuite(AttributeValueRuntimeTypeExtensionsTests.class);
 		suite.addTestSuite(AttributeValueRuntimeTypesRegistryTests.class);
 		suite.addTestSuite(AttributeValueRuntimeTypeFactoryTests.class);
 		
-		//taglib processing
+//		//taglib processing
 		suite.addTestSuite(StringTypeTest.class);
 		suite.addTestSuite(BooleanTypeTest.class);
 		suite.addTestSuite(IntegerTypeTest.class);
@@ -62,4 +79,37 @@ public class AllTests {
 		return suite;
 	}
 
+	/**
+	 * Old tests that no longer need to run since moveing to ne metadata system
+	 */
+	public void Oldsuite() {
+//		TestSuite suite = new TestSuite(
+//				"Test for org.eclipse.jst.jsf.metadata.tests");
+//		//$JUnit-BEGIN$
+//		
+//		//annotations 
+//		suite.addTestSuite(AnnotationMapTestCases.class);
+//		suite.addTestSuite(AnnotationHelperTestCases.class);
+//		suite.addTestSuite(DuplicateAnnotationsTestCases.class);
+//		suite.addTestSuite(CaseInsensitiveAnnotationsTestCases.class);
+//		suite.addTestSuite(NegativeAnnotationFileTestCases.class);
+//
+//		//metadataprocessing
+//		suite.addTestSuite(MetaDataProcessorsFactoryTests.class);
+//		suite.addTestSuite(AttributeValueRuntimeTypeExtensionsTests.class);
+//		suite.addTestSuite(AttributeValueRuntimeTypesRegistryTests.class);
+//		suite.addTestSuite(AttributeValueRuntimeTypeFactoryTests.class);
+//		
+//		//taglib processing
+//		suite.addTestSuite(StringTypeTest.class);
+//		suite.addTestSuite(BooleanTypeTest.class);
+//		suite.addTestSuite(IntegerTypeTest.class);
+//		suite.addTestSuite(LongTypeTest.class);
+//		suite.addTestSuite(DoubleTypeTest.class);
+//		suite.addTestSuite(JavaClassTypeTest.class);
+
+		//$JUnit-END$
+//		return suite;
+	}
+
 }