[nobug] migration work + Committed for BLB

tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java
index 4f30fbe..34151ef 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java
@@ -88,8 +88,10 @@
 		try {
 			moduleCore = StructureEdit.getStructureEditForRead(appClientProject);
 			WorkbenchComponent wbComponent = moduleCore.findComponentByName(appClientModuleName);
-			String version = wbComponent.getComponentType().getVersion();
-			assertTrue(version.equals(TestWorkspace.APP_CLIENT_PROJECT_VERSION));
+			edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(wbComponent);
+			int version = edit.getJ2EEVersion();
+			Integer integer = new Integer(version);
+			assertTrue(integer.equals(TestWorkspace.APP_CLIENT_PROJECT_VERSION));
 		} finally {
 			if (moduleCore != null) {
 				moduleCore.dispose();
@@ -250,7 +252,7 @@
 			moduleCore = StructureEdit.getStructureEditForRead(appClientProject);
 			WorkbenchComponent wbComponent = moduleCore.findComponentByName(appClientModuleName);
 			edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(wbComponent);
-			String uri = edit.getDeploymentDescriptorResource().getURI().toString();
+			String uri = edit.getApplicationClientXmiResource().getURI().toString();
 
 			// THIS IS A BUG\\ - commmenting out as suggested by DW
 			boolean testURI = uri.equals(TestWorkspace.APP_CLIENT_DD_XMI_RESOURCE_URI);

tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java
index 10291d0..4ad6c49 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java
@@ -238,6 +238,28 @@
 	public void testIsValidEARModule() {
 		StructureEdit moduleCore = null;
 		WorkbenchComponent wbComponent = null;
+		EARArtifactEdit edit = null;
+		try {
+			moduleCore = StructureEdit.getStructureEditForWrite(earProject);
+			wbComponent = moduleCore.findComponentByName(earModuleName);
+			ComponentHandle handle = ComponentHandle.create(earProject, wbComponent.getName());
+			edit = EARArtifactEdit.getEARArtifactEditForWrite(wbComponent);
+		    edit.isValidEARModule(wbComponent);
+		} catch (UnresolveableURIException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			if (moduleCore != null) {
+				moduleCore.dispose();
+			}
+			boolean isValid = EARArtifactEdit.isValidEditableModule(wbComponent);
+			assertTrue(isValid);
+		}
+	}
+	
+	public void testIsValidEAREditableModule() {
+		StructureEdit moduleCore = null;
+		WorkbenchComponent wbComponent = null;
 		try {
 			moduleCore = StructureEdit.getStructureEditForWrite(earProject);
 			wbComponent = moduleCore.findComponentByName(earModuleName);