This commit was manufactured by cvs2svn to create tag 'v201204100000'.v201204100000

119 files changed, 0 insertions, 20404 deletions

diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.classpath b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.classpath
deleted file mode 100644
index 76131ca132..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/core/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/common/core/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.cvsignore b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.project b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.project
deleted file mode 100644
index bcbed7f5b7..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.jaxb.core.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1284b5c67d..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Tue Mar 08 12:07:36 EST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/META-INF/MANIFEST.MF b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index c1ecd0d512..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.jaxb.core.tests;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Dali-Comment: jdk 1.6 has the javax.xml.bind annotations
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Activator: org.eclipse.jpt.jaxb.core.tests.JptJaxbCoreTestsPlugin
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.6.100,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.6.100,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jpt.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jpt.common.core.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jpt.jaxb.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jpt.common.utility;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.100,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)",
- org.eclipse.xsd;bundle-version="[2.6.0,3.0.0)",
- org.junit;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jpt.jaxb.core.tests;x-internal:=true,
- org.eclipse.jpt.jaxb.core.tests.internal;x-internal:=true,
- org.eclipse.jpt.jaxb.core.tests.internal.context;x-internal:=true,
- org.eclipse.jpt.jaxb.core.tests.internal.context.java;x-internal:=true,
- org.eclipse.jpt.jaxb.core.tests.internal.projects;x-internal:=true,
- org.eclipse.jpt.jaxb.core.tests.internal.resource;x-internal:=true,
- org.eclipse.jpt.jaxb.core.tests.internal.resource.java;x-internal:=true
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/about.html b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/about.html
deleted file mode 100644
index be534ba44f..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 02, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties
deleted file mode 100644
index 9cd29bcb38..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2011 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               test.xml,\
-               plugin.properties
-source.. = src/
-output.. = bin/
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/plugin.properties b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/plugin.properties
deleted file mode 100644
index 01a0b633cd..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/plugin.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-# Copyright (c) 2010 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName=Dali Java Persistence Tools - JAXB Core Tests
-providerName=Eclipse Web Tools Platform
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/JptJaxbCoreTestsPlugin.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/JptJaxbCoreTestsPlugin.java
deleted file mode 100644
index 6fb339c26d..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/JptJaxbCoreTestsPlugin.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jpt.common.utility.internal.ReflectionTools;
-import org.eclipse.jpt.jaxb.core.JaxbProjectManager;
-import org.eclipse.jpt.jaxb.core.JptJaxbCorePlugin;
-import org.eclipse.jpt.jaxb.core.internal.prefs.JaxbPreferencesManager;
-import org.osgi.framework.BundleContext;
-
-/**
- * configure the core to handle events synchronously when we are
- * running tests
- */
-@SuppressWarnings("nls")
-public class JptJaxbCoreTestsPlugin extends Plugin {
-
-	private static JptJaxbCoreTestsPlugin INSTANCE;
-
-	public static JptJaxbCoreTestsPlugin instance() {
-		return INSTANCE;
-	}
-
-
-	// ********** plug-in implementation **********
-
-	public JptJaxbCoreTestsPlugin() {
-		super();
-		if (INSTANCE != null) {
-			throw new IllegalStateException();
-		}
-		// this convention is *wack*...  ~bjv
-		INSTANCE = this;
-	}
-
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		JaxbProjectManager jaxbProjectManager = JptJaxbCorePlugin.getProjectManager();
-		ReflectionTools.executeMethod(jaxbProjectManager, "handleEventsSynchronously");
-		ReflectionTools.executeStaticMethod(JaxbPreferencesManager.class, "doNotFlushPreferences");
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbCoreTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbCoreTests.java
deleted file mode 100644
index 632df40d68..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbCoreTests.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal;
-
-import java.io.File;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbCoreContextModelTests;
-import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject;
-import org.eclipse.jpt.jaxb.core.tests.internal.resource.JaxbCoreResourceModelTests;
-
-public class JaxbCoreTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(JaxbCoreTests.class.getPackage().getName());
-		suite.addTestSuite(SchemaLibraryTests.class);
-		suite.addTest(JaxbCoreResourceModelTests.suite());
-		suite.addTest(JaxbCoreContextModelTests.suite());
-		return suite;
-	}
-	
-	public static boolean requiredJarsExists() {
-		return jaxbJarPropertyExists() && jaxbJarFileExists();
-	}
-	
-	public static boolean jaxbJarPropertyExists() {
-		return getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY) != null;
-	}
-	
-	public static boolean jaxbJarFileExists() {
-		return (new File(getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY))).exists();
-	}
-	
-	public static String buildMissingJarErrorMessage() {
-		if( ! jaxbJarPropertyExists()) {
-			return errorMissingProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY);
-		}
-		return errorJarFileDoesNotExist(getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY));
-	}
-	
-	/*********** private **********/
-	private static String errorMissingProperty(String propertyName) {
-		return "missing Java system property: \"" + propertyName + "\"";
-	}
-	
-	private static String errorJarFileDoesNotExist(String propertyValue) {
-		return "JAR file doesn't exist: \"" + propertyValue + "\"";
-	}
-	
-	private static String getSystemProperty(String propertyName) {
-		return System.getProperty(propertyName);
-	}
-	
-	
-	private JaxbCoreTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java
deleted file mode 100644
index a32117f964..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/JaxbTestCase.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal;
-
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject;
-import org.eclipse.jpt.common.core.tests.internal.utility.jdt.AnnotationTestCase;
-import org.eclipse.jpt.jaxb.core.JaxbFacet;
-import org.eclipse.jpt.jaxb.core.JaxbProject;
-import org.eclipse.jpt.jaxb.core.JptJaxbCorePlugin;
-import org.eclipse.jpt.jaxb.core.internal.facet.JaxbFacetDataModelProperties;
-import org.eclipse.jpt.jaxb.core.internal.facet.JaxbFacetInstallDataModelProvider;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-
-public class JaxbTestCase
-		extends AnnotationTestCase {
-	
-	protected static final String BASE_PROJECT_NAME = "JaxbTestProject";
-	
-	protected JaxbTestCase(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected TestJavaProject buildJavaProject(boolean autoBuild) throws Exception {
-		return buildJaxbProject(BASE_PROJECT_NAME, autoBuild, buildJaxbFacetInstallConfig());
-	}
-	
-	protected TestJaxbProject buildJaxbProject(
-			String projectName, boolean autoBuild, IDataModel jaxbConfig) 
-			throws Exception {
-		return TestJaxbProject.buildJaxbProject(projectName, autoBuild, jaxbConfig);
-	}
-	
-	protected IDataModel buildJaxbFacetInstallConfig() {
-		IDataModel config = DataModelFactory.createDataModel(new JaxbFacetInstallDataModelProvider());		
-		config.setProperty(IFacetDataModelProperties.FACET_VERSION, getProjectFacetVersion());
-		config.setProperty(JaxbFacetDataModelProperties.PLATFORM, getPlatform());
-		return config;
-	}
-	
-	protected JaxbPlatformDescription getPlatform() {
-		return JptJaxbCorePlugin.getDefaultPlatform(getProjectFacetVersion());
-	}
-	
-	protected IProjectFacetVersion getProjectFacetVersion() {
-		return JaxbFacet.VERSION_2_1;
-	}
-	
-	@Override
-	protected TestJaxbProject getJavaProject() {
-		return (TestJaxbProject) super.getJavaProject();
-	}
-	
-	protected JaxbProject getJaxbProject() {
-		return this.getJavaProject().getJaxbProject();
-	}
-	
-	protected JavaResourceAttribute getFieldNamed(JavaResourceType resourceType, String attributeName) {
-		for (JavaResourceAttribute attribute : resourceType.getFields()) {
-			if (attribute.getName().equals(attributeName)) {
-				return attribute;
-			}
-		}
-		return null;
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/SchemaLibraryTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/SchemaLibraryTests.java
deleted file mode 100644
index eecf3ee5b2..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/SchemaLibraryTests.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal;
-
-import java.io.ByteArrayInputStream;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jpt.jaxb.core.xsd.XsdSchema;
-
-
-
-public class SchemaLibraryTests
-		extends JaxbTestCase {
-	
-	public SchemaLibraryTests(String name) {
-		super(name);
-	}
-	
-	// tests schema for namespace that is set in catalog, but not in project properties
-	public void testUnsetNamespace() {
-		String namespace = "http://www.w3.org/2001/XInclude";
-		
-		// test initial load
-		XsdSchema schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-		
-		// test cached load
-		schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-		
-		// test unload/reload
-		schema.getXSDComponent().eResource().unload();
-		schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-	}
-	
-	// tests schema for registered uri that is set in project properties (namespace not registered in catalog)
-	public void testSetRegisteredUriUnregisteredNamespace() {
-		String namespace = "http://java.sun.com/xml/ns/persistence/orm";
-		
-		// set namespace in project properties\
-		List<String> schemaLocations = new Vector<String>();
-		schemaLocations.add("http://java.sun.com/xml/ns/persistence/orm_2_0.xsd");
-		getJaxbProject().getSchemaLibrary().setSchemaLocations(schemaLocations);
-		
-		// test initial load
-		XsdSchema schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-		
-		// test cached load
-		schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-		
-		// test unload/reload
-		schema.getXSDComponent().eResource().unload();
-		schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-	}
-	
-	// tests schema for registerd uri that is set in project properties (namespace already registered in catalog)
-	public void testSetRegisteredUriRegisteredNamespace() {
-		String namespace = "http://www.eclipse.org/eclipselink/xsds/persistence/orm";
-		
-		// set namespace in project properties\
-		List<String> schemaLocations = new Vector<String>();
-		schemaLocations.add("http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_0.xsd");
-		getJaxbProject().getSchemaLibrary().setSchemaLocations(schemaLocations);
-		
-		// test initial load
-		XsdSchema schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-		
-		// test cached load
-		schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-		
-		// test unload/reload
-		schema.getXSDComponent().eResource().unload();
-		schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-	}
-	
-	// tests schema for unregistered uri that is set in project properties (local file)
-	public void testSetUnregisterdUri() throws Exception {
-		IFile schemaFile = getJaxbProject().getProject().getFile(new Path("customer.xsd"));
-		String contents = 
-				"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-				+ "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\""
-				+ " targetNamespace=\"http://www.example.org/customer-example\">"
-				+ "</xs:schema>";
-		schemaFile.create(new ByteArrayInputStream(contents.getBytes()), true, null);
-		
-		String namespace = "http://www.example.org/customer-example";
-		
-		// set namespace in project properties\
-		List<String> schemaLocations = new Vector<String>();
-		schemaLocations.add("platform:/resource/" + BASE_PROJECT_NAME + "/customer.xsd");
-		getJaxbProject().getSchemaLibrary().setSchemaLocations(schemaLocations);
-		
-		// test initial load
-		XsdSchema schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-		
-		// test cached load
-		schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-		
-		// test unload/reload
-		schema.getXSDComponent().eResource().unload();
-		schema = getJaxbProject().getSchemaLibrary().getSchema(namespace);
-		assertNotNull(schema);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java
deleted file mode 100644
index 855a5ef20c..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbEnum;
-import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
-import org.eclipse.jpt.jaxb.core.context.JaxbType;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-
-
-@SuppressWarnings("nls")
-public class GenericContextRootTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericContextRootTests(String name) {
-		super(name);
-	}
-	
-	private ICompilationUnit createPackageInfoWithAccessorOrder() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlAccessorOrder(value = XmlAccessOrder.ALPHABETICAL)",
-				JAXB.XML_ACCESS_ORDER, JAXB.XML_ACCESSOR_ORDER);
-	}
-	
-	private ICompilationUnit createClassWithXmlTypeAndSuperclassNamed(final String superclassName) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendExtendsImplementsTo(StringBuilder sb) {
-				sb.append("extends " + superclassName);
-			}
-		});
-	}
-	
-	private ICompilationUnit createClassWithXmlTypeAndAttribute(
-			final String attributeName, final String typeName) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendNameFieldAnnotationTo(StringBuilder sb) {
-				sb.append("public " + typeName + " " + attributeName + ";" + CR);
-				sb.append(CR);
-			}
-		});
-	}
-	
-	private ICompilationUnit createClassWithXmlTypeAndListAttribute(
-			final String attributeName, final String typeName) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>("java.util.List", JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendNameFieldAnnotationTo(StringBuilder sb) {
-				sb.append("public List<" + typeName + "> " + attributeName + ";" + CR);
-				sb.append(CR);
-			}
-		});
-	}
-	
-	public void testGetPackages() throws Exception {
-		this.createPackageInfoWithAccessorOrder();
-		Iterator<JaxbPackage> packages = this.getContextRoot().getPackages().iterator();
-		assertEquals(1, this.getContextRoot().getPackagesSize());
-		assertEquals(PACKAGE_NAME, packages.next().getName());
-		assertFalse(packages.hasNext());
-
-		//add an unannotated package-info.java and make sure it's not added to the root context node
-		this.createUnannotatedPackageInfo("foo");
-		packages = this.getContextRoot().getPackages().iterator();
-		assertEquals(1, this.getContextRoot().getPackagesSize());
-		assertEquals(PACKAGE_NAME, packages.next().getName());
-		assertFalse(packages.hasNext());
-
-		//annotate the package-info.java and test it's added to the root context node
-		JavaResourcePackage fooResourcePackage = getJaxbProject().getJavaResourcePackage("foo");
-		AnnotatedElement annotatedElement = this.annotatedElement(fooResourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericContextRootTests.this.addXmlAccessorTypeAnnotation(declaration, JAXB.XML_ACCESS_TYPE__PROPERTY);
-			}
-		});
-
-		Iterable<String> packageNames = new TransformationIterable<JaxbPackage, String>(this.getContextRoot().getPackages()) {
-			@Override
-			protected String transform(JaxbPackage o) {
-				return o.getName();
-			}
-		};
-		assertEquals(2, this.getContextRoot().getPackagesSize());
-		assertTrue(CollectionTools.contains(packageNames, PACKAGE_NAME));
-		assertTrue(CollectionTools.contains(packageNames, "foo"));
-
-		//remove the annotation from the package-info.java and test it's removed from the root context node
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericContextRootTests.this.removeXmlAccessorTypeAnnotation(declaration);
-			}
-		});
-
-		packages = this.getContextRoot().getPackages().iterator();
-		assertEquals(1, this.getContextRoot().getPackagesSize());
-		assertEquals(PACKAGE_NAME, packages.next().getName());
-		assertFalse(packages.hasNext());
-	}
-	
-	protected void addXmlAccessorTypeAnnotation(ModifiedDeclaration declaration, String accessType) {
-		NormalAnnotation annotation = this.addNormalAnnotation(declaration.getDeclaration(), JAXB.XML_ACCESSOR_TYPE);
-		addEnumMemberValuePair(annotation, JAXB.XML_ACCESSOR_TYPE__VALUE, accessType);
-	}
-	
-	protected void removeXmlAccessorTypeAnnotation(ModifiedDeclaration declaration) {
-		removeAnnotation(declaration, JAXB.XML_ACCESSOR_TYPE);
-	}
-	
-	protected void addXmlSeeAlsoAnnotation(final ModifiedDeclaration declaration, String... typeNames) {
-		Annotation annotation = declaration.getAnnotationNamed(JAXB.XML_SEE_ALSO);
-		NormalAnnotation normalAnnotation = null;
-		if (annotation == null) {
-			normalAnnotation = addNormalAnnotation(declaration.getDeclaration(), JAXB.XML_SEE_ALSO);
-		}
-		else if (annotation.isMarkerAnnotation()) {
-			normalAnnotation = replaceMarkerAnnotation((MarkerAnnotation) annotation);
-		}
-		else {
-			normalAnnotation = (NormalAnnotation) annotation;
-		}
-		
-		Expression arrayInitializer = newArrayInitializer(
-				declaration.getAst(),
-				ArrayTools.array(
-						new TransformationIterable<String, TypeLiteral>(new ArrayIterable<String>(typeNames)) {
-							@Override
-							protected TypeLiteral transform(String o) {
-								return newTypeLiteral(declaration.getAst(), o);
-							}
-						},
-						new Expression[0]));
-		addMemberValuePair(normalAnnotation, JAXB.XML_SEE_ALSO__VALUE, arrayInitializer);
-	}
-
-	public void testGetRegistries() throws Exception {
-		createClassWithXmlRegistry();
-		Iterable<JaxbType> types = getContextRoot().getTypes();
-		assertEquals(1, CollectionTools.size(types));
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry());
-		
-		//add an unannotated class and make sure it's not added to the context root
-		createUnannotatedClassNamed("Foo");
-		types = getContextRoot().getTypes();
-		assertEquals(1, CollectionTools.size(types));
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry());
-		
-		//annotate the class with @XmlRegistry and test it's added to the root context node
-		JavaResourceAbstractType fooResourceType = getJaxbProject().getJavaResourceType("test.Foo");
-		AnnotatedElement annotatedElement = annotatedElement(fooResourceType);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_REGISTRY);
-					}
-				});
-		
-		types = getContextRoot().getTypes();
-		assertEquals(2, CollectionTools.size(types));
-		assertNotNull(((JaxbClass) getContextRoot().getType("test.Foo")).getXmlRegistry());
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry());
-		
-		//remove the annotation from the class and test it's removed from the context root
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						removeAnnotation(declaration, JAXB.XML_REGISTRY);
-					}
-				});
-		
-		types = getContextRoot().getTypes();
-		assertEquals(1, CollectionTools.size(types));
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)).getXmlRegistry());
-	}
-	
-	public void testGetTypes() throws Exception {
-		createClassWithXmlType();
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		
-		//add an unannotated class and make sure it's not added to the context root
-		createUnannotatedClassNamed("Foo");
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		
-		//annotate the class with @XmlType and test it's added to the context root
-		JavaResourceAbstractType fooResourceType = getJaxbProject().getJavaResourceType("test.Foo");
-		AnnotatedElement annotatedElement = annotatedElement(fooResourceType);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TYPE);
-					}
-				});
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		assertNotNull(((JaxbClass) getContextRoot().getType("test.Foo")));
-		
-		//remove the annotation from the class and test it's removed from the root context node
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						removeAnnotation(declaration, JAXB.XML_TYPE);
-					}
-				});
-		
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		assertNull(((JaxbClass) getContextRoot().getType("test.Foo")));
-	}
-	
-	public void testGetTypes2() throws Exception {
-		createEnumWithXmlType();
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbEnum) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		
-		//add an unannotated class and make sure it's not added to the context root
-		createUnannotatedEnumNamed("Foo");
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbEnum) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		assertNull(((JaxbEnum) getContextRoot().getType("test.Foo")));
-		
-		//annotate the class with @XmlEnum and test it's added to the context root
-		JavaResourceEnum fooResourceType = (JavaResourceEnum) getJaxbProject().getJavaResourceType("test.Foo", JavaResourceAbstractType.Kind.ENUM);
-		AnnotatedElement annotatedElement = annotatedElement(fooResourceType);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TYPE);
-					}
-				});
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbEnum) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		assertNotNull(((JaxbEnum) getContextRoot().getType("test.Foo")));
-		
-		//remove the annotation from the class and test it's removed from the root context node
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						removeAnnotation(declaration, JAXB.XML_TYPE);
-					}
-				});
-		
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbEnum) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		assertNull(((JaxbEnum) getContextRoot().getType("test.Foo")));
-	}
-	
-	public void testDirectReferencedSuperclass() throws Exception {
-		String superclassName = "Super" + TYPE_NAME;
-		String fqSuperclassName = PACKAGE_NAME_ + superclassName;
-		createUnannotatedClassNamed(superclassName);
-		
-		// make sure unannotated superclass is not in context
-		assertTrue(CollectionTools.isEmpty(getContextRoot().getTypes()));
-		
-		createClassWithXmlTypeAndSuperclassNamed(superclassName);
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		assertNotNull(((JaxbClass) getContextRoot().getType(fqSuperclassName)));
-		
-		// remove annotated class - both classes removed from context
-		IFile file = (IFile) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME).getResource();
-		file.delete(true, null);
-		
-		assertTrue(CollectionTools.isEmpty(getContextRoot().getTypes()));
-		assertNull(((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME)));
-		assertNull(((JaxbClass) getContextRoot().getType(fqSuperclassName)));
-	}
-	
-	public void testDirectReferencedAttribute() throws Exception {
-		String otherClassName = "Other" + TYPE_NAME;
-		String fqOtherClassName = PACKAGE_NAME_ + otherClassName;
-		String attributeName = "other";
-		createUnannotatedClassNamed(otherClassName);
-		
-		// make sure unannotated other class is not in context
-		assertTrue(CollectionTools.isEmpty(getContextRoot().getTypes()));
-		
-		createClassWithXmlTypeAndAttribute(attributeName, otherClassName);
-		JavaResourceType thisType = (JavaResourceType) getJaxbProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME);
-		JavaResourceAttribute attribute = getFieldNamed(thisType, attributeName);
-		AnnotatedElement annotatedAttribute = annotatedElement(attribute);
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNotNull(getContextRoot().getType(fqOtherClassName));
-		
-		// add an @XmlElement
-		annotatedAttribute.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT);
-					}
-				});
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNotNull(getContextRoot().getType(fqOtherClassName));
-		
-		// change to @XmlTransient
-		annotatedAttribute.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						removeAnnotation(declaration, JAXB.XML_ELEMENT);
-						addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TRANSIENT);
-					}
-				});
-		
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNull(getContextRoot().getType(fqOtherClassName));
-	}
-	
-	public void testDirectReferencedListAttribute() throws Exception {
-		String otherClassName = "Other" + TYPE_NAME;
-		String fqOtherClassName = PACKAGE_NAME_ + otherClassName;
-		String attributeName = "other";
-		createUnannotatedClassNamed(otherClassName);
-		
-		// make sure unannotated other class is not in context
-		assertTrue(CollectionTools.isEmpty(getContextRoot().getTypes()));
-		
-		createClassWithXmlTypeAndListAttribute(attributeName, otherClassName);
-		JavaResourceType thisType = (JavaResourceType) getJaxbProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME);
-		JavaResourceAttribute attribute = getFieldNamed(thisType, attributeName);
-		AnnotatedElement annotatedAttribute = annotatedElement(attribute);
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNotNull(getContextRoot().getType(fqOtherClassName));
-		
-		// add an @XmlElement
-		annotatedAttribute.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT);
-					}
-				});
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNotNull(getContextRoot().getType(fqOtherClassName));
-		
-		// change to @XmlTransient
-		annotatedAttribute.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						removeAnnotation(declaration, JAXB.XML_ELEMENT);
-						addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TRANSIENT);
-					}
-				});
-		
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNull(getContextRoot().getType(fqOtherClassName));
-	}
-	
-	public void testDirectReferencedSeeAlso() throws Exception {
-		final String otherClassName = "Other" + TYPE_NAME;
-		final String fqOtherClassName = PACKAGE_NAME_ + otherClassName;
-		final String otherClassName2 = "Other" + TYPE_NAME + "2";
-		final String fqOtherClassName2 = PACKAGE_NAME_ + otherClassName2;
-		createUnannotatedClassNamed(otherClassName);
-		createUnannotatedClassNamed(otherClassName2);
-		
-		// make sure unannotated other classes are not in context
-		assertTrue(CollectionTools.isEmpty(getContextRoot().getTypes()));
-		
-		createClassWithXmlType();
-		JavaResourceType thisType = (JavaResourceType) getJaxbProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME);
-		AnnotatedElement annotatedType = annotatedElement(thisType);
-		
-		// make sure unannotated other classes are not in context
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		
-		// add an @XmlSeeAlso with one class
-		annotatedType.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						addXmlSeeAlsoAnnotation(declaration, otherClassName);
-					}
-				});
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNotNull(getContextRoot().getType(fqOtherClassName));
-		
-		// change to @XmlSeeAlso with two classes
-		annotatedType.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						removeAnnotation(declaration, JAXB.XML_SEE_ALSO);
-						addXmlSeeAlsoAnnotation(declaration, otherClassName, otherClassName2);
-					}
-				});
-		
-		assertEquals(3, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNotNull(getContextRoot().getType(fqOtherClassName));
-		assertNotNull(getContextRoot().getType(fqOtherClassName2));
-		
-		// remove the @XmlSeeAlso annotation
-		annotatedType.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						removeAnnotation(declaration, JAXB.XML_SEE_ALSO);
-					}
-				});
-		
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-	}
-	
-	public void testJaxbIndex() throws Exception {
-		final String otherClassName = "Other" + TYPE_NAME;
-		final String fqOtherClassName = PACKAGE_NAME_ + otherClassName;
-		final String otherClassName2 = "Other" + TYPE_NAME + "2";
-		final String fqOtherClassName2 = PACKAGE_NAME_ + otherClassName2;
-		createUnannotatedClassNamed(otherClassName);
-		createUnannotatedClassNamed(otherClassName2);
-		
-		// make sure unannotated other classes are not in context
-		assertTrue(CollectionTools.isEmpty(getContextRoot().getTypes()));
-		
-		createClassWithXmlType();
-		
-		// make sure unannotated other classes are not in context
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		
-		// add a jaxb.index with one class
-		IFile jaxbIndex = getJavaProject().getProject().getFile(new Path("src/test/jaxb.index"));
-		InputStream stream = new ByteArrayInputStream(otherClassName.getBytes());
-		jaxbIndex.create(stream, true, null);
-		
-		assertEquals(2, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNotNull(getContextRoot().getType(fqOtherClassName));
-		
-		// change to jaxb.index with two classes
-		jaxbIndex.setContents(new ByteArrayInputStream((otherClassName + CR + otherClassName2).getBytes()), true, false, null);
-		
-		assertEquals(3, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-		assertNotNull(getContextRoot().getType(fqOtherClassName));
-		assertNotNull(getContextRoot().getType(fqOtherClassName2));
-		
-		// clear the jaxb.index
-		jaxbIndex.setContents(new ByteArrayInputStream(new byte[0]), true, false, null);
-		
-		assertEquals(1, CollectionTools.size(getContextRoot().getTypes()));
-		assertNotNull(getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME));
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java
deleted file mode 100644
index 9eeb39279b..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context;
-
-import java.util.Iterator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.utility.internal.ReflectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.tests.internal.JaxbTestCase;
-
-@SuppressWarnings("nls")
-public abstract class JaxbContextModelTestCase
-		extends JaxbTestCase {
-	
-	protected static final String BASE_PROJECT_NAME = "JaxbContextModelTestProject";
-	
-	
-	protected JaxbContextModelTestCase(String name) {
-		super(name);
-	}
-	
-	@Override
-	protected TestJavaProject buildJavaProject(boolean autoBuild) throws Exception {
-		return buildJaxbProject(BASE_PROJECT_NAME, autoBuild, buildJaxbFacetInstallConfig());
-	}
-	
-	protected JaxbContextRoot getContextRoot() {
-		return this.getJaxbProject().getContextRoot();
-	}
-	
-	protected AnnotatedElement annotatedElement(JavaResourceAnnotatedElement resource) {
-		return (AnnotatedElement) ReflectionTools.getFieldValue(resource, "annotatedElement");
-	}
-	
-	protected ICompilationUnit createUnannotatedPackageInfo(String packageName) throws CoreException {
-		return createTestPackageInfo(packageName);
-	}
-	
-	protected ICompilationUnit createClassWithXmlType() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-		});
-	}
-	
-	protected ICompilationUnit createClassWithXmlRegistry() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_REGISTRY);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlRegistry");
-			}
-		});
-	}
-	
-	protected ICompilationUnit createUnannotatedClassNamed(String typeName) throws Exception {
-		return this.createTestType(PACKAGE_NAME, typeName + ".java", typeName, new DefaultAnnotationWriter());
-	}
-	
-	protected ICompilationUnit createEnumWithXmlType() throws Exception {
-		return this.createTestEnum(new DefaultEnumAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendEnumAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-		});
-	}
-	
-	protected ICompilationUnit createUnannotatedEnumNamed(String enumName) throws Exception {
-		return this.createTestEnum(PACKAGE_NAME, enumName + ".java", enumName, new DefaultEnumAnnotationWriter());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbCoreContextModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbCoreContextModelTests.java
deleted file mode 100644
index 4d72349d16..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbCoreContextModelTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2007, 2010 Oracle. 
- *  All rights reserved.  This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
- *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.jpt.jaxb.core.tests.internal.JaxbCoreTests;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.java.JaxbCoreJavaContextModelTests;
-
-public class JaxbCoreContextModelTests
-		extends TestCase {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite(JaxbCoreContextModelTests.class.getName());
-		
-		if (JaxbCoreTests.requiredJarsExists()) {
-			suite.addTestSuite(GenericContextRootTests.class);
-			suite.addTest(JaxbCoreJavaContextModelTests.suite());
-		}
-		else {
-			suite.addTest(TestSuite.warning(JaxbCoreTests.buildMissingJarErrorMessage()));
-		}
-		return suite;
-	}
-	
-	
-	private JaxbCoreContextModelTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java
deleted file mode 100644
index 3d2a980510..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaAttributeXmlJavaTypeAdapterTests extends JaxbContextModelTestCase
-{
-
-	public GenericJavaAttributeXmlJavaTypeAdapterTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE, JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType").append(CR);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAttribute").append(CR);
-				sb.append("@XmlJavaTypeAdapter");
-			}
-		});
-	}
-
-	public void testModifyValue() throws Exception {
-		createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter();
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlAttributeMapping attributeMapping = (XmlAttributeMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = attributeMapping.getXmlJavaTypeAdapter();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getJavaResourceAttribute();
-		
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-
-		contextXmlJavaTypeAdapter.setValue("foo");
-		XmlJavaTypeAdapterAnnotation javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals("foo", javaTypeAdapterAnnotation.getValue());
-		assertEquals("foo", contextXmlJavaTypeAdapter.getValue());
-
-		 //verify the xml schema type annotation is not removed when the value is set to null
-		contextXmlJavaTypeAdapter.setValue(null);
-		javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(javaTypeAdapterAnnotation.getValue());
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-	}
-
-	public void testUpdateValue() throws Exception {
-		createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter();
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlAttributeMapping attributeMapping = (XmlAttributeMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = attributeMapping.getXmlJavaTypeAdapter();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getJavaResourceAttribute();
-		
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-
-		//add a value member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaAttributeXmlJavaTypeAdapterTests.this.addXmlJavaTypeAdapterTypeMemberValuePair(declaration, JAXB.XML_JAVA_TYPE_ADAPTER__VALUE, "String");
-			}
-		});
-		assertEquals("String", contextXmlJavaTypeAdapter.getValue());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaAttributeXmlJavaTypeAdapterTests.this.removeXmlJavaTypeAdapterAnnotation(declaration);
-			}
-		});
-		assertNull(attributeMapping.getXmlJavaTypeAdapter());
-	}
-	
-	public void testModifyType() throws Exception {
-		createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter();
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlAttributeMapping attributeMapping = (XmlAttributeMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = attributeMapping.getXmlJavaTypeAdapter();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getJavaResourceAttribute();
-		
-		assertEquals("int", contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals("int", contextXmlJavaTypeAdapter.getDefaultType());
-
-		contextXmlJavaTypeAdapter.setSpecifiedType("foo");
-		XmlJavaTypeAdapterAnnotation javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals("foo", javaTypeAdapterAnnotation.getType());
-		assertEquals("foo", contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals("int", contextXmlJavaTypeAdapter.getDefaultType());
-
-		contextXmlJavaTypeAdapter.setSpecifiedType(null);
-		javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(javaTypeAdapterAnnotation.getType());
-		assertEquals("int", contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals("int", contextXmlJavaTypeAdapter.getDefaultType());
-	}
-
-	public void testUpdateType() throws Exception {
-		createClassWithXmlTypeAndAttributeXmlJavaTypeAdapter();
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlAttributeMapping attributeMapping = (XmlAttributeMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = attributeMapping.getXmlJavaTypeAdapter();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getJavaResourceAttribute();
-		
-		assertEquals("int", contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals("int", contextXmlJavaTypeAdapter.getDefaultType());
-
-		//add a type member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaAttributeXmlJavaTypeAdapterTests.this.addXmlJavaTypeAdapterTypeMemberValuePair(declaration, JAXB.XML_JAVA_TYPE_ADAPTER__TYPE, "String");
-			}
-		});
-		assertEquals("String", contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals("String", contextXmlJavaTypeAdapter.getType());
-		assertEquals("int", contextXmlJavaTypeAdapter.getDefaultType());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaAttributeXmlJavaTypeAdapterTests.this.removeXmlJavaTypeAdapterAnnotation(declaration);
-			}
-		});
-		assertNull(attributeMapping.getXmlJavaTypeAdapter());
-	}
-
-	protected void addXmlJavaTypeAdapterTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlJavaTypeAdapterAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected void addXmlJavaTypeAdapterMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlJavaTypeAdapterAnnotation(declaration), name, value);
-	}
-
-	protected void removeXmlJavaTypeAdapterAnnotation(ModifiedDeclaration declaration) {
-		this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);		
-	}
-
-	protected Annotation getXmlJavaTypeAdapterAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java
deleted file mode 100644
index 8cf435e871..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java
+++ /dev/null
@@ -1,2142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.beans.Introspector;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.Modifier.ModifierKeyword;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMember;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.ReflectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder;
-import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
-import org.eclipse.jpt.jaxb.core.internal.context.java.PropertyAccessor;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorOrderAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorTypeAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSeeAlsoAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlTypeAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaClassMappingTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaClassMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	private void createTestSubType() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TYPE);
-					sb.append(";");
-					sb.append(CR);
-				sb.append("@XmlType");
-				sb.append(CR);
-				sb.append("public class ").append("AnnotationTestTypeChild").append(" ");
-				sb.append("extends " + TYPE_NAME + " ");
-				sb.append("{}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestTypeChild.java", sourceWriter);
-	}
-	
-	private ICompilationUnit createXmlTypeWithAccessorType() throws CoreException {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ACCESS_TYPE, JAXB.XML_ACCESSOR_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType").append(CR);
-				sb.append("@XmlAccessorType(value = XmlAccessType.PROPERTY)");
-			}
-		});
-	}
-	
-	private ICompilationUnit createXmlTypeWithAccessorOrder() throws CoreException {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ACCESS_ORDER, JAXB.XML_ACCESSOR_ORDER);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType").append(CR);
-				sb.append("@XmlAccessorOrder(value = XmlAccessOrder.ALPHABETICAL)");
-			}
-		});
-	}
-
-	private ICompilationUnit createPackageInfoWithAccessorType() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlAccessorType(value = XmlAccessType.PROPERTY)",
-				JAXB.XML_ACCESS_TYPE, JAXB.XML_ACCESSOR_TYPE);
-	}
-
-	private void createTestXmlTypeWithFieldAndPublicMemberAccess() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TYPE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_ATTRIBUTE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TRANSIENT);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import java.util.List;");
-					sb.append(CR);
-				sb.append("@XmlType");
-				sb.append(CR);
-				sb.append("public class ").append(TYPE_NAME).append(" ");
-				sb.append("{").append(CR);
-				sb.append("    public int foo;").append(CR);
-				sb.append(CR).append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter);
-	}
-
-	private void createTestXmlTypeWithPropertyAndPublicMemberAccess() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TYPE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_ATTRIBUTE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TRANSIENT);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import java.util.List;");
-					sb.append(CR);
-				sb.append("@XmlType");
-				sb.append(CR);
-				sb.append("public class ").append(TYPE_NAME).append(" ");
-				sb.append("{").append(CR);
-				sb.append("    public int getFoo() {").append(CR);
-				sb.append("        return 1;").append(CR).append("    }").append(CR);
-				sb.append("    public void setFoo(int foo) {}").append(CR).append(CR);
-				sb.append(CR).append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter);
-	}
-
-	private void createTestXmlTypeWithPropertyGetterAndPublicMemberAccess() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TYPE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_ATTRIBUTE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TRANSIENT);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import java.util.List;");
-					sb.append(CR);
-				sb.append("@XmlType");
-				sb.append(CR);
-				sb.append("public class ").append(TYPE_NAME).append(" ");
-				sb.append("{").append(CR);
-				sb.append("    public int getFoo() {").append(CR);
-				sb.append("        return 1;").append(CR).append("    }").append(CR);
-				sb.append(CR).append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter);
-	}
-
-	private void createTestXmlTypeWithPropertyGetterListAndPublicMemberAccess() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TYPE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_ATTRIBUTE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TRANSIENT);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import java.util.List;");
-					sb.append(CR);
-				sb.append("@XmlType");
-				sb.append(CR);
-				sb.append("public class ").append(TYPE_NAME).append(" ");
-				sb.append("{").append(CR);
-				sb.append("    public List<?> getFoo() {").append(CR);
-				sb.append("        return 1;").append(CR).append("    }").append(CR);
-				sb.append(CR).append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter);
-	}
-
-	private void createTestXmlTypeWithPropertySetterAndPublicMemberAccess() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TYPE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_ATTRIBUTE);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import ");
-					sb.append(JAXB.XML_TRANSIENT);
-					sb.append(";");
-					sb.append(CR);
-					sb.append("import java.util.List;");
-					sb.append(CR);
-				sb.append("@XmlType");
-				sb.append(CR);
-				sb.append("public class ").append(TYPE_NAME).append(" ");
-				sb.append("{").append(CR);
-				sb.append("    public void setFoo(int foo) {}").append(CR).append(CR);
-				sb.append(CR).append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "AnnotationTestType.java", sourceWriter);
-	}
-	
-    public void testModifyFactoryClass() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(classMapping.getSpecifiedFactoryClass());
-		assertEquals(JAXB.XML_TYPE__DEFAULT_FACTORY_CLASS, classMapping.getFactoryClass());
-		
-		classMapping.setSpecifiedFactoryClass("foo");
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getFactoryClass());
-		assertEquals("foo", classMapping.getFactoryClass());
-		
-		classMapping.setSpecifiedFactoryClass(null);
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getFactoryClass());
-		assertNull(classMapping.getSpecifiedFactoryClass());
-		assertEquals(JAXB.XML_TYPE__DEFAULT_FACTORY_CLASS, classMapping.getFactoryClass());
-		
-		//add another annotation so that the context model does not get blown away
-		classMapping.setSpecifiedAccessType(XmlAccessType.FIELD);
-		resourceType.removeAnnotation(JAXB.XML_TYPE);
-		
-		//set factoryClass again, this time starting with no XmlType annotation
-		classMapping.setSpecifiedFactoryClass("foo");
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getFactoryClass());
-		assertEquals("foo", classMapping.getFactoryClass());
-	}
-	
-	public void testUpdateFactoryClass() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(classMapping.getSpecifiedFactoryClass());
-		assertEquals(JAXB.XML_TYPE__DEFAULT_FACTORY_CLASS, classMapping.getFactoryClass());
-		
-		//add a factoryClass member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addXmlTypeTypeMemberValuePair(declaration, JAXB.XML_TYPE__FACTORY_CLASS, "Foo");
-			}
-		});
-		assertEquals("Foo", classMapping.getFactoryClass());
-
-		//remove the factoryClass member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlTypeAnnotation = (NormalAnnotation) GenericJavaClassMappingTests.this.getXmlTypeAnnotation(declaration);
-				GenericJavaClassMappingTests.this.values(xmlTypeAnnotation).remove(0);
-			}
-		});
-		assertNull(classMapping.getSpecifiedFactoryClass());
-		assertEquals(JAXB.XML_TYPE__DEFAULT_FACTORY_CLASS, classMapping.getFactoryClass());
-	}
-
-	public void testModifyFactoryMethod() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(classMapping.getFactoryMethod());
-		
-		classMapping.setFactoryMethod("foo");
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getFactoryMethod());
-		assertEquals("foo", classMapping.getFactoryMethod());
-		
-		classMapping.setFactoryMethod(null);
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getFactoryMethod());
-		assertNull(classMapping.getFactoryMethod());
-	
-		//add another annotation so that the context model does not get blown away
-		classMapping.setSpecifiedAccessType(XmlAccessType.FIELD);
-		resourceType.removeAnnotation(JAXB.XML_TYPE);
-		
-		//set factoryMethod again, this time starting with no XmlType annotation
-		classMapping.setFactoryMethod("foo");
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getFactoryMethod());
-		assertEquals("foo", classMapping.getFactoryMethod());
-	}
-	
-	public void testUpdateFactoryMethod() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(classMapping.getFactoryMethod());
-		
-		//add a factoryMethod member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addXmlTypeMemberValuePair(declaration, JAXB.XML_TYPE__FACTORY_METHOD, "foo");
-			}
-		});
-		assertEquals("foo", classMapping.getFactoryMethod());
-
-		//remove the factoryMethod member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlTypeAnnotation = (NormalAnnotation) GenericJavaClassMappingTests.this.getXmlTypeAnnotation(declaration);
-				GenericJavaClassMappingTests.this.values(xmlTypeAnnotation).remove(0);
-			}
-		});
-		assertNull(classMapping.getFactoryMethod());
-	}
-
-	public void testModifySchemaTypeName() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
-		
-		assertNull(classMapping.getQName().getSpecifiedName());
-		assertEquals(defaultXmlTypeName, classMapping.getQName().getDefaultName());
-		assertEquals(defaultXmlTypeName, classMapping.getQName().getName());
-		
-		classMapping.getQName().setSpecifiedName("foo");
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getName());
-		assertEquals("foo", classMapping.getQName().getSpecifiedName());
-		assertEquals("foo", classMapping.getQName().getName());
-		
-		classMapping.getQName().setSpecifiedName(null);
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getName());
-		assertNull(classMapping.getQName().getSpecifiedName());
-		assertEquals(defaultXmlTypeName, classMapping.getQName().getName());	
-		
-		//add another annotation so that the context model does not get blown away
-		classMapping.setSpecifiedAccessType(XmlAccessType.FIELD);
-		resourceType.removeAnnotation(JAXB.XML_TYPE);
-		
-		//set name again, this time starting with no XmlType annotation
-		classMapping.getQName().setSpecifiedName("foo");
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getName());
-		assertEquals("foo", classMapping.getQName().getSpecifiedName());
-		assertEquals("foo", classMapping.getQName().getName());
-	}
-	
-	public void testUpdateSchemaTypeName() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
-		
-		assertNull(classMapping.getQName().getSpecifiedName());
-		assertEquals(defaultXmlTypeName, classMapping.getQName().getDefaultName());
-		assertEquals(defaultXmlTypeName, classMapping.getQName().getName());
-		
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addXmlTypeMemberValuePair(declaration, JAXB.XML_TYPE__NAME, "foo");
-			}
-		});
-		assertEquals("foo", classMapping.getQName().getSpecifiedName());
-		assertEquals("foo", classMapping.getQName().getName());
-		
-		//remove the namespace member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlTypeAnnotation = (NormalAnnotation) GenericJavaClassMappingTests.this.getXmlTypeAnnotation(declaration);
-				GenericJavaClassMappingTests.this.values(xmlTypeAnnotation).remove(0);
-			}
-		});
-		assertNull(classMapping.getQName().getSpecifiedName());
-		assertEquals(defaultXmlTypeName, classMapping.getQName().getName());
-	}
-
-	public void testModifyNamespace() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(classMapping.getQName().getSpecifiedNamespace());
-		assertEquals("", classMapping.getQName().getDefaultNamespace());
-		assertEquals("", classMapping.getQName().getNamespace());
-		
-		classMapping.getQName().setSpecifiedNamespace("foo");
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getNamespace());
-		assertEquals("foo", classMapping.getQName().getSpecifiedNamespace());
-		assertEquals("foo", classMapping.getQName().getNamespace());
-		
-		classMapping.getQName().setSpecifiedNamespace(null);
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getNamespace());
-		assertNull(classMapping.getQName().getSpecifiedNamespace());
-		assertEquals("", classMapping.getQName().getNamespace());
-		
-		//add another annotation so that the context model does not get blown away
-		classMapping.setSpecifiedAccessType(XmlAccessType.FIELD);
-		resourceType.removeAnnotation(JAXB.XML_TYPE);
-		
-		//set namespace again, this time starting with no XmlType annotation
-		classMapping.getQName().setSpecifiedNamespace("foo");
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getNamespace());
-		assertEquals("foo", classMapping.getQName().getSpecifiedNamespace());
-		assertEquals("foo", classMapping.getQName().getNamespace());
-	}
-	
-	public void testUpdateNamespace() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(classMapping.getQName().getSpecifiedNamespace());
-		assertEquals("", classMapping.getQName().getDefaultNamespace());
-		assertEquals("", classMapping.getQName().getNamespace());
-		
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addXmlTypeMemberValuePair(declaration, JAXB.XML_TYPE__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", classMapping.getQName().getSpecifiedNamespace());
-		assertEquals("foo", classMapping.getQName().getNamespace());
-		
-		//remove the namespace member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlTypeAnnotation = (NormalAnnotation) GenericJavaClassMappingTests.this.getXmlTypeAnnotation(declaration);
-				GenericJavaClassMappingTests.this.values(xmlTypeAnnotation).remove(0);
-			}
-		});
-		assertNull(classMapping.getQName().getSpecifiedNamespace());
-		assertEquals("", classMapping.getQName().getNamespace());
-	}
-
-	public void testModifyAccessType() throws Exception {
-		createXmlTypeWithAccessorType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertEquals(XmlAccessType.PROPERTY, classMapping.getSpecifiedAccessType());
-		assertEquals(XmlAccessType.PROPERTY, classMapping.getAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, classMapping.getDefaultAccessType());
-		
-		classMapping.setSpecifiedAccessType(XmlAccessType.FIELD);
-		XmlAccessorTypeAnnotation accessorTypeAnnotation = (XmlAccessorTypeAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.FIELD, accessorTypeAnnotation.getValue());
-		assertEquals(XmlAccessType.FIELD, classMapping.getAccessType());
-
-		classMapping.setSpecifiedAccessType(XmlAccessType.PUBLIC_MEMBER);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.PUBLIC_MEMBER, accessorTypeAnnotation.getValue());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, classMapping.getAccessType());
-
-		classMapping.setSpecifiedAccessType(XmlAccessType.NONE);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.NONE, accessorTypeAnnotation.getValue());
-		assertEquals(XmlAccessType.NONE, classMapping.getAccessType());
-		
-		classMapping.setSpecifiedAccessType(null);
-		accessorTypeAnnotation = (XmlAccessorTypeAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertNull(accessorTypeAnnotation.getValue());
-		assertNull(classMapping.getSpecifiedAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, classMapping.getAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, classMapping.getDefaultAccessType());
-	}
-	
-	public void testUpdateAccessType() throws Exception {
-		createXmlTypeWithAccessorType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertEquals(XmlAccessType.PROPERTY, classMapping.getSpecifiedAccessType());
-		assertEquals(XmlAccessType.PROPERTY, classMapping.getAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, classMapping.getDefaultAccessType());
-		
-		//set the accesser type value to FIELD
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE__FIELD);
-			}
-		});
-		assertEquals(XmlAccessType.FIELD, classMapping.getAccessType());
-
-		//set the accesser type value to PUBLIC_MEMBER
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-			}
-		});
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, classMapping.getAccessType());
-
-		//set the accesser type value to NONE
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE__NONE);
-			}
-		});
-		assertEquals(XmlAccessType.NONE, classMapping.getAccessType());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ACCESSOR_TYPE);
-			}
-		});
-		assertNull(classMapping.getSpecifiedAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, classMapping.getAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, classMapping.getDefaultAccessType());
-	}
-
-	/**
-	 * If there is a @XmlAccessorType on a class, then it is used.
-	 * Otherwise, if a @XmlAccessorType exists on one of its super classes, then it is inherited.
-	 * Otherwise, the @XmlAccessorType on a package is inherited. 	
-	 */
-	public void testGetDefaultAccessType() throws Exception {
-		createClassWithXmlType();
-		createTestSubType();
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbClass childJaxbClass = (JaxbClass) getContextRoot().getType("test.AnnotationTestTypeChild");
-		JaxbClassMapping childClassMapping = childJaxbClass.getMapping();
-		
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, childClassMapping.getDefaultAccessType());
-
-		this.createPackageInfoWithAccessorType();
-		assertEquals(XmlAccessType.PROPERTY, childClassMapping.getDefaultAccessType());
-
-		classMapping.setSpecifiedAccessType(XmlAccessType.FIELD);
-		assertEquals(XmlAccessType.FIELD, childClassMapping.getDefaultAccessType());
-
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		classMapping.setSpecifiedAccessType(null);
-		assertEquals(XmlAccessType.PROPERTY, childClassMapping.getDefaultAccessType());
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD);
-		assertEquals(XmlAccessType.FIELD, childClassMapping.getDefaultAccessType());
-
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.NONE);
-		assertEquals(XmlAccessType.NONE, childClassMapping.getDefaultAccessType());
-
-		contextPackageInfo.setSpecifiedAccessType(null);
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, childClassMapping.getDefaultAccessType());
-	}
-
-	public void testGetSuperPersistentClass() throws Exception {
-		createClassWithXmlType();
-		createTestSubType();
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbClass childJaxbClass = (JaxbClass) getContextRoot().getType("test.AnnotationTestTypeChild");
-		JaxbClassMapping childClassMapping = childJaxbClass.getMapping();
-		
-		assertEquals(classMapping, childClassMapping.getSuperclass());
-
-		//test that the superClass is not null even when it is unannotated
-		AnnotatedElement annotatedElement = this.annotatedElement(jaxbClass.getJavaResourceType());
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_TYPE);
-			}
-		});
-		assertEquals(classMapping, childClassMapping.getSuperclass());
-	}
-
-	public void testModifyAccessOrder() throws Exception {
-		createXmlTypeWithAccessorOrder();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertEquals(XmlAccessOrder.ALPHABETICAL, classMapping.getSpecifiedAccessOrder());
-		assertEquals(XmlAccessOrder.ALPHABETICAL, classMapping.getAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, classMapping.getDefaultAccessOrder());
-
-		classMapping.setSpecifiedAccessOrder(XmlAccessOrder.UNDEFINED);
-		XmlAccessorOrderAnnotation accessorOrderAnnotation = (XmlAccessorOrderAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder.UNDEFINED, accessorOrderAnnotation.getValue());
-		assertEquals(XmlAccessOrder.UNDEFINED, classMapping.getAccessOrder());
-
-		classMapping.setSpecifiedAccessOrder(null);
-		accessorOrderAnnotation = (XmlAccessorOrderAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertNull(accessorOrderAnnotation.getValue());
-		assertNull(classMapping.getSpecifiedAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, classMapping.getAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, classMapping.getDefaultAccessOrder());
-	}
-
-	public void testUpdateAccessOrder() throws Exception {
-		createXmlTypeWithAccessorOrder();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertEquals(XmlAccessOrder.ALPHABETICAL, classMapping.getSpecifiedAccessOrder());
-		assertEquals(XmlAccessOrder.ALPHABETICAL, classMapping.getAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, classMapping.getDefaultAccessOrder());
-
-		//set the access order value to UNDEFINED
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_ORDER, JAXB.XML_ACCESS_ORDER__UNDEFINED);
-			}
-		});
-		assertEquals(XmlAccessOrder.UNDEFINED, classMapping.getAccessOrder());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ACCESSOR_ORDER);
-			}
-		});
-		assertNull(classMapping.getSpecifiedAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, classMapping.getAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, classMapping.getDefaultAccessOrder());
-	}
-
-	public void testGetPropOrder() throws Exception {
-		this.createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		ListIterator<String> props = classMapping.getPropOrder().iterator();
-		assertFalse(props.hasNext());
-
-		//add 2 prop orders
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addProp(declaration, 0, "bar");
-				GenericJavaClassMappingTests.this.addProp(declaration, 1, "foo");
-			}
-		});
-
-		props = classMapping.getPropOrder().iterator();
-		assertEquals("bar", props.next());
-		assertEquals("foo", props.next());
-		assertFalse(props.hasNext());
-	}
-
-	protected void addProp(ModifiedDeclaration declaration, int index, String prop) {
-		this.addArrayElement(declaration, JAXB.XML_TYPE, index, JAXB.XML_TYPE__PROP_ORDER, this.newStringLiteral(declaration.getAst(), prop));		
-	}
-
-	public void testGetPropOrderSize() throws Exception {
-		this.createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertEquals(0, classMapping.getPropOrderSize());
-
-		//add 2 prop orders
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addProp(declaration, 0, "bar");
-				GenericJavaClassMappingTests.this.addProp(declaration, 1, "foo");
-			}
-		});
-		assertEquals(2, classMapping.getPropOrderSize());
-	}
-
-	public void testAddProp() throws Exception {
-		this.createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		classMapping.addProp(0, "bar");
-		classMapping.addProp(0, "foo");
-		classMapping.addProp(0, "baz");
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		ListIterator<String> props = xmlTypeAnnotation.getPropOrder().iterator();
-
-		assertEquals("baz", props.next());
-		assertEquals("foo", props.next());
-		assertEquals("bar", props.next());
-		assertFalse(props.hasNext());
-	}
-
-	public void testAddProp2() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		classMapping.addProp(0, "bar");
-		classMapping.addProp(1, "foo");
-		classMapping.addProp(0, "baz");
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		ListIterator<String> props = xmlTypeAnnotation.getPropOrder().iterator();
-
-		assertEquals("baz", props.next());
-		assertEquals("bar", props.next());
-		assertEquals("foo", props.next());
-		assertFalse(props.hasNext());
-	}
-
-	public void testRemoveProp() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		classMapping.addProp(0, "bar");
-		classMapping.addProp(1, "foo");
-		classMapping.addProp(2, "baz");
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-
-		classMapping.removeProp(1);
-
-		ListIterator<String> resourceProps = xmlTypeAnnotation.getPropOrder().iterator();
-		assertEquals("bar", resourceProps.next());		
-		assertEquals("baz", resourceProps.next());
-		assertFalse(resourceProps.hasNext());
-
-		classMapping.removeProp(1);
-		resourceProps = xmlTypeAnnotation.getPropOrder().iterator();
-		assertEquals("bar", resourceProps.next());
-		assertFalse(resourceProps.hasNext());
-
-		classMapping.removeProp(0);
-		resourceProps = xmlTypeAnnotation.getPropOrder().iterator();
-		assertFalse(resourceProps.hasNext());
-	}
-
-	public void testMoveProp() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		classMapping.addProp(0, "bar");
-		classMapping.addProp(1, "foo");
-		classMapping.addProp(2, "baz");
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-
-		assertEquals(3, xmlTypeAnnotation.getPropOrderSize());		
-
-		classMapping.moveProp(2, 0);
-		ListIterator<String> props = classMapping.getPropOrder().iterator();
-		assertEquals("foo", props.next());
-		assertEquals("baz", props.next());
-		assertEquals("bar", props.next());		
-		assertFalse(props.hasNext());
-
-		ListIterator<String> resourceProps = xmlTypeAnnotation.getPropOrder().iterator();
-		assertEquals("foo", resourceProps.next());
-		assertEquals("baz", resourceProps.next());
-		assertEquals("bar", resourceProps.next());
-		
-		classMapping.moveProp(0, 1);
-		props = classMapping.getPropOrder().iterator();
-		assertEquals("baz", props.next());
-		assertEquals("foo", props.next());
-		assertEquals("bar", props.next());		
-		assertFalse(props.hasNext());
-
-		resourceProps = xmlTypeAnnotation.getPropOrder().iterator();
-		assertEquals("baz", resourceProps.next());
-		assertEquals("foo", resourceProps.next());
-		assertEquals("bar", resourceProps.next());
-	}
-
-	public void testSyncProps() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		ListIterator<String> props = classMapping.getPropOrder().iterator();
-		assertFalse(props.hasNext());
-
-		//add 3 prop orders
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addProp(declaration, 0, "bar");
-				GenericJavaClassMappingTests.this.addProp(declaration, 1, "foo");
-				GenericJavaClassMappingTests.this.addProp(declaration, 2, "baz");
-			}
-		});
-
-		props = classMapping.getPropOrder().iterator();
-		assertTrue(props.hasNext());
-		assertEquals("bar", props.next());
-		assertEquals("foo", props.next());
-		assertEquals("baz", props.next());
-		assertFalse(props.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.moveProp(declaration, 2, 0);
-			}
-		});
-
-		props = classMapping.getPropOrder().iterator();
-		assertTrue(props.hasNext());
-		assertEquals("foo", props.next());
-		assertEquals("baz", props.next());
-		assertEquals("bar", props.next());
-		assertFalse(props.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.moveProp(declaration, 0, 1);
-			}
-		});
-
-		props = classMapping.getPropOrder().iterator();
-		assertTrue(props.hasNext());
-		assertEquals("baz", props.next());
-		assertEquals("foo", props.next());
-		assertEquals("bar", props.next());
-		assertFalse(props.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeProp(declaration, 1);
-			}
-		});
-
-		props = classMapping.getPropOrder().iterator();
-		assertTrue(props.hasNext());
-		assertEquals("baz", props.next());
-		assertEquals("bar", props.next());
-		assertFalse(props.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeProp(declaration, 1);
-			}
-		});
-
-		props = classMapping.getPropOrder().iterator();
-		assertTrue(props.hasNext());
-		assertEquals("baz", props.next());
-		assertFalse(props.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeProp(declaration, 0);
-			}
-		});
-
-		props = classMapping.getPropOrder().iterator();
-		assertFalse(props.hasNext());
-	}
-
-	protected void addXmlTypeMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlTypeAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlTypeTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlTypeAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected Annotation getXmlTypeAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_TYPE);
-	}
-
-	protected void moveProp(ModifiedDeclaration declaration, int targetIndex, int sourceIndex) {
-		this.moveArrayElement((NormalAnnotation) getXmlTypeAnnotation(declaration), JAXB.XML_TYPE__PROP_ORDER, targetIndex, sourceIndex);
-	}
-
-	protected void removeProp(ModifiedDeclaration declaration, int index) {
-		this.removeArrayElement((NormalAnnotation) getXmlTypeAnnotation(declaration), JAXB.XML_TYPE__PROP_ORDER, index);
-	}
-
-	public void testModifyXmlRootElement() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(classMapping.getXmlRootElement());
-		
-		classMapping.addXmlRootElement().getQName().setSpecifiedName("foo");
-		XmlRootElementAnnotation xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertEquals("foo", xmlRootElementAnnotation.getName());
-		assertEquals("foo", classMapping.getXmlRootElement().getQName().getName());
-		
-		classMapping.removeXmlRootElement();
-		xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertNull(xmlRootElementAnnotation);
-		assertNull(classMapping.getXmlRootElement());
-	}
-
-	public void testUpdateXmlRootElement() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(classMapping.getXmlRootElement());
-		
-		//add a XmlRootElement annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation annotation = GenericJavaClassMappingTests.this.addNormalAnnotation(declaration.getDeclaration(), JAXB.XML_ROOT_ELEMENT);
-				GenericJavaClassMappingTests.this.addMemberValuePair(annotation, JAXB.XML_ROOT_ELEMENT__NAME, "foo");
-			}
-		});
-		assertEquals("foo", classMapping.getXmlRootElement().getQName().getName());
-		
-		//remove the XmlRootElement annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ROOT_ELEMENT);
-			}
-		});
-		assertNull(classMapping.getXmlRootElement());
-	}
-	
-	public void testUpdateFieldAttributes() throws Exception {
-		this.createTestXmlTypeWithFieldAndPublicMemberAccess();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		
-		//public int foo;
-		publicFieldTest(classMapping);
-		
-		//public transient int foo;
-		publicTransientFieldTest(classMapping);
-		
-		//public static int foo;
-		publicStaticFieldTest(classMapping);
-		
-		//public final int foo;
-		publicFinalFieldTest(classMapping);
-		
-		//public static final int foo;
-		publicStaticFinalFieldTest(classMapping);
-		
-		//private int foo;
-		privateFieldTest(classMapping);
-		
-		//  private transient int foo;
-		privateTransientFieldTest(classMapping);
-		
-		//  @XmlAttribute
-		//  private static int foo; //persistent
-		privateStaticFieldTest(classMapping);
-		
-		//  @XmlAttribute
-		//  private static final int foo; //persistent
-		privateStaticFinalFieldTest(classMapping);
-	}
-	
-	protected void publicFieldTest(JaxbClassMapping classMapping) {
-		//public int foo; PUBLIC_MEMBER access - persistent
-		assertEquals(1, classMapping.getAttributesSize());
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		//public int foo; //PROPERTY access - not persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public int foo; //FIELD access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		//public int foo; //NONE access - not persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public int foo; PUBLIC_MEMBER access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		//add @XmlTransient annotation and test each access type
-		JavaResourceField resourceField = (JavaResourceField) classMapping.getAttributes().iterator().next().getJavaResourceAttribute();
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceField);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TRANSIENT);
-			}
-		});
-		//@XmlTransient
-		//public int foo; //PROPERTY access - not "persistent", but comes in to our context model because it is "mapped"
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlTransient
-		//public int foo; //FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlTransient
-		//public int foo; //NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlTransient
-		//public int foo; PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_TRANSIENT);
-			}
-		});
-	}
-
-	protected void publicTransientFieldTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute();
-
-		//public transient int foo; PUBLIC_MEMBER access - not persistent
-		this.addModifiers(resourceField, ModifierKeyword.TRANSIENT_KEYWORD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public transient int foo; //PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public transient int foo; //FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public transient int foo; //NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public transient int foo; PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		this.removeModifiers(resourceField, ModifierKeyword.TRANSIENT_KEYWORD);
-	}
-
-	protected void publicStaticFieldTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute();
-
-		//public static int foo; PUBLIC_MEMBER access - not persistent
-		this.addModifiers(resourceField, ModifierKeyword.STATIC_KEYWORD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static int foo; //PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static int foo; //FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static int foo; //NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static int foo; PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		this.removeModifiers(resourceField, ModifierKeyword.STATIC_KEYWORD);
-	}
-
-	protected void publicFinalFieldTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute();
-
-		//public final int foo; PUBLIC_MEMBER access - persistent
-		this.addModifiers(resourceField, ModifierKeyword.FINAL_KEYWORD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//public final int foo; //PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public final int foo; //FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//public final int foo; //NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public final int foo; PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		this.removeModifiers(resourceField, ModifierKeyword.FINAL_KEYWORD);
-	}
-
-	protected void publicStaticFinalFieldTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute();
-
-		//public static final int foo; PUBLIC_MEMBER access - not persistent
-		this.addModifiers(resourceField, ModifierKeyword.STATIC_KEYWORD, ModifierKeyword.FINAL_KEYWORD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static final int foo; //PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static final int foo; //FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static final int foo; //NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static final int foo; PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		this.removeModifiers(resourceField, ModifierKeyword.STATIC_KEYWORD, ModifierKeyword.FINAL_KEYWORD);
-	}
-
-	protected void privateFieldTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute();
-		removeModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD);
-		addModifiers(resourceField, ModifierKeyword.PRIVATE_KEYWORD);
-
-		//private int foo; PUBLIC_MEMBER access - not persistent
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private int foo; //PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private int foo; //FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//private int foo; //NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private int foo; PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-
-		//add @XmlAttribute annotation and test each access type
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceField);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//private int foo; //PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private int foo; //FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private int foo; //NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private int foo; PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-		removeModifiers(resourceField, ModifierKeyword.PRIVATE_KEYWORD);
-		addModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD);
-	}
-
-	protected void privateTransientFieldTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute();
-		removeModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD);
-		addModifiers(resourceField, ModifierKeyword.PRIVATE_KEYWORD, ModifierKeyword.TRANSIENT_KEYWORD);
-
-		//private transient int foo; PUBLIC_MEMBER access - not persistent
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private transient int foo; //PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private transient int foo; //FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private transient int foo; //NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private transient int foo; PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-
-		//add @XmlAttribute annotation and test each access type
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceField);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//private transient int foo; //PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private transient int foo; //FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private transient int foo; //NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private transient int foo; PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-		removeModifiers(resourceField, ModifierKeyword.PRIVATE_KEYWORD, ModifierKeyword.TRANSIENT_KEYWORD);
-		addModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD);
-	}
-
-	protected void privateStaticFieldTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute();
-		removeModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD);
-		addModifiers(resourceField, ModifierKeyword.PRIVATE_KEYWORD, ModifierKeyword.STATIC_KEYWORD);
-
-		//private static int foo; PUBLIC_MEMBER access - not persistent
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private static int foo; //PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private static int foo; //FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private static int foo; //NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private static int foo; PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-
-		//add @XmlAttribute annotation and test each access type
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceField);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//private static int foo; //PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private static int foo; //FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private static int foo; //NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private static int foo; PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-		removeModifiers(resourceField, ModifierKeyword.PRIVATE_KEYWORD, ModifierKeyword.STATIC_KEYWORD);
-		addModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD);
-	}
-
-	protected void privateStaticFinalFieldTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		JavaResourceField resourceField = (JavaResourceField) attributes.next().getJavaResourceAttribute();
-		removeModifiers(resourceField, ModifierKeyword.PUBLIC_KEYWORD);
-		addModifiers(resourceField, ModifierKeyword.PRIVATE_KEYWORD, ModifierKeyword.STATIC_KEYWORD, ModifierKeyword.FINAL_KEYWORD);
-
-		//private static final int foo; PUBLIC_MEMBER access - not persistent
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private static final int foo; //PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private static final int foo; //FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private static final int foo; //NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private static final int foo; PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-
-		//add @XmlAttribute annotation and test each access type
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceField);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//private static final int foo; //PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private static final int foo; //FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private static final int foo; //NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private static final int foo; PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-	}
-
-	public void testUpdatePropertyAttributes() throws Exception {
-		createTestXmlTypeWithPropertyAndPublicMemberAccess();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		
-		//public int getFoo();, public void setFoo(int);
-		publicGetterSetterTest(classMapping);
-		
-		//public static int getFoo();, public static void setFoo(int);
-		publicStaticGetterSetterTest(classMapping);
-		
-		//private int getFoo();, private void setFoo(int);
-		privateGetterSetterTest(classMapping);
-	}
-	
-	public void testUpdateGetterPropertyAttributes() throws Exception {
-		createTestXmlTypeWithPropertyGetterAndPublicMemberAccess();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		
-		//public int getFoo(); PUBLIC_MEMBER access - not persistent
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public int getFoo(); PROPERTY access - not persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public int getFoo(); FIELD access - not persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public int getFoo(); NONE access - not persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public int getFoo(); PUBLIC_MEMBER access - not persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//add @XmlAttribute annotation and test each access type
-		JavaResourceMethod resourceMethod = classMapping.getJaxbType().getJavaResourceType().getMethods().iterator().next();
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//public int getFoo(); PROPERTY access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		assertEquals(1, classMapping.getAttributesSize());
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public int getFoo(); FIELD access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		//@XmlAttribute
-		//public int getFoo(); NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		//@XmlAttribute
-		//public int getFoo(); PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-	}
-	
-	public void testUpdateSetterPropertyAttributes() throws Exception {
-		createTestXmlTypeWithPropertySetterAndPublicMemberAccess();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		
-		//public void setFoo(int foo); PUBLIC_MEMBER access - not persistent
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public void setFoo(int foo); PROPERTY access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public void setFoo(int foo); FIELD access - not persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public void setFoo(int foo); NONE access - not persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//public void setFoo(int foo); PUBLIC_MEMBER access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-		
-		//add @XmlAttribute annotation and test each access type
-		JavaResourceMethod resourceMethod = classMapping.getJaxbType().getJavaResourceType().getMethods().iterator().next();
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//public void setFoo(int foo);; PROPERTY access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		assertEquals(1, classMapping.getAttributesSize());
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		//@XmlAttribute
-		//public void setFoo(int foo); FIELD access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public void setFoo(int foo); NONE access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		//@XmlAttribute
-		//public void setFoo(int foo); PUBLIC_MEMBER access - persistent
-		setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-	}
-	
-	public void testUpdateGetterListPropertyAttributes() throws Exception {
-		this.createTestXmlTypeWithPropertyGetterListAndPublicMemberAccess();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		
-		//public List<?> getFoo(); PUBLIC_MEMBER access - persistent
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		assertEquals(1, classMapping.getAttributesSize());
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//public List<?> getFoo(); PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals(1, classMapping.getAttributesSize());
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//public List<?> getFoo(); FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public List<?> getFoo(); NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public List<?> getFoo(); PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals(1, classMapping.getAttributesSize());
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//add @XmlAttribute annotation and test each access type
-		JavaResourceMethod resourceMethod = classMapping.getJaxbType().getJavaResourceType().getMethods().iterator().next();
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//public List<?> getFoo(); PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals(1, classMapping.getAttributesSize());
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public List<?> getFoo(); FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public List<?> getFoo(); NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public List<?> getFoo(); PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-	}
-
-	protected void publicGetterSetterTest(JaxbClassMapping classMapping) {
-		//public int getFoo();, public void setFoo(int); PUBLIC_MEMBER access - persistent
-		assertEquals(1, classMapping.getAttributesSize());
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//public int getFoo();, public void setFoo(int); PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//public int getFoo();, public void setFoo(int); FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public int getFoo();, public void setFoo(int); NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public int getFoo();, public void setFoo(int); PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-
-		//add @XmlAttribute annotation and test each access type
-		JavaResourceMethod resourceMethod = (JavaResourceMethod) classMapping.getAttributes().iterator().next().getJavaResourceAttribute();
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//public int getFoo();, public void setFoo(int); PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public int getFoo();, public void setFoo(int); FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public int getFoo();, public void setFoo(int); NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public int getFoo();, public void setFoo(int); PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-	}
-
-	protected void publicStaticGetterSetterTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		PropertyAccessor propertyAccessor = (PropertyAccessor) ReflectionTools.getFieldValue(attributes.next(), "accessor");
-		JavaResourceMethod resourceGetter = propertyAccessor.getResourceGetterMethod();
-		JavaResourceMethod resourceSetter = propertyAccessor.getResourceSetterMethod();
-
-		//public static int getFoo();, public static void setFoo(int); PUBLIC_MEMBER access - not persistent
-		this.addModifiers(resourceGetter, ModifierKeyword.STATIC_KEYWORD);
-		this.addModifiers(resourceSetter, ModifierKeyword.STATIC_KEYWORD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-
-		//public static int getFoo();, public static void setFoo(int); PROPERTY access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static int getFoo();, public static void setFoo(int); FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static int getFoo();, public static void setFoo(int); NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//public static int getFoo();, public static void setFoo(int); PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-
-		//add @XmlAttribute annotation and test each access type
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceGetter);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//public static int getFoo();, public static void setFoo(int); PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public static int getFoo();, public static void setFoo(int); FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public static int getFoo();, public static void setFoo(int); NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//public static int getFoo();, public static void setFoo(int); PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-		this.removeModifiers(resourceGetter, ModifierKeyword.STATIC_KEYWORD);
-		this.removeModifiers(resourceSetter, ModifierKeyword.STATIC_KEYWORD);
-	}
-
-	protected void privateGetterSetterTest(JaxbClassMapping classMapping) {
-		Iterator<JaxbPersistentAttribute> attributes = classMapping.getAttributes().iterator();
-		PropertyAccessor propertyAccessor = (PropertyAccessor) ReflectionTools.getFieldValue(attributes.next(), "accessor");
-		JavaResourceMethod resourceGetter = propertyAccessor.getResourceGetterMethod();
-		JavaResourceMethod resourceSetter = propertyAccessor.getResourceSetterMethod();
-
-		//private int getFoo();, private void setFoo(int); PUBLIC_MEMBER access - not persistent
-		this.removeModifiers(resourceGetter, ModifierKeyword.PUBLIC_KEYWORD);
-		this.removeModifiers(resourceSetter, ModifierKeyword.PUBLIC_KEYWORD);
-		this.addModifiers(resourceGetter, ModifierKeyword.PRIVATE_KEYWORD);
-		this.addModifiers(resourceSetter, ModifierKeyword.PRIVATE_KEYWORD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-
-		//private int getFoo();, private void setFoo(int); PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//private int getFoo();, private void setFoo(int); FIELD access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private int getFoo();, private void setFoo(int); NONE access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(0, classMapping.getAttributesSize());
-
-		//private int getFoo();, private void setFoo(int); PUBLIC_MEMBER access - not persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(0, classMapping.getAttributesSize());
-
-
-		//add @XmlAttribute annotation and test each access type
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceGetter);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTRIBUTE);
-			}
-		});
-		//@XmlAttribute
-		//private int getFoo();, private void setFoo(int); PROPERTY access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PROPERTY);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private int getFoo();, private void setFoo(int); FIELD access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__FIELD);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private int getFoo();, private void setFoo(int); NONE access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__NONE);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-
-		//@XmlAttribute
-		//private int getFoo();, private void setFoo(int); PUBLIC_MEMBER access - persistent
-		this.setAccessTypeInJavaSource(classMapping, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-		assertEquals(1, classMapping.getAttributesSize());
-		attributes = classMapping.getAttributes().iterator();
-		assertEquals("foo", attributes.next().getName());
-		assertFalse(attributes.hasNext());
-	
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTRIBUTE);
-			}
-		});
-		this.removeModifiers(resourceGetter, ModifierKeyword.PRIVATE_KEYWORD);
-		this.removeModifiers(resourceSetter, ModifierKeyword.PRIVATE_KEYWORD);
-		this.addModifiers(resourceGetter, ModifierKeyword.PUBLIC_KEYWORD);
-		this.addModifiers(resourceSetter, ModifierKeyword.PUBLIC_KEYWORD);
-	}
-	
-	public void testModifyXmlSeeAlso() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		XmlSeeAlsoAnnotation annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertNull(classMapping.getXmlSeeAlso());
-		assertNull(annotation);
-		
-		classMapping.addXmlSeeAlso();
-		annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertNotNull(classMapping.getXmlSeeAlso());
-		assertNotNull(annotation);
-		
-		classMapping.removeXmlSeeAlso();
-		annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertNull(classMapping.getXmlSeeAlso());
-		assertNull(annotation);
-	}
-	
-	public void testUpdateXmlSeeAlso() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		XmlSeeAlsoAnnotation annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertNull(classMapping.getXmlSeeAlso());
-		assertNull(annotation);
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_SEE_ALSO);
-					}
-				});
-		annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertNotNull(classMapping.getXmlSeeAlso());
-		assertNotNull(annotation);
-		
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(
-						ModifiedDeclaration declaration) {
-							GenericJavaClassMappingTests.this.removeAnnotation(declaration, JAXB.XML_SEE_ALSO);
-						}
-					});
-		annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertNull(classMapping.getXmlSeeAlso());
-		assertNull(annotation);
-	}
-	
-	protected void addModifiers(JavaResourceMember resourceMember, final ModifierKeyword... modifiers) {
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMember);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.addModifiers((BodyDeclaration) declaration.getDeclaration(), modifiers);
-			}
-		});
-	}
-
-	protected void removeModifiers(JavaResourceMember resourceMember, final ModifierKeyword... modifiers) {
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMember);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.removeModifiers((BodyDeclaration) declaration.getDeclaration(), modifiers);
-			}
-		});
-	}
-
-	protected void addModifiers(BodyDeclaration bodyDeclaration, ModifierKeyword... modifiers) {
-		for (ModifierKeyword modifier : modifiers) {
-			this.modifiers(bodyDeclaration).add(bodyDeclaration.getAST().newModifier(modifier));
-		}
-	}
-
-	protected void removeModifiers(BodyDeclaration bodyDeclaration, ModifierKeyword... modifierKeywords) {
-		for (ModifierKeyword modifierKeyWord : modifierKeywords) {
-			for (Iterator<IExtendedModifier> stream = this.modifiers(bodyDeclaration).iterator(); stream.hasNext();) {
-				IExtendedModifier modifier = stream.next();
-				if (modifier.isModifier()) {
-					if (((Modifier) modifier).getKeyword() == modifierKeyWord) {
-						stream.remove();
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	protected List<IExtendedModifier> modifiers(BodyDeclaration bodyDeclaration) {
-		return bodyDeclaration.modifiers();
-	}
-
-	protected void setAccessTypeInJavaSource(JaxbClassMapping classMapping, final String accessType) {
-		JavaResourceType resourceClass = classMapping.getJaxbType().getJavaResourceType();
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceClass);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaClassMappingTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_TYPE, accessType);
-			}
-		});
-	}
-
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java
deleted file mode 100644
index e6e8f7640b..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod;
-import org.eclipse.jpt.jaxb.core.context.XmlRegistry;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementDeclAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaElementFactoryMethodTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaElementFactoryMethodTests(String name) {
-		super(name);
-	}
-
-	protected ICompilationUnit createClassWithXmlRegistryAndCreateMethods() throws Exception {
-		return this.createTestType(PACKAGE_NAME, "ObjectFactory.java", "ObjectFactory", new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_REGISTRY, JAXB.XML_ELEMENT_DECL, "javax.xml.bind.JAXBElement");
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlRegistry");
-			}
-			
-			@Override
-			public void appendGetNameMethodAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementDecl").append(CR);
-				sb.append("    JAXBElement<AnnotationTestType> createFoo(AnnotationTestType value) {return null}").append(CR);
-				sb.append(CR);
-				sb.append("    @XmlElementDecl(name=\"bar\")").append(CR);
-				sb.append("    JAXBElement createBar(Object value) {return null}").append(CR);
-				sb.append(CR);
-			}
-		});
-	}
-
-	public void testModifyElementName() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertNull(elementFactoryMethod.getQName().getName());
-
-		elementFactoryMethod.getQName().setSpecifiedName("bar");
-		XmlElementDeclAnnotation elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertEquals("bar", elementDeclAnnotation.getName());
-		assertEquals("bar", elementFactoryMethod.getQName().getName());
-
-		 //verify the xml element decl annotation is not removed when the element name is set to null
-		elementFactoryMethod.getQName().setSpecifiedName(null);
-		elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(elementDeclAnnotation.getName());
-		assertNull(elementFactoryMethod.getQName().getName());
-	}
-	
-	public void testUpdateElementName() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		assertEquals(2, xmlRegistry.getElementFactoryMethodsSize());
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertNull(elementFactoryMethod.getQName().getName());
-		
-		//add a name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.addXmlElementDeclMemberValuePair(declaration, JAXB.XML_ELEMENT_DECL__NAME, "foo");
-			}
-		});
-		assertEquals("foo", elementFactoryMethod.getQName().getName());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.removeXmlElementDeclAnnotation(declaration);
-			}
-		});
-		assertEquals(1, xmlRegistry.getElementFactoryMethodsSize());
-	}
-	
-	public void testModifyDefaultValue() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertNull(elementFactoryMethod.getDefaultValue());
-
-		elementFactoryMethod.setDefaultValue("bar");
-		XmlElementDeclAnnotation elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertEquals("bar", elementDeclAnnotation.getDefaultValue());
-		assertEquals("bar", elementFactoryMethod.getDefaultValue());
-
-		 //verify the xml element decl annotation is not removed when the element name is set to null
-		elementFactoryMethod.setDefaultValue(null);
-		elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(elementDeclAnnotation.getDefaultValue());
-		assertNull(elementFactoryMethod.getDefaultValue());
-	}
-	
-	public void testUpdateDefaultValue() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		assertEquals(2, xmlRegistry.getElementFactoryMethodsSize());
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertNull(elementFactoryMethod.getDefaultValue());
-		
-		//add a name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.addXmlElementDeclMemberValuePair(declaration, JAXB.XML_ELEMENT_DECL__DEFAULT_VALUE, "foo");
-			}
-		});
-		assertEquals("foo", elementFactoryMethod.getDefaultValue());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.removeXmlElementDeclAnnotation(declaration);
-			}
-		});
-		assertEquals(1, xmlRegistry.getElementFactoryMethodsSize());
-	}
-
-	public void testModifyScope() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertNull(elementFactoryMethod.getScope());
-		assertTrue(elementFactoryMethod.isGlobalScope());
-		
-		elementFactoryMethod.setScope("Bar");
-		XmlElementDeclAnnotation elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertEquals("Bar", elementDeclAnnotation.getScope());
-		assertEquals("Bar", elementFactoryMethod.getScope());
-		assertFalse(elementFactoryMethod.isGlobalScope());
-		
-		elementFactoryMethod.setScope(JaxbElementFactoryMethod.DEFAULT_SCOPE_CLASS_NAME);
-		elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertEquals(JaxbElementFactoryMethod.DEFAULT_SCOPE_CLASS_NAME, elementDeclAnnotation.getScope());
-		assertEquals(JaxbElementFactoryMethod.DEFAULT_SCOPE_CLASS_NAME, elementFactoryMethod.getScope());
-		assertTrue(elementFactoryMethod.isGlobalScope());
-		
-		 //verify the xml element decl annotation is not removed when the element name is set to null
-		elementFactoryMethod.setScope(null);
-		elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(elementDeclAnnotation.getScope());
-		assertNull(elementFactoryMethod.getScope());
-	}
-	
-	public void testUpdateScope() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		assertEquals(2, xmlRegistry.getElementFactoryMethodsSize());
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertNull(elementFactoryMethod.getScope());
-		assertTrue(elementFactoryMethod.isGlobalScope());
-		
-		//add a name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.addXmlElementDeclTypeMemberValuePair(declaration, JAXB.XML_ELEMENT_DECL__SCOPE, "Foo");
-			}
-		});
-		assertEquals("Foo", elementFactoryMethod.getScope());
-		assertFalse(elementFactoryMethod.isGlobalScope());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.removeXmlElementDeclAnnotation(declaration);
-			}
-		});
-		assertEquals(1, xmlRegistry.getElementFactoryMethodsSize());
-	}
-
-	public void testModifySubstitutionHeadName() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertNull(elementFactoryMethod.getSubstitutionHeadQName().getName());
-
-		elementFactoryMethod.getSubstitutionHeadQName().setSpecifiedName("bar");
-		XmlElementDeclAnnotation elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertEquals("bar", elementDeclAnnotation.getSubstitutionHeadName());
-		assertEquals("bar", elementFactoryMethod.getSubstitutionHeadQName().getName());
-
-		 //verify the xml element decl annotation is not removed when the element name is set to null
-		elementFactoryMethod.getSubstitutionHeadQName().setSpecifiedName(null);
-		elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(elementDeclAnnotation.getSubstitutionHeadName());
-		assertNull(elementFactoryMethod.getSubstitutionHeadQName().getName());
-	}
-	
-	public void testUpdateSubstitutionHeadName() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		assertEquals(2, xmlRegistry.getElementFactoryMethodsSize());
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertNull(elementFactoryMethod.getSubstitutionHeadQName().getName());
-		
-		//add a name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.addXmlElementDeclMemberValuePair(declaration, JAXB.XML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAME, "foo");
-			}
-		});
-		assertEquals("foo", elementFactoryMethod.getSubstitutionHeadQName().getName());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.removeXmlElementDeclAnnotation(declaration);
-			}
-		});
-		assertEquals(1, xmlRegistry.getElementFactoryMethodsSize());
-	}
-
-	public void testModifySubstitutionHeadNamespace() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertEquals("", elementFactoryMethod.getSubstitutionHeadQName().getNamespace());
-
-		elementFactoryMethod.getSubstitutionHeadQName().setSpecifiedNamespace("bar");
-		XmlElementDeclAnnotation elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertEquals("bar", elementDeclAnnotation.getSubstitutionHeadNamespace());
-		assertEquals("bar", elementFactoryMethod.getSubstitutionHeadQName().getNamespace());
-
-		 //verify the xml element decl annotation is not removed when the element name is set to null
-		elementFactoryMethod.getSubstitutionHeadQName().setSpecifiedNamespace(null);
-		elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(elementDeclAnnotation.getSubstitutionHeadNamespace());
-		assertEquals("", elementFactoryMethod.getSubstitutionHeadQName().getNamespace());
-	}
-	
-	public void testUpdateSubstitutionHeadNamespace() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		assertEquals(2, xmlRegistry.getElementFactoryMethodsSize());
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertEquals("", elementFactoryMethod.getSubstitutionHeadQName().getNamespace());
-		
-		//add a name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.addXmlElementDeclMemberValuePair(declaration, JAXB.XML_ELEMENT_DECL__SUBSTITUTION_HEAD_NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", elementFactoryMethod.getSubstitutionHeadQName().getNamespace());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.removeXmlElementDeclAnnotation(declaration);
-			}
-		});
-		assertEquals(1, xmlRegistry.getElementFactoryMethodsSize());
-	}
-
-	public void testModifyNamespace() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertEquals("", elementFactoryMethod.getQName().getNamespace());
-
-		elementFactoryMethod.getQName().setSpecifiedNamespace("bar");
-		XmlElementDeclAnnotation elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertEquals("bar", elementDeclAnnotation.getNamespace());
-		assertEquals("bar", elementFactoryMethod.getQName().getNamespace());
-
-		 //verify the xml element decl annotation is not removed when the element name is set to null
-		elementFactoryMethod.getQName().setSpecifiedNamespace(null);
-		elementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(elementDeclAnnotation.getNamespace());
-		assertEquals("", elementFactoryMethod.getQName().getNamespace());
-	}
-	
-	public void testUpdateNamespace() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry xmlRegistry = jaxbClass.getXmlRegistry();
-		
-		assertEquals(2, xmlRegistry.getElementFactoryMethodsSize());
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = xmlRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		JavaResourceMethod resourceMethod = elementFactoryMethod.getResourceMethod();
-		assertEquals("", elementFactoryMethod.getQName().getNamespace());
-		
-		//add a name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceMethod);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.addXmlElementDeclMemberValuePair(declaration, JAXB.XML_ELEMENT_DECL__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", elementFactoryMethod.getQName().getNamespace());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaElementFactoryMethodTests.this.removeXmlElementDeclAnnotation(declaration);
-			}
-		});
-		assertEquals(1, xmlRegistry.getElementFactoryMethodsSize());
-	}
-
-	protected void addXmlElementDeclMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlElementDeclAnnotation(declaration), name, value);
-	}
-
-	protected Annotation getXmlElementDeclAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_ELEMENT_DECL);
-	}
-
-	protected void removeXmlElementDeclAnnotation(ModifiedDeclaration declaration) {
-		this.removeAnnotation(declaration, JAXB.XML_ELEMENT_DECL);		
-	}
-
-	protected void addXmlElementDeclTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlElementDeclAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java
deleted file mode 100644
index 59b975eeec..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceEnumConstant;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbEnum;
-import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant;
-import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumValueAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaEnumConstantTests extends JaxbContextModelTestCase
-{
-	
-	public GenericJavaEnumConstantTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createEnumWithXmlEnum() throws Exception {
-		return createTestEnum(new DefaultEnumAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendEnumAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType").append(CR);
-			}
-		});
-	}
-	
-	public void testUpdateName() throws Exception {
-		createEnumWithXmlEnum();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JaxbEnumConstant contextEnumConstant = CollectionTools.get(enumMapping.getEnumConstants(), 1);
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		
-		assertEquals("MONDAY", contextEnumConstant.getName());
-		
-		
-		//add a factoryClass member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceEnum);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumConstantTests.this.changeEnumConstantName((EnumDeclaration) declaration.getDeclaration(), "MONDAY", "MONDAY2");
-			}
-		});
-		contextEnumConstant = CollectionTools.get(enumMapping.getEnumConstants(), 1);
-		assertEquals(2, enumMapping.getEnumConstantsSize());
-		assertEquals("MONDAY2", contextEnumConstant.getName());
-	}
-
-	public void testModifyValue() throws Exception {
-		createEnumWithXmlEnum();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JaxbEnumConstant contextEnumConstant = CollectionTools.get(enumMapping.getEnumConstants(), 1);
-		JavaResourceEnumConstant resourceEnumConstant = contextEnumConstant.getResourceEnumConstant();
-		
-		assertEquals("MONDAY", contextEnumConstant.getDefaultValue());
-		assertEquals("MONDAY", contextEnumConstant.getValue());
-		assertNull(contextEnumConstant.getSpecifiedValue());
-		
-		contextEnumConstant.setSpecifiedValue("foo");
-		XmlEnumValueAnnotation enumValueAnnotation = (XmlEnumValueAnnotation) resourceEnumConstant.getAnnotation(JAXB.XML_ENUM_VALUE);
-		assertEquals("foo", enumValueAnnotation.getValue());
-		assertEquals("MONDAY", contextEnumConstant.getDefaultValue());
-		assertEquals("foo", contextEnumConstant.getValue());
-		assertEquals("foo", contextEnumConstant.getSpecifiedValue());
-		
-		contextEnumConstant.setSpecifiedValue(null);
-		enumValueAnnotation = (XmlEnumValueAnnotation) resourceEnumConstant.getAnnotation(JAXB.XML_ENUM_VALUE);
-		assertNull(enumValueAnnotation.getValue());
-		assertEquals("MONDAY", contextEnumConstant.getDefaultValue());
-		assertEquals("MONDAY", contextEnumConstant.getValue());
-		assertNull(contextEnumConstant.getSpecifiedValue());
-	}
-	
-	public void testUpdateValue() throws Exception {
-		createEnumWithXmlEnum();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JaxbEnumConstant contextEnumConstant = CollectionTools.get(enumMapping.getEnumConstants(), 1);
-		JavaResourceEnumConstant resourceEnumConstant = contextEnumConstant.getResourceEnumConstant();
-		
-		assertEquals("MONDAY", contextEnumConstant.getDefaultValue());
-		assertEquals("MONDAY", contextEnumConstant.getValue());
-		assertNull(contextEnumConstant.getSpecifiedValue());
-		
-		//add an XmlEnumValue annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceEnumConstant);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation enumValueAnnotation = GenericJavaEnumConstantTests.this.addNormalAnnotation(declaration.getDeclaration(), JAXB.XML_ENUM_VALUE);
-				GenericJavaEnumConstantTests.this.addMemberValuePair(enumValueAnnotation, JAXB.XML_ENUM_VALUE__VALUE, "foo");
-			}
-		});
-
-		assertEquals("MONDAY", contextEnumConstant.getDefaultValue());
-		assertEquals("foo", contextEnumConstant.getValue());
-		assertEquals("foo", contextEnumConstant.getSpecifiedValue());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumConstantTests.this.removeAnnotation(declaration, JAXB.XML_ENUM_VALUE);
-			}
-		});
-		assertEquals("MONDAY", contextEnumConstant.getDefaultValue());
-		assertEquals("MONDAY", contextEnumConstant.getValue());
-		assertNull(contextEnumConstant.getSpecifiedValue());
-	}
-
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumMappingTests.java
deleted file mode 100644
index 9b39ca4e72..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumMappingTests.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.beans.Introspector;
-import java.util.Iterator;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jaxb.core.context.JaxbEnum;
-import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant;
-import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlTypeAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaEnumMappingTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaEnumMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	protected void addXmlTypeMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlTypeAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlTypeTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlTypeAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected void addXmlEnumTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlEnumAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected Annotation getXmlTypeAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_TYPE);
-	}
-
-	protected Annotation getXmlEnumAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_ENUM);
-	}
-
-	public void testModifySchemaTypeName() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
-		
-		assertNull(enumMapping.getQName().getSpecifiedName());
-		assertEquals(defaultXmlTypeName, enumMapping.getQName().getDefaultName());
-		assertEquals(defaultXmlTypeName, enumMapping.getQName().getName());
-		
-		enumMapping.getQName().setSpecifiedName("foo");
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getName());
-		assertEquals("foo", enumMapping.getQName().getSpecifiedName());
-		assertEquals("foo", enumMapping.getQName().getName());
-		
-		enumMapping.getQName().setSpecifiedName(null);
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getName());
-		assertNull(enumMapping.getQName().getSpecifiedName());
-		assertEquals(defaultXmlTypeName, enumMapping.getQName().getName());
-		
-		resourceEnum.removeAnnotation(JAXB.XML_TYPE);
-		
-		//set name again, this time starting with no XmlType annotation
-		enumMapping.getQName().setSpecifiedName("foo");
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getName());
-		assertEquals("foo", enumMapping.getQName().getSpecifiedName());
-		assertEquals("foo", enumMapping.getQName().getName());
-	}
-	
-	public void testUpdateSchemaTypeName() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		String defaultXmlTypeName = Introspector.decapitalize(TYPE_NAME);
-		
-		assertNull(enumMapping.getQName().getSpecifiedName());
-		assertEquals(defaultXmlTypeName, enumMapping.getQName().getDefaultName());
-		assertEquals(defaultXmlTypeName, enumMapping.getQName().getName());
-		
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceEnum);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TYPE);
-				GenericJavaEnumMappingTests.this.addXmlTypeMemberValuePair(declaration, JAXB.XML_TYPE__NAME, "foo");
-			}
-		});
-		assertEquals("foo", enumMapping.getQName().getSpecifiedName());
-		assertEquals("foo", enumMapping.getQName().getName());
-		
-		//remove the namespace member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlTypeAnnotation = (NormalAnnotation) GenericJavaEnumMappingTests.this.getXmlTypeAnnotation(declaration);
-				GenericJavaEnumMappingTests.this.values(xmlTypeAnnotation).remove(0);
-			}
-		});
-		assertNull(enumMapping.getQName().getSpecifiedName());
-		assertEquals(defaultXmlTypeName, enumMapping.getQName().getName());
-	}
-
-	public void testModifyNamespace() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		
-		assertNull(enumMapping.getQName().getSpecifiedNamespace());
-		assertEquals("", enumMapping.getQName().getDefaultNamespace());
-		assertEquals("", enumMapping.getQName().getNamespace());
-		
-		enumMapping.getQName().setSpecifiedNamespace("foo");
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getNamespace());
-		assertEquals("foo", enumMapping.getQName().getSpecifiedNamespace());
-		assertEquals("foo", enumMapping.getQName().getNamespace());
-		
-		enumMapping.getQName().setSpecifiedNamespace(null);
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getNamespace());
-		assertNull(enumMapping.getQName().getSpecifiedNamespace());
-		assertEquals("", enumMapping.getQName().getNamespace());
-		
-		resourceEnum.removeAnnotation(JAXB.XML_TYPE);
-		
-		//set namespace again, this time starting with no XmlType annotation
-		enumMapping.getQName().setSpecifiedNamespace("foo");
-		xmlTypeAnnotation = (XmlTypeAnnotation) resourceEnum.getAnnotation(JAXB.XML_TYPE);
-		assertEquals("foo", xmlTypeAnnotation.getNamespace());
-		assertEquals("foo", enumMapping.getQName().getSpecifiedNamespace());
-		assertEquals("foo", enumMapping.getQName().getNamespace());
-	}
-	
-	public void testUpdateNamespace() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		
-		assertNull(enumMapping.getQName().getSpecifiedNamespace());
-		assertEquals("", enumMapping.getQName().getDefaultNamespace());
-		assertEquals("", enumMapping.getQName().getNamespace());
-		
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceEnum);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TYPE);
-				GenericJavaEnumMappingTests.this.addXmlTypeMemberValuePair(declaration, JAXB.XML_TYPE__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", enumMapping.getQName().getSpecifiedNamespace());
-		assertEquals("foo", enumMapping.getQName().getNamespace());
-		
-		//remove the namespace member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlTypeAnnotation = (NormalAnnotation) GenericJavaEnumMappingTests.this.getXmlTypeAnnotation(declaration);
-				GenericJavaEnumMappingTests.this.values(xmlTypeAnnotation).remove(0);
-			}
-		});
-		assertNull(enumMapping.getQName().getSpecifiedNamespace());
-		assertEquals("", enumMapping.getQName().getNamespace());
-	}
-	
-	public void testModifyXmlRootElement() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		
-		assertNull(enumMapping.getXmlRootElement());
-		
-		enumMapping.addXmlRootElement().getQName().setSpecifiedName("foo");
-		XmlRootElementAnnotation xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceEnum.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertEquals("foo", xmlRootElementAnnotation.getName());
-		assertEquals("foo", enumMapping.getXmlRootElement().getQName().getName());
-		
-		enumMapping.removeXmlRootElement();
-		xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceEnum.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertNull(xmlRootElementAnnotation);
-		assertNull(enumMapping.getXmlRootElement());
-	}
-
-	public void testUpdateXmlRootElement() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		
-		assertNull(enumMapping.getXmlRootElement());
-		
-		//add a XmlRootElement annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceEnum);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation annotation = GenericJavaEnumMappingTests.this.addNormalAnnotation(declaration.getDeclaration(), JAXB.XML_ROOT_ELEMENT);
-				GenericJavaEnumMappingTests.this.addMemberValuePair(annotation, JAXB.XML_ROOT_ELEMENT__NAME, "foo");
-			}
-		});
-		assertEquals("foo", enumMapping.getXmlRootElement().getQName().getName());
-		
-		//remove the XmlRootElement annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumMappingTests.this.removeAnnotation(declaration, JAXB.XML_ROOT_ELEMENT);
-			}
-		});
-		assertNull(enumMapping.getXmlRootElement());
-	}
-
-	public void testModifyXmlEnumValue() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		
-		assertNull(enumMapping.getSpecifiedXmlEnumValue());
-		assertEquals(JaxbEnumMapping.DEFAULT_XML_ENUM_VALUE, enumMapping.getXmlEnumValue());
-		
-		enumMapping.setSpecifiedXmlEnumValue("Integer");
-		XmlEnumAnnotation xmlEnumAnnotation = (XmlEnumAnnotation) resourceEnum.getAnnotation(JAXB.XML_ENUM);
-		assertEquals("Integer", xmlEnumAnnotation.getValue());
-		assertEquals("Integer", enumMapping.getSpecifiedXmlEnumValue());
-		assertEquals("Integer", enumMapping.getXmlEnumValue());
-		
-		enumMapping.setSpecifiedXmlEnumValue(null);
-		xmlEnumAnnotation = (XmlEnumAnnotation) resourceEnum.getAnnotation(JAXB.XML_ENUM);
-		assertNull(enumMapping.getSpecifiedXmlEnumValue());
-		assertEquals(JaxbEnumMapping.DEFAULT_XML_ENUM_VALUE, enumMapping.getXmlEnumValue());
-		
-		resourceEnum.addAnnotation(JAXB.XML_TYPE);
-		resourceEnum.removeAnnotation(JAXB.XML_ENUM);
-		enumMapping = ((JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0)).getMapping();
-		assertNull(enumMapping.getSpecifiedXmlEnumValue());
-		assertEquals(JaxbEnumMapping.DEFAULT_XML_ENUM_VALUE, enumMapping.getXmlEnumValue());
-	}
-	
-	public void testUpdateXmlEnumValue() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		
-		assertNull(enumMapping.getSpecifiedXmlEnumValue());
-		assertEquals(JaxbEnumMapping.DEFAULT_XML_ENUM_VALUE, enumMapping.getXmlEnumValue());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceEnum);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaEnumMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ENUM);
-						GenericJavaEnumMappingTests.this.addXmlEnumTypeMemberValuePair(declaration, JAXB.XML_ENUM__VALUE, "String");
-					}
-				});
-		assertEquals("String", enumMapping.getSpecifiedXmlEnumValue());
-		assertEquals("String", enumMapping.getXmlEnumValue());
-		
-		//remove the factoryClass member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlEnumAnnotation = (NormalAnnotation) GenericJavaEnumMappingTests.this.getXmlEnumAnnotation(declaration);
-				GenericJavaEnumMappingTests.this.values(xmlEnumAnnotation).remove(0);
-			}
-		});
-		assertNull(enumMapping.getSpecifiedXmlEnumValue());
-		assertEquals(JaxbEnumMapping.DEFAULT_XML_ENUM_VALUE, enumMapping.getXmlEnumValue());
-	}
-
-	public void testUpdateEnumConstants() throws Exception {
-		createEnumWithXmlType();
-		
-		JaxbEnum jaxbEnum = (JaxbEnum) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbEnumMapping enumMapping = jaxbEnum.getMapping();
-		JavaResourceEnum resourceEnum = jaxbEnum.getJavaResourceType();
-		
-		assertEquals(2, enumMapping.getEnumConstantsSize());
-		Iterator<JaxbEnumConstant> enumConstants = enumMapping.getEnumConstants().iterator();
-		JaxbEnumConstant enumConstant = enumConstants.next();
-		assertEquals("SUNDAY", enumConstant.getName());
-		enumConstant = enumConstants.next();
-		assertEquals("MONDAY", enumConstant.getName());
-		assertFalse(enumConstants.hasNext());
-
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceEnum);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumMappingTests.this.addEnumConstant((EnumDeclaration) declaration.getDeclaration(), "TUESDAY");
-				GenericJavaEnumMappingTests.this.addEnumConstant((EnumDeclaration) declaration.getDeclaration(), "WEDNESDAY");
-			}
-		});
-		assertEquals(4, enumMapping.getEnumConstantsSize());
-		enumConstants = enumMapping.getEnumConstants().iterator();
-		enumConstant = enumConstants.next();
-		assertEquals("SUNDAY", enumConstant.getName());
-		enumConstant = enumConstants.next();
-		assertEquals("MONDAY", enumConstant.getName());
-		enumConstant = enumConstants.next();
-		assertEquals("TUESDAY", enumConstant.getName());
-		enumConstant = enumConstants.next();
-		assertEquals("WEDNESDAY", enumConstant.getName());
-		assertFalse(enumConstants.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumMappingTests.this.removeEnumConstant((EnumDeclaration) declaration.getDeclaration(), "SUNDAY");
-			}
-		});
-		assertEquals(3, enumMapping.getEnumConstantsSize());
-		enumConstants = enumMapping.getEnumConstants().iterator();
-		enumConstant = enumConstants.next();
-		assertEquals("MONDAY", enumConstant.getName());
-		enumConstant = enumConstants.next();
-		assertEquals("TUESDAY", enumConstant.getName());
-		enumConstant = enumConstants.next();
-		assertEquals("WEDNESDAY", enumConstant.getName());
-		assertFalse(enumConstants.hasNext());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumMappingTests.this.removeEnumConstant((EnumDeclaration) declaration.getDeclaration(), "TUESDAY");
-				GenericJavaEnumMappingTests.this.removeEnumConstant((EnumDeclaration) declaration.getDeclaration(), "MONDAY");
-			}
-		});
-		assertEquals(1, enumMapping.getEnumConstantsSize());
-		enumConstants = enumMapping.getEnumConstants().iterator();
-		enumConstant = enumConstants.next();
-		assertEquals("WEDNESDAY", enumConstant.getName());
-		assertFalse(enumConstants.hasNext());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaEnumMappingTests.this.removeEnumConstant((EnumDeclaration) declaration.getDeclaration(), "WEDNESDAY");
-			}
-		});
-		assertEquals(0, enumMapping.getEnumConstantsSize());
-		assertFalse(enumMapping.getEnumConstants().iterator().hasNext());
-	}
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java
deleted file mode 100644
index 410125c98f..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java
+++ /dev/null
@@ -1,793 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper;
-import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
-import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder;
-import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
-import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter;
-import org.eclipse.jpt.jaxb.core.context.XmlSchemaType;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorOrderAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorTypeAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
-{
-	
-	public GenericJavaPackageInfoTests(String name) {
-		super(name);
-	}
-	
-	private ICompilationUnit createPackageInfoWithAccessorType() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlAccessorType(value = XmlAccessType.PROPERTY)",
-				JAXB.XML_ACCESS_TYPE, JAXB.XML_ACCESSOR_TYPE);
-	}
-	
-	private ICompilationUnit createPackageInfoWithAccessorOrder() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlAccessorOrder(value = XmlAccessOrder.ALPHABETICAL)",
-				JAXB.XML_ACCESS_ORDER, JAXB.XML_ACCESSOR_ORDER);
-	}
-	
-	public void testModifyAccessType() throws Exception {
-		createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-	
-		assertEquals(XmlAccessType.PROPERTY, contextPackageInfo.getSpecifiedAccessType());
-		assertEquals(XmlAccessType.PROPERTY, contextPackageInfo.getAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, contextPackageInfo.getDefaultAccessType());
-		
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD);
-		XmlAccessorTypeAnnotation accessorTypeAnnotation = (XmlAccessorTypeAnnotation) resourcePackage.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.FIELD, accessorTypeAnnotation.getValue());
-		assertEquals(XmlAccessType.FIELD, contextPackageInfo.getAccessType());
-
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.PUBLIC_MEMBER);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.PUBLIC_MEMBER, accessorTypeAnnotation.getValue());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, contextPackageInfo.getAccessType());
-
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.NONE);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType.NONE, accessorTypeAnnotation.getValue());
-		assertEquals(XmlAccessType.NONE, contextPackageInfo.getAccessType());
-		
-		contextPackageInfo.setSpecifiedAccessType(null);
-		accessorTypeAnnotation = (XmlAccessorTypeAnnotation) resourcePackage.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertNull(accessorTypeAnnotation.getValue());
-		assertNull(contextPackageInfo.getSpecifiedAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, contextPackageInfo.getAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, contextPackageInfo.getDefaultAccessType());
-	}
-	
-	public void testUpdateAccessType() throws Exception {
-		createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-	
-		assertEquals(XmlAccessType.PROPERTY, contextPackageInfo.getSpecifiedAccessType());
-		assertEquals(XmlAccessType.PROPERTY, contextPackageInfo.getAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, contextPackageInfo.getDefaultAccessType());
-		
-		//set the accesser type value to FIELD
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE__FIELD);
-			}
-		});
-		assertEquals(XmlAccessType.FIELD, contextPackageInfo.getAccessType());
-
-		//set the accesser type value to PUBLIC_MEMBER
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE__PUBLIC_MEMBER);
-			}
-		});
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, contextPackageInfo.getAccessType());
-
-		//set the accesser type value to NONE
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE__NONE);
-			}
-		});
-		assertEquals(XmlAccessType.NONE, contextPackageInfo.getAccessType());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.removeXmlAccessorTypeAnnotation(declaration);
-			}
-		});
-		assertNull(contextPackageInfo.getSpecifiedAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, contextPackageInfo.getAccessType());
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, contextPackageInfo.getDefaultAccessType());
-	}
-	
-	public void testModifyAccessOrder() throws Exception {
-		createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-	
-		assertEquals(XmlAccessOrder.ALPHABETICAL, contextPackageInfo.getSpecifiedAccessOrder());
-		assertEquals(XmlAccessOrder.ALPHABETICAL, contextPackageInfo.getAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, contextPackageInfo.getDefaultAccessOrder());
-		
-		contextPackageInfo.setSpecifiedAccessOrder(XmlAccessOrder.UNDEFINED);
-		XmlAccessorOrderAnnotation accessorOrderAnnotation = (XmlAccessorOrderAnnotation) resourcePackage.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder.UNDEFINED, accessorOrderAnnotation.getValue());
-		assertEquals(XmlAccessOrder.UNDEFINED, contextPackageInfo.getAccessOrder());
-		
-		contextPackageInfo.setSpecifiedAccessOrder(null);
-		accessorOrderAnnotation = (XmlAccessorOrderAnnotation) resourcePackage.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertNull(accessorOrderAnnotation.getValue());
-		assertNull(contextPackageInfo.getSpecifiedAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, contextPackageInfo.getAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, contextPackageInfo.getDefaultAccessOrder());
-	}
-	
-	public void testUpdateAccessOrder() throws Exception {
-		createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-	
-		assertEquals(XmlAccessOrder.ALPHABETICAL, contextPackageInfo.getSpecifiedAccessOrder());
-		assertEquals(XmlAccessOrder.ALPHABETICAL, contextPackageInfo.getAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, contextPackageInfo.getDefaultAccessOrder());
-		
-		//set the access order value to UNDEFINED
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.setEnumMemberValuePair(declaration, JAXB.XML_ACCESSOR_ORDER, JAXB.XML_ACCESS_ORDER__UNDEFINED);
-			}
-		});
-		assertEquals(XmlAccessOrder.UNDEFINED, contextPackageInfo.getAccessOrder());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.removeXmlAccessorOrderAnnotation(declaration);
-			}
-		});
-		assertNull(contextPackageInfo.getSpecifiedAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, contextPackageInfo.getAccessOrder());
-		assertEquals(XmlAccessOrder.UNDEFINED, contextPackageInfo.getDefaultAccessOrder());
-	}
-
-	//add another package annotation so that the context model object doesn't get removed when 
-	//removing the XmlAccessorType annotation. Only "annotated" packages are added to the context model
-	protected void removeXmlAccessorTypeAnnotation(ModifiedDeclaration declaration) {
-		this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_SCHEMA);
-		this.removeAnnotation(declaration, JAXB.XML_ACCESSOR_TYPE);		
-	}
-
-	//add another package annotation so that the context model object doesn't get removed when 
-	//removing the XmlAccessorOrder annotation. Only "annotated" packages are added to the context model
-	protected void removeXmlAccessorOrderAnnotation(ModifiedDeclaration declaration) {
-		this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_SCHEMA);
-		this.removeAnnotation(declaration, JAXB.XML_ACCESSOR_ORDER);		
-	}
-
-	public void testGetXmlSchemaTypes() throws Exception {
-		this.createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		ListIterable<XmlSchemaType> xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		assertFalse(xmlSchemaTypes.iterator().hasNext());
-
-		//add 2 XmlSchemaTypes
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 0, "bar");
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 1, "foo");
-			}
-		});
-
-		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		ListIterator<XmlSchemaType> xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-	}
-	
-	protected void addXmlSchemaType(ModifiedDeclaration declaration, int index, String name) {
-		NormalAnnotation arrayElement = this.newXmlSchemaTypeAnnotation(declaration.getAst(), name);
-		this.addArrayElement(declaration, JAXB.XML_SCHEMA_TYPES, index, JAXB.XML_SCHEMA_TYPES__VALUE, arrayElement);		
-	}
-
-	protected NormalAnnotation newXmlSchemaTypeAnnotation(AST ast, String name) {
-		NormalAnnotation annotation = this.newNormalAnnotation(ast, JAXB.XML_SCHEMA_TYPE);
-		this.addMemberValuePair(annotation, JAXB.XML_SCHEMA_TYPE__NAME, name);
-		return annotation;
-	}
-
-	public void testGetXmlSchemaTypesSize() throws Exception {
-		this.createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertEquals(0, contextPackageInfo.getXmlSchemaTypesSize());
-
-		//add 2 XmlSchemaTypes
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 0, "bar");
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 1, "foo");
-			}
-		});
-		assertEquals(2, contextPackageInfo.getXmlSchemaTypesSize());
-	}
-
-	public void testAddXmlSchemaType() throws Exception {
-		//create a package info with an annotation other than XmlSchema to test
-		//adding things to the null schema annotation
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-		
-		contextPackageInfo.addXmlSchemaType(0).getQName().setSpecifiedName("bar");
-		contextPackageInfo.addXmlSchemaType(0).getQName().setSpecifiedName("foo");
-		contextPackageInfo.addXmlSchemaType(0).getQName().setSpecifiedName("baz");
-
-		Iterator<XmlSchemaTypeAnnotation> xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-
-		assertEquals("baz", xmlSchemaTypes.next().getName());
-		assertEquals("foo", xmlSchemaTypes.next().getName());
-		assertEquals("bar", xmlSchemaTypes.next().getName());
-		assertFalse(xmlSchemaTypes.hasNext());
-	}
-
-	protected Iterator<XmlSchemaTypeAnnotation> getSchemaTypeAnnotations(JavaResourcePackage resourcePackage) {
-		return new SubListIterableWrapper<NestableAnnotation, XmlSchemaTypeAnnotation>(resourcePackage.getAnnotations(JAXB.XML_SCHEMA_TYPE)).iterator();
-	}
-
-	public void testAddXmlSchemaType2() throws Exception {
-		//create a package info with an annotation other than XmlSchema to test
-		//adding things to the null schema annotation
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextPackageInfo.addXmlSchemaType(0).getQName().setSpecifiedName("bar");
-		contextPackageInfo.addXmlSchemaType(1).getQName().setSpecifiedName("foo");
-		contextPackageInfo.addXmlSchemaType(0).getQName().setSpecifiedName("baz");
-
-		Iterator<XmlSchemaTypeAnnotation> xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-
-		assertEquals("baz", xmlSchemaTypes.next().getName());
-		assertEquals("bar", xmlSchemaTypes.next().getName());
-		assertEquals("foo", xmlSchemaTypes.next().getName());
-		assertFalse(xmlSchemaTypes.hasNext());
-	}
-
-	public void testRemoveXmlSchemaType() throws Exception {
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextPackageInfo.addXmlSchemaType(0).getQName().setSpecifiedName("bar");
-		contextPackageInfo.addXmlSchemaType(1).getQName().setSpecifiedName("foo");
-		contextPackageInfo.addXmlSchemaType(2).getQName().setSpecifiedName("baz");
-
-		Iterator<XmlSchemaTypeAnnotation> xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-		assertEquals("bar", xmlSchemaTypes.next().getName());		
-		assertEquals("foo", xmlSchemaTypes.next().getName());		
-		assertEquals("baz", xmlSchemaTypes.next().getName());
-		assertFalse(xmlSchemaTypes.hasNext());
-
-		contextPackageInfo.removeXmlSchemaType(1);
-
-		xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-		assertEquals("bar", xmlSchemaTypes.next().getName());		
-		assertEquals("baz", xmlSchemaTypes.next().getName());
-		assertFalse(xmlSchemaTypes.hasNext());
-
-		contextPackageInfo.removeXmlSchemaType(1);
-		xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-		assertEquals("bar", xmlSchemaTypes.next().getName());
-		assertFalse(xmlSchemaTypes.hasNext());
-
-		contextPackageInfo.removeXmlSchemaType(0);
-		xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-		assertFalse(xmlSchemaTypes.hasNext());
-	}
-
-	public void testMoveXmlSchemaType() throws Exception {
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextPackageInfo.addXmlSchemaType(0).getQName().setSpecifiedName("bar");
-		contextPackageInfo.addXmlSchemaType(1).getQName().setSpecifiedName("foo");
-		contextPackageInfo.addXmlSchemaType(2).getQName().setSpecifiedName("baz");
-
-		Iterator<XmlSchemaTypeAnnotation> xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-		assertEquals("bar", xmlSchemaTypes.next().getName());		
-		assertEquals("foo", xmlSchemaTypes.next().getName());		
-		assertEquals("baz", xmlSchemaTypes.next().getName());
-		assertFalse(xmlSchemaTypes.hasNext());
-
-		contextPackageInfo.moveXmlSchemaType(2, 0);
-		xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-		assertEquals("foo", xmlSchemaTypes.next().getName());
-		assertEquals("baz", xmlSchemaTypes.next().getName());
-		assertEquals("bar", xmlSchemaTypes.next().getName());		
-		assertFalse(xmlSchemaTypes.hasNext());
-
-		contextPackageInfo.moveXmlSchemaType(0, 1);
-		xmlSchemaTypes = this.getSchemaTypeAnnotations(resourcePackage);
-		assertEquals("baz", xmlSchemaTypes.next().getName());
-		assertEquals("foo", xmlSchemaTypes.next().getName());
-		assertEquals("bar", xmlSchemaTypes.next().getName());		
-		assertFalse(xmlSchemaTypes.hasNext());
-	}
-
-	public void testSyncXmlSchemaTypes() throws Exception {
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		ListIterable<XmlSchemaType> xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		assertFalse(xmlSchemaTypes.iterator().hasNext());
-
-		//add 3 XmlSchemaTypes
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 0, "bar");
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 1, "foo");
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 2, "baz");
-			}
-		});
-
-		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		ListIterator<XmlSchemaType> xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.moveXmlSchemaType(declaration, 2, 0);
-			}
-		});
-
-		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.moveXmlSchemaType(declaration, 0, 1);
-			}
-		});
-
-		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.removeXmlSchemaType(declaration, 1);
-			}
-		});
-
-		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.removeXmlSchemaType(declaration, 1);
-			}
-		});
-
-		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.removeXmlSchemaType(declaration, 0);
-			}
-		});
-
-		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-	}
-
-	public void testSyncAddXmlSchemaTypes() throws Exception {
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		ListIterable<XmlSchemaType> xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		assertFalse(xmlSchemaTypes.iterator().hasNext());
-
-		//add 1 XmlSchemaType when none exist
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 0, "bar");
-			}
-		});
-
-		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		ListIterator<XmlSchemaType> xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-
-
-		//add 1 XmlSchemaType when 1 standalone exists
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 1, "foo");
-			}
-		});
-
-		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-
-		//add 1 XmlSchemaType when a container annotations exists
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 2, "baz");
-			}
-		});
-
-		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-
-		//add 1 XmlSchemaType to beginning of list when a container annotations exists
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlSchemaType(declaration, 0, "foobaz");
-			}
-		});
-
-		xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
-		xmlSchemaTypesIterator = xmlSchemaTypes.iterator();
-		assertTrue(xmlSchemaTypesIterator.hasNext());
-		assertEquals("foobaz", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("bar", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("foo", xmlSchemaTypesIterator.next().getQName().getName());
-		assertEquals("baz", xmlSchemaTypesIterator.next().getQName().getName());
-		assertFalse(xmlSchemaTypesIterator.hasNext());
-	}
-
-	protected void moveXmlSchemaType(ModifiedDeclaration declaration, int targetIndex, int sourceIndex) {
-		this.moveArrayElement((NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_SCHEMA_TYPES), JAXB.XML_SCHEMA_TYPES__VALUE, targetIndex, sourceIndex);
-	}
-
-	protected void removeXmlSchemaType(ModifiedDeclaration declaration, int index) {
-		this.removeArrayElement((NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_SCHEMA_TYPES), JAXB.XML_SCHEMA_TYPES__VALUE, index);
-	}
-	
-	
-	public void testGetXmlJavaTypeAdapters() throws Exception {
-		this.createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		ListIterable<XmlJavaTypeAdapter> xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		assertFalse(xmlJavaTypeAdapters.iterator().hasNext());
-
-		//add 2 XmlJavaTypeAdapters
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlJavaTypeAdapter(declaration, 0, "String");
-				GenericJavaPackageInfoTests.this.addXmlJavaTypeAdapter(declaration, 1, "Integer");
-			}
-		});
-
-		xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		ListIterator<XmlJavaTypeAdapter> xmlJavaTypeAdaptersIterator = xmlJavaTypeAdapters.iterator();
-		assertTrue(xmlJavaTypeAdaptersIterator.hasNext());
-		assertEquals("String", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertEquals("Integer", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertFalse(xmlJavaTypeAdaptersIterator.hasNext());
-	}
-	
-	protected void addXmlJavaTypeAdapter(ModifiedDeclaration declaration, int index, String name) {
-		NormalAnnotation arrayElement = this.newXmlJavaTypeAdapterAnnotation(declaration.getAst(), name);
-		this.addArrayElement(declaration, JAXB.XML_JAVA_TYPE_ADAPTERS, index, JAXB.XML_JAVA_TYPE_ADAPTERS__VALUE, arrayElement);		
-	}
-
-	protected NormalAnnotation newXmlJavaTypeAdapterAnnotation(AST ast, String valueTypeName) {
-		NormalAnnotation annotation = this.newNormalAnnotation(ast, JAXB.XML_JAVA_TYPE_ADAPTER);
-		this.addMemberValuePair(
-			annotation,
-			JAXB.XML_JAVA_TYPE_ADAPTER__VALUE, 
-			this.newTypeLiteral(ast, valueTypeName));
-		return annotation;
-	}
-
-	public void testGetXmlJavaTypeAdaptersSize() throws Exception {
-		this.createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertEquals(0, contextPackageInfo.getXmlJavaTypeAdaptersSize());
-
-		//add 2 XmlJavaTypeAdapters
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlJavaTypeAdapter(declaration, 0, "String");
-				GenericJavaPackageInfoTests.this.addXmlJavaTypeAdapter(declaration, 1, "Integer");
-			}
-		});
-		assertEquals(2, contextPackageInfo.getXmlJavaTypeAdaptersSize());
-	}
-
-	public void testAddXmlJavaTypeAdapter() throws Exception {
-		//create a package info with an annotation other than XmlSchema to test
-		//adding things to the null schema annotation
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("bar");
-		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("foo");
-		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("baz");
-
-		Iterator<XmlJavaTypeAdapterAnnotation> xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-
-		assertEquals("baz", xmlJavaTypeAdapters.next().getValue());
-		assertEquals("foo", xmlJavaTypeAdapters.next().getValue());
-		assertEquals("bar", xmlJavaTypeAdapters.next().getValue());
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-	}
-
-	protected Iterator<XmlJavaTypeAdapterAnnotation> getXmlJavaTypeAdapterAnnotations(JavaResourcePackage resourcePackage) {
-		return new SubListIterableWrapper<NestableAnnotation, XmlJavaTypeAdapterAnnotation>(resourcePackage.getAnnotations(JAXB.XML_JAVA_TYPE_ADAPTER)).iterator();
-	}
-
-	public void testAddXmlJavaTypeAdapter2() throws Exception {
-		//create a package info with an annotation other than XmlSchema to test
-		//adding things to the null schema annotation
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("bar");
-		contextPackageInfo.addXmlJavaTypeAdapter(1).setValue("foo");
-		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("baz");
-
-		Iterator<XmlJavaTypeAdapterAnnotation> xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-
-		assertEquals("baz", xmlJavaTypeAdapters.next().getValue());
-		assertEquals("bar", xmlJavaTypeAdapters.next().getValue());
-		assertEquals("foo", xmlJavaTypeAdapters.next().getValue());
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-	}
-
-	public void testRemoveXmlJavaTypeAdapter() throws Exception {
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("String");
-		contextPackageInfo.addXmlJavaTypeAdapter(1).setValue("foo");
-		contextPackageInfo.addXmlJavaTypeAdapter(2).setValue("baz");
-
-		Iterator<XmlJavaTypeAdapterAnnotation> xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-		XmlJavaTypeAdapterAnnotation adapterAnnotation = xmlJavaTypeAdapters.next();
-		assertEquals("String", adapterAnnotation.getValue());		
-		assertEquals("java.lang.String", adapterAnnotation.getFullyQualifiedValue());		
-		assertEquals("foo", xmlJavaTypeAdapters.next().getValue());		
-		assertEquals("baz", xmlJavaTypeAdapters.next().getValue());
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-
-		contextPackageInfo.removeXmlJavaTypeAdapter(1);
-
-		xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-		adapterAnnotation = xmlJavaTypeAdapters.next();
-		assertEquals("String", adapterAnnotation.getValue());		
-		assertEquals("java.lang.String", adapterAnnotation.getFullyQualifiedValue());		
-		assertEquals("baz", xmlJavaTypeAdapters.next().getValue());
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-
-		contextPackageInfo.removeXmlJavaTypeAdapter(1);
-		xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-		adapterAnnotation = xmlJavaTypeAdapters.next();
-		assertEquals("String", adapterAnnotation.getValue());		
-		assertEquals("java.lang.String", adapterAnnotation.getFullyQualifiedValue());		
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-
-		contextPackageInfo.removeXmlJavaTypeAdapter(0);
-		xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-	}
-
-	public void testMoveXmlJavaTypeAdapter() throws Exception {
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("bar");
-		contextPackageInfo.addXmlJavaTypeAdapter(1).setValue("foo");
-		contextPackageInfo.addXmlJavaTypeAdapter(2).setValue("baz");
-
-		Iterator<XmlJavaTypeAdapterAnnotation> xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-		assertEquals("bar", xmlJavaTypeAdapters.next().getValue());		
-		assertEquals("foo", xmlJavaTypeAdapters.next().getValue());		
-		assertEquals("baz", xmlJavaTypeAdapters.next().getValue());
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-
-		contextPackageInfo.moveXmlJavaTypeAdapter(2, 0);
-		xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-		assertEquals("foo", xmlJavaTypeAdapters.next().getValue());
-		assertEquals("baz", xmlJavaTypeAdapters.next().getValue());
-		assertEquals("bar", xmlJavaTypeAdapters.next().getValue());		
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-
-		contextPackageInfo.moveXmlJavaTypeAdapter(0, 1);
-		xmlJavaTypeAdapters = this.getXmlJavaTypeAdapterAnnotations(resourcePackage);
-		assertEquals("baz", xmlJavaTypeAdapters.next().getValue());
-		assertEquals("foo", xmlJavaTypeAdapters.next().getValue());
-		assertEquals("bar", xmlJavaTypeAdapters.next().getValue());		
-		assertFalse(xmlJavaTypeAdapters.hasNext());
-	}
-
-	public void testSyncXmlJavaTypeAdapters() throws Exception {
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		ListIterable<XmlJavaTypeAdapter> xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		assertFalse(xmlJavaTypeAdapters.iterator().hasNext());
-
-		//add 3 XmlJavaTypeAdapters
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.addXmlJavaTypeAdapter(declaration, 0, "bar");
-				GenericJavaPackageInfoTests.this.addXmlJavaTypeAdapter(declaration, 1, "foo");
-				GenericJavaPackageInfoTests.this.addXmlJavaTypeAdapter(declaration, 2, "baz");
-			}
-		});
-
-		xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		ListIterator<XmlJavaTypeAdapter> xmlJavaTypeAdaptersIterator = xmlJavaTypeAdapters.iterator();
-		assertTrue(xmlJavaTypeAdaptersIterator.hasNext());
-		assertEquals("bar", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertEquals("foo", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertEquals("baz", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertFalse(xmlJavaTypeAdaptersIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.moveXmlJavaTypeAdapter(declaration, 2, 0);
-			}
-		});
-
-		xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		xmlJavaTypeAdaptersIterator = xmlJavaTypeAdapters.iterator();
-		assertTrue(xmlJavaTypeAdaptersIterator.hasNext());
-		assertEquals("foo", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertEquals("baz", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertEquals("bar", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertFalse(xmlJavaTypeAdaptersIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.moveXmlJavaTypeAdapter(declaration, 0, 1);
-			}
-		});
-
-		xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		xmlJavaTypeAdaptersIterator = xmlJavaTypeAdapters.iterator();
-		assertTrue(xmlJavaTypeAdaptersIterator.hasNext());
-		assertEquals("baz", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertEquals("foo", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertEquals("bar", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertFalse(xmlJavaTypeAdaptersIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.removeXmlJavaTypeAdapter(declaration, 1);
-			}
-		});
-
-		xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		xmlJavaTypeAdaptersIterator = xmlJavaTypeAdapters.iterator();
-		assertTrue(xmlJavaTypeAdaptersIterator.hasNext());
-		assertEquals("baz", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertEquals("bar", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertFalse(xmlJavaTypeAdaptersIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.removeXmlJavaTypeAdapter(declaration, 1);
-			}
-		});
-
-		xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		xmlJavaTypeAdaptersIterator = xmlJavaTypeAdapters.iterator();
-		assertTrue(xmlJavaTypeAdaptersIterator.hasNext());
-		assertEquals("baz", xmlJavaTypeAdaptersIterator.next().getValue());
-		assertFalse(xmlJavaTypeAdaptersIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageInfoTests.this.removeXmlJavaTypeAdapter(declaration, 0);
-			}
-		});
-
-		xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
-		xmlJavaTypeAdaptersIterator = xmlJavaTypeAdapters.iterator();
-		assertFalse(xmlJavaTypeAdaptersIterator.hasNext());
-	}
-
-
-	protected void moveXmlJavaTypeAdapter(ModifiedDeclaration declaration, int targetIndex, int sourceIndex) {
-		this.moveArrayElement((NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_JAVA_TYPE_ADAPTERS), JAXB.XML_JAVA_TYPE_ADAPTERS__VALUE, targetIndex, sourceIndex);
-	}
-
-	protected void removeXmlJavaTypeAdapter(ModifiedDeclaration declaration, int index) {
-		this.removeArrayElement((NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_JAVA_TYPE_ADAPTERS), JAXB.XML_JAVA_TYPE_ADAPTERS__VALUE, index);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageXmlJavaTypeAdapterTests.java
deleted file mode 100644
index 0d45116955..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageXmlJavaTypeAdapterTests.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
-import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaPackageXmlJavaTypeAdapterTests extends JaxbContextModelTestCase
-{
-
-	public GenericJavaPackageXmlJavaTypeAdapterTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createPackageInfoWithXmlJavaTypeAdapter() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlJavaTypeAdapter",
-				JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-
-
-	public void testModifyValue() throws Exception {
-		this.createPackageInfoWithXmlJavaTypeAdapter();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-
-		contextXmlJavaTypeAdapter.setValue("foo");
-		XmlJavaTypeAdapterAnnotation javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals("foo", javaTypeAdapterAnnotation.getValue());
-		assertEquals("foo", contextXmlJavaTypeAdapter.getValue());
-
-		 //verify the xml schema type annotation is not removed when the value is set to null
-		contextXmlJavaTypeAdapter.setValue(null);
-		javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(javaTypeAdapterAnnotation.getValue());
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-	}
-
-	public void testUpdateValue() throws Exception {
-		this.createPackageInfoWithXmlJavaTypeAdapter();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-
-		//add a value member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageXmlJavaTypeAdapterTests.this.addXmlJavaTypeAdapterTypeMemberValuePair(declaration, JAXB.XML_JAVA_TYPE_ADAPTER__VALUE, "String");
-			}
-		});
-		assertEquals("String", contextXmlJavaTypeAdapter.getValue());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageXmlJavaTypeAdapterTests.this.removeXmlJavaTypeAdapterAnnotation(declaration);
-			}
-		});
-		assertFalse(contextPackageInfo.getXmlJavaTypeAdapters().iterator().hasNext());
-	}
-
-	public void testModifyType() throws Exception {
-		this.createPackageInfoWithXmlJavaTypeAdapter();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertNull(contextXmlJavaTypeAdapter.getDefaultType());
-
-		contextXmlJavaTypeAdapter.setSpecifiedType("foo");
-		XmlJavaTypeAdapterAnnotation javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals("foo", javaTypeAdapterAnnotation.getType());
-		assertEquals("foo", contextXmlJavaTypeAdapter.getType());
-
-		 //verify the xml schema type annotation is not removed when the type is set to null
-		contextXmlJavaTypeAdapter.setSpecifiedType(null);
-		javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(javaTypeAdapterAnnotation.getType());
-		assertNull(contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertNull(contextXmlJavaTypeAdapter.getDefaultType());
-	}
-
-	public void testUpdateType() throws Exception {
-		this.createPackageInfoWithXmlJavaTypeAdapter();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertNull(contextXmlJavaTypeAdapter.getDefaultType());
-
-		//add a type member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageXmlJavaTypeAdapterTests.this.addXmlJavaTypeAdapterTypeMemberValuePair(declaration, JAXB.XML_JAVA_TYPE_ADAPTER__TYPE, "String");
-			}
-		});
-		assertEquals("String", contextXmlJavaTypeAdapter.getType());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaPackageXmlJavaTypeAdapterTests.this.removeXmlJavaTypeAdapterAnnotation(declaration);
-			}
-		});
-		assertFalse(contextPackageInfo.getXmlJavaTypeAdapters().iterator().hasNext());
-	}
-
-	protected void addXmlJavaTypeAdapterTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlJavaTypeAdapterAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected void addXmlJavaTypeAdapterMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlJavaTypeAdapterAnnotation(declaration), name, value);
-	}
-
-	//add another package annotation so that the context model object doesn't get removed when 
-	//removing the XmlJavaTypeAdapter annotation. Only "annotated" packages are added to the context model
-	protected void removeXmlJavaTypeAdapterAnnotation(ModifiedDeclaration declaration) {
-		this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ACCESSOR_ORDER);
-		this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);		
-	}
-
-	protected Annotation getXmlJavaTypeAdapterAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java
deleted file mode 100644
index 13bf4b00f7..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-public class GenericJavaPersistentAttributeTests
-		extends JaxbContextModelTestCase {
-	
-	private static String TEST_CLASS_NAME = "TestClass";
-	
-	public GenericJavaPersistentAttributeTests(String name) {
-		super(name);
-	}
-	
-	
-	private void createXmlTypeWithVariousAttributes() throws CoreException {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("import ").append(JAXB.XML_TYPE).append(";").append(CR);
-				sb.append("import java.util.List;").append(CR);
-				sb.append(CR);
-				sb.append("@XmlType").append(CR);
-				sb.append("public class ").append(TEST_CLASS_NAME).append("<T extends Number> ").append("{").append(CR);
-				sb.append("    public String string;").append(CR);
-				sb.append("    public List<String> stringList;").append(CR);
-				sb.append("    public String[] stringArray;").append(CR);
-				sb.append("    public String[][] stringDoubleArray;").append(CR);
-				sb.append("    public T generic;").append(CR);
-				sb.append("    public List<T> genericList;").append(CR);
-				sb.append("    public T[] genericArray;").append(CR);
-				sb.append("    public List<?> wildcardList;").append(CR);
-				sb.append("    public byte[] byteArray;").append(CR);
-				sb.append("    public List list;").append(CR);
-				sb.append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, TEST_CLASS_NAME + ".java", sourceWriter);
-	}
-	
-	
-	public void testJavaResourceType() throws Exception {
-		createXmlTypeWithVariousAttributes();
-		JaxbClassMapping classMapping = ((JaxbClass) getContextRoot().getType(PACKAGE_NAME_ + TEST_CLASS_NAME)).getMapping();
-		
-		// String string
-		JaxbPersistentAttribute att = CollectionTools.get(classMapping.getAttributes(), 0);
-		assertEquals("java.lang.String", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(false, att.isJavaResourceAttributeCollectionType());
-		
-		// List<String> stringList
-		att = CollectionTools.get(classMapping.getAttributes(), 1);
-		assertEquals("java.lang.String", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(true, att.isJavaResourceAttributeCollectionType());
-		
-		// String[] stringArray
-		att = CollectionTools.get(classMapping.getAttributes(), 2);
-		assertEquals("java.lang.String", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(true, att.isJavaResourceAttributeCollectionType());
-		
-		// String[][] stringDoubleArray
-		att = CollectionTools.get(classMapping.getAttributes(), 3);
-		assertEquals("java.lang.String[][]", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(false, att.isJavaResourceAttributeCollectionType());
-		
-		// T generic
-		att = CollectionTools.get(classMapping.getAttributes(), 4);
-		assertEquals("java.lang.Number", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(false, att.isJavaResourceAttributeCollectionType());
-		
-		// List<T> genericList
-		att = CollectionTools.get(classMapping.getAttributes(), 5);
-		assertEquals("java.lang.Number", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(true, att.isJavaResourceAttributeCollectionType());
-		
-		// T[] genericArray
-		att = CollectionTools.get(classMapping.getAttributes(), 6);
-		assertEquals("java.lang.Number", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(true, att.isJavaResourceAttributeCollectionType());
-		
-		// List<?> wildcardList
-		att = CollectionTools.get(classMapping.getAttributes(), 7);
-		assertEquals("java.lang.Object", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(true, att.isJavaResourceAttributeCollectionType());
-		
-		// byte[] byteArray
-		att = CollectionTools.get(classMapping.getAttributes(), 8);
-		assertEquals("byte[]", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(false, att.isJavaResourceAttributeCollectionType());
-		
-		// List list
-		att = CollectionTools.get(classMapping.getAttributes(), 9);
-		assertEquals("java.lang.Object", att.getJavaResourceAttributeBaseTypeName());
-		assertEquals(true, att.isJavaResourceAttributeCollectionType());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java
deleted file mode 100644
index b01ba097ef..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Block;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod;
-import org.eclipse.jpt.jaxb.core.context.XmlRegistry;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaRegistryTests extends JaxbContextModelTestCase
-{
-	
-	public GenericJavaRegistryTests(String name) {
-		super(name);
-	}
-	
-	protected ICompilationUnit createClassWithXmlRegistryAndCreateMethods() throws Exception {
-		return this.createTestType(PACKAGE_NAME, "ObjectFactory.java", "ObjectFactory", new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_REGISTRY, JAXB.XML_ELEMENT_DECL, "javax.xml.bind.JAXBElement");
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlRegistry");
-			}
-			
-			@Override
-			public void appendGetNameMethodAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementDecl(name=\"foo\")").append(CR);
-				sb.append("    JAXBElement<AnnotationTestType> createFoo(AnnotationTestType value) {return null}").append(CR);
-				sb.append(CR);
-				sb.append("    @XmlElementDecl(name=\"bar\")").append(CR);
-				sb.append("    JAXBElement createBar(Object value) {return null}").append(CR);
-				sb.append(CR);
-			}
-		});
-	}
-	
-	
-	protected void addElementFactoryMethod(TypeDeclaration typeDeclaration, String methodName) {
-		AST ast = typeDeclaration.getAST();
-		MethodDeclaration methodDeclaration = this.newMethodDeclaration(ast, methodName);
-		Block body = ast.newBlock();
-		methodDeclaration.setBody(body);
-		methodDeclaration.setReturnType2(ast.newSimpleType(ast.newName("JAXBElement")));
-		SingleVariableDeclaration parameter = ast.newSingleVariableDeclaration();
-		parameter.setName(ast.newSimpleName("value"));
-		parameter.setType(ast.newSimpleType(ast.newName("Object")));
-		parameters(methodDeclaration).add(parameter);
-		NormalAnnotation elementDeclAnnotation = this.newNormalAnnotation(ast, "XmlElementDecl");
-		modifiers(methodDeclaration).add(elementDeclAnnotation);
-		this.bodyDeclarations(typeDeclaration).add(methodDeclaration);
-	}
-
-	protected MethodDeclaration newMethodDeclaration(AST ast, String methodName) {
-		MethodDeclaration methodDeclaration = ast.newMethodDeclaration();
-		methodDeclaration.setName(ast.newSimpleName(methodName));
-		return methodDeclaration;
-	}
-
-	/**
-	 * minimize the scope of the suppressed warnings
-	 */
-	@SuppressWarnings("unchecked")
-	protected List<BodyDeclaration> bodyDeclarations(TypeDeclaration td) {
-		return td.bodyDeclarations();
-	}
-
-	@SuppressWarnings("unchecked")
-	protected List<SingleVariableDeclaration> parameters(MethodDeclaration md) {
-		return md.parameters();
-	}
-
-	@SuppressWarnings("unchecked")
-	protected List<IExtendedModifier> modifiers(MethodDeclaration md) {
-		return md.modifiers();
-	}
-
-	protected void removeMethodDeclaration(TypeDeclaration typeDeclaration, String methodName) {
-		for (MethodDeclaration md : typeDeclaration.getMethods()) {
-			if (md.getName().getFullyQualifiedName().equals(methodName)) {
-				this.bodyDeclarations(typeDeclaration).remove(md);
-				break;
-			}
-		}
-	}
-
-	public void testUpdateElementFactoryMethods() throws Exception {
-		createClassWithXmlType();
-		createClassWithXmlRegistryAndCreateMethods();
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType("test.ObjectFactory");
-		XmlRegistry contextRegistry = jaxbClass.getXmlRegistry();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertEquals(2, contextRegistry.getElementFactoryMethodsSize());
-		Iterator<JaxbElementFactoryMethod> elementFactoryMethods = contextRegistry.getElementFactoryMethods().iterator();
-		JaxbElementFactoryMethod elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createFoo", elementFactoryMethod.getName());
-		assertEquals("foo", elementFactoryMethod.getQName().getName());
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createBar", elementFactoryMethod.getName());
-		assertEquals("bar", elementFactoryMethod.getQName().getName());
-		assertFalse(elementFactoryMethods.hasNext());
-
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaRegistryTests.this.addElementFactoryMethod((TypeDeclaration) declaration.getDeclaration(), "createFoo2");
-				GenericJavaRegistryTests.this.addElementFactoryMethod((TypeDeclaration) declaration.getDeclaration(), "createBar2");
-			}
-		});
-		assertEquals(4, contextRegistry.getElementFactoryMethodsSize());
-		elementFactoryMethods = contextRegistry.getElementFactoryMethods().iterator();
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createFoo", elementFactoryMethod.getName());
-		assertEquals("foo", elementFactoryMethod.getQName().getName());
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createBar", elementFactoryMethod.getName());
-		assertEquals("bar", elementFactoryMethod.getQName().getName());
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createFoo2", elementFactoryMethod.getName());
-		assertEquals(null, elementFactoryMethod.getQName().getName());
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createBar2", elementFactoryMethod.getName());
-		assertEquals(null, elementFactoryMethod.getQName().getName());
-		assertFalse(elementFactoryMethods.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaRegistryTests.this.removeMethodDeclaration((TypeDeclaration) declaration.getDeclaration(), "createFoo");
-			}
-		});
-		assertEquals(3, contextRegistry.getElementFactoryMethodsSize());
-		elementFactoryMethods = contextRegistry.getElementFactoryMethods().iterator();
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createBar", elementFactoryMethod.getName());
-		assertEquals("bar", elementFactoryMethod.getQName().getName());
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createFoo2", elementFactoryMethod.getName());
-		assertEquals(null, elementFactoryMethod.getQName().getName());
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createBar2", elementFactoryMethod.getName());
-		assertEquals(null, elementFactoryMethod.getQName().getName());
-		assertFalse(elementFactoryMethods.hasNext());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaRegistryTests.this.removeMethodDeclaration((TypeDeclaration) declaration.getDeclaration(), "createFoo2");
-				GenericJavaRegistryTests.this.removeMethodDeclaration((TypeDeclaration) declaration.getDeclaration(), "createBar2");
-			}
-		});
-		assertEquals(1, contextRegistry.getElementFactoryMethodsSize());
-		elementFactoryMethods = contextRegistry.getElementFactoryMethods().iterator();
-		elementFactoryMethod = elementFactoryMethods.next();
-		assertEquals("createBar", elementFactoryMethod.getName());
-		assertEquals("bar", elementFactoryMethod.getQName().getName());
-		assertFalse(elementFactoryMethods.hasNext());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaRegistryTests.this.removeMethodDeclaration((TypeDeclaration) declaration.getDeclaration(), "createBar");
-			}
-		});
-		assertEquals(0, contextRegistry.getElementFactoryMethodsSize());
-		assertFalse(contextRegistry.getElementFactoryMethods().iterator().hasNext());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java
deleted file mode 100644
index 6df5f7d855..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaTypeXmlJavaTypeAdapterTests extends JaxbContextModelTestCase
-{
-
-	public GenericJavaTypeXmlJavaTypeAdapterTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTypeWithXmlJavaTypeAdapter() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJavaTypeAdapter");
-			}
-		});
-	}
-
-	public void testModifyValue() throws Exception {
-		createTypeWithXmlJavaTypeAdapter();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = jaxbClass.getXmlJavaTypeAdapter();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-
-		contextXmlJavaTypeAdapter.setValue("foo");
-		XmlJavaTypeAdapterAnnotation javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals("foo", javaTypeAdapterAnnotation.getValue());
-		assertEquals("foo", contextXmlJavaTypeAdapter.getValue());
-
-		 //verify the xml schema type annotation is not removed when the value is set to null
-		contextXmlJavaTypeAdapter.setValue(null);
-		javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(javaTypeAdapterAnnotation.getValue());
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-	}
-
-	public void testUpdateValue() throws Exception {
-		createTypeWithXmlJavaTypeAdapter();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = jaxbClass.getXmlJavaTypeAdapter();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(contextXmlJavaTypeAdapter.getValue());
-
-		//add a value member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaTypeXmlJavaTypeAdapterTests.this.addXmlJavaTypeAdapterTypeMemberValuePair(declaration, JAXB.XML_JAVA_TYPE_ADAPTER__VALUE, "String");
-			}
-		});
-		assertEquals("String", contextXmlJavaTypeAdapter.getValue());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaTypeXmlJavaTypeAdapterTests.this.removeXmlJavaTypeAdapterAnnotation(declaration);
-			}
-		});
-		assertNull(jaxbClass.getXmlJavaTypeAdapter());
-	}
-	
-	public void testModifyType() throws Exception {
-		createTypeWithXmlJavaTypeAdapter();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = jaxbClass.getXmlJavaTypeAdapter();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-
-		assertEquals(FULLY_QUALIFIED_TYPE_NAME, contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals(FULLY_QUALIFIED_TYPE_NAME, contextXmlJavaTypeAdapter.getDefaultType());
-
-		contextXmlJavaTypeAdapter.setSpecifiedType("foo");
-		XmlJavaTypeAdapterAnnotation javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals("foo", javaTypeAdapterAnnotation.getType());
-		assertEquals("foo", contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals(FULLY_QUALIFIED_TYPE_NAME, contextXmlJavaTypeAdapter.getDefaultType());
-
-		contextXmlJavaTypeAdapter.setSpecifiedType(null);
-		javaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(javaTypeAdapterAnnotation.getType());
-		assertEquals(FULLY_QUALIFIED_TYPE_NAME, contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals(FULLY_QUALIFIED_TYPE_NAME, contextXmlJavaTypeAdapter.getDefaultType());
-	}
-
-	public void testUpdateType() throws Exception {
-		createTypeWithXmlJavaTypeAdapter();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = jaxbClass.getXmlJavaTypeAdapter();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-
-		assertEquals(FULLY_QUALIFIED_TYPE_NAME, contextXmlJavaTypeAdapter.getType());
-		assertNull(contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals(FULLY_QUALIFIED_TYPE_NAME, contextXmlJavaTypeAdapter.getDefaultType());
-
-		//add a type member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaTypeXmlJavaTypeAdapterTests.this.addXmlJavaTypeAdapterTypeMemberValuePair(declaration, JAXB.XML_JAVA_TYPE_ADAPTER__TYPE, "String");
-			}
-		});
-		assertEquals("String", contextXmlJavaTypeAdapter.getSpecifiedType());
-		assertEquals("String", contextXmlJavaTypeAdapter.getType());
-		assertEquals(FULLY_QUALIFIED_TYPE_NAME, contextXmlJavaTypeAdapter.getDefaultType());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaTypeXmlJavaTypeAdapterTests.this.removeXmlJavaTypeAdapterAnnotation(declaration);
-			}
-		});
-		assertNull(jaxbClass.getXmlJavaTypeAdapter());
-	}
-
-	protected void addXmlJavaTypeAdapterTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlJavaTypeAdapterAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected void addXmlJavaTypeAdapterMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlJavaTypeAdapterAnnotation(declaration), name, value);
-	}
-
-	//add another package annotation so that the context model object doesn't get removed when 
-	//removing the XmlJavaTypeAdapter annotation. Only "annotated" packages are added to the context model
-	protected void removeXmlJavaTypeAdapterAnnotation(ModifiedDeclaration declaration) {
-		this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ACCESSOR_ORDER);
-		this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);		
-	}
-
-	protected Annotation getXmlJavaTypeAdapterAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java
deleted file mode 100644
index 8e79e10763..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAdapter;
-import org.eclipse.jpt.jaxb.core.context.XmlElementMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-public class GenericJavaXmlAdapterTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaXmlAdapterTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createXmlType() throws Exception {
-		return this.createTestType(
-				new DefaultAnnotationWriter() {
-					@Override
-					public Iterator<String> imports() {
-						return new ArrayIterator<String>(JAXB.XML_TYPE);
-					}
-					
-					@Override
-					public void appendTypeAnnotationTo(StringBuilder sb) {
-						sb.append("@XmlType");
-					}
-				});
-	}
-	
-	private void createObjObjXmlAdapter() throws CoreException {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("import " + JAXB.XML_ADAPTER + ";").append(CR);
-				sb.append(CR);
-				sb.append("public class ObjObjAdapter extends XmlAdapter<Object, Object> {").append(CR);
-				sb.append("    public Object marshal(Object obj) { return null; }").append(CR);
-				sb.append("    public Object unmarshal(Object obj) { return null; }").append(CR);
-				sb.append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "ObjObjAdapter.java", sourceWriter);
-	}
-	
-	private void createMapCalendarXmlAdapter() throws CoreException {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("import " + JAXB.XML_ADAPTER + ";").append(CR);
-				sb.append("import java.util.Map;").append(CR);
-				sb.append("import java.util.GregorianCalendar;").append(CR);
-				sb.append(CR);
-				sb.append("public class MapCalendarAdapter extends XmlAdapter<GregorianCalendar, Map<String, String>> {").append(CR);
-				sb.append("    public GregorianCalendar marshal(Map<String, String> obj) { return null; }").append(CR);
-				sb.append("    public GregorianCalendar marshal(Object obj) { return null; }").append(CR);
-				sb.append("    public Map<String, String> unmarshal(Gregorian Calendar obj) { return null; }").append(CR);
-				sb.append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "MapCalendarAdapter.java", sourceWriter);
-	}
-	
-	
-	public void testBoundAndValueTypes() throws Exception {
-		createXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping attributeMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		
-		XmlJavaTypeAdapter xmlJavaTypeAdapter = attributeMapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapter.setValue("test.ObjObjAdapter");
-		
-		assertEquals("test.ObjObjAdapter", xmlJavaTypeAdapter.getValue());
-		assertEquals("test.ObjObjAdapter", xmlJavaTypeAdapter.getFullyQualifiedValue());
-		assertNull(xmlJavaTypeAdapter.getXmlAdapter());
-		
-		createObjObjXmlAdapter();
-		XmlAdapter xmlAdapter = xmlJavaTypeAdapter.getXmlAdapter();
-		assertNotNull(xmlAdapter);
-		assertEquals("java.lang.Object", xmlAdapter.getBoundType());
-		assertEquals("java.lang.Object", xmlAdapter.getValueType());
-		
-		createMapCalendarXmlAdapter();
-		xmlJavaTypeAdapter.setValue("test.MapCalendarAdapter");
-		xmlAdapter = xmlJavaTypeAdapter.getXmlAdapter();
-		assertNotNull(xmlAdapter);
-		assertEquals("java.util.Map", xmlAdapter.getBoundType());
-		assertEquals("java.util.GregorianCalendar", xmlAdapter.getValueType());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java
deleted file mode 100644
index e82e700eb3..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAnyAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaXmlAnyAttributeMappingTests extends JaxbContextModelTestCase
-{
-
-	public GenericJavaXmlAnyAttributeMappingTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTypeWithXmlAnyAttribute() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ANY_ATTRIBUTE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAnyAttribute");
-			}
-		});
-	}
-
-	public void testChangeMappingType() throws Exception {
-		createTypeWithXmlAnyAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyAttributeMapping attributeMapping = (XmlAnyAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNotNull(attributeMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ATTRIBUTE));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlAttributeMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ATTRIBUTE));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ANY_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		attributeMapping = (XmlAnyAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(attributeMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ATTRIBUTE));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlElementMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ATTRIBUTE));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ANY_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		attributeMapping = (XmlAnyAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(attributeMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ATTRIBUTE));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-	}
-
-	public void testModifyXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlAnyAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyAttributeMapping attributeMapping = (XmlAnyAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-		attributeMapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		attributeMapping.removeXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-
-	public void testUpdateXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlAnyAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyAttributeMapping attributeMapping = (XmlAnyAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-
-		//add an XmlJavaTypeAdapter annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAnyAttributeMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		//remove the XmlJavaTypeAdapter annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAnyAttributeMappingTests.this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java
deleted file mode 100644
index 392f95d821..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAnyElementMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementRef;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAnyElementAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefsAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlMixedAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCase
-{
-
-	public GenericJavaXmlAnyElementMappingTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTypeWithXmlAnyElement() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ANY_ELEMENT);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAnyElement");
-			}
-		});
-	}
-
-	public void testChangeMappingType() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNotNull(attributeMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlAttributeMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ANY_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		assertNotNull(attributeMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlElementMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ANY_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		assertNotNull(attributeMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-	}
-
-	public void testModifyXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlAnyElement();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-		attributeMapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		attributeMapping.removeXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-
-	public void testUpdateXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-
-		//add an XmlJavaTypeAdapter annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAnyElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		//remove the XmlJavaTypeAdapter annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAnyElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(attributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-
-	public void testModifyLax() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(attributeMapping.getSpecifiedLax());
-		assertEquals(false, attributeMapping.isDefaultLax());
-		assertEquals(false, attributeMapping.isLax());
-
-		attributeMapping.setSpecifiedLax(Boolean.TRUE);
-		XmlAnyElementAnnotation xmlAnyElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-		assertEquals(Boolean.TRUE, xmlAnyElementAnnotation.getLax());
-		assertEquals(Boolean.TRUE, attributeMapping.getSpecifiedLax());
-		assertEquals(false, attributeMapping.isDefaultLax());
-		assertEquals(true, attributeMapping.isLax());
-
-		attributeMapping.setSpecifiedLax(null);
-		xmlAnyElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-		assertNull(attributeMapping.getSpecifiedLax());
-		assertEquals(false, attributeMapping.isDefaultLax());
-		assertEquals(false, attributeMapping.isLax());
-	}
-
-	public void testUpdateLax() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(attributeMapping.getSpecifiedLax());
-		assertEquals(false, attributeMapping.isDefaultLax());
-		assertEquals(false, attributeMapping.isLax());
-
-
-		//add a nillable member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAnyElementMappingTests.this.addXmlAnyElementMemberValuePair(declaration, JAXB.XML_ANY_ELEMENT__LAX, true);
-			}
-		});
-		assertEquals(Boolean.TRUE, attributeMapping.getSpecifiedLax());
-		assertEquals(false, attributeMapping.isDefaultLax());
-		assertEquals(true, attributeMapping.isLax());
-
-		//remove the lax member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementAnnotation = (NormalAnnotation) GenericJavaXmlAnyElementMappingTests.this.getXmlAnyElementAnnotation(declaration);
-				GenericJavaXmlAnyElementMappingTests.this.values(xmlElementAnnotation).remove(0);
-			}
-		});
-		assertNull(attributeMapping.getSpecifiedLax());
-		assertEquals(false, attributeMapping.isDefaultLax());
-		assertEquals(false, attributeMapping.isLax());
-	}
-
-	public void testModifyValue() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(attributeMapping.getSpecifiedValue());
-
-		attributeMapping.setSpecifiedValue("Foo");
-		XmlAnyElementAnnotation xmlElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-		assertEquals("Foo", attributeMapping.getSpecifiedValue());
-		assertEquals("Foo", attributeMapping.getValue());
-
-		attributeMapping.setSpecifiedValue(null);
-		xmlElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-		assertNull(xmlElementAnnotation.getValue());
-		assertNull(attributeMapping.getSpecifiedValue());
-	}
-
-	public void testUpdateValue() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(attributeMapping.getSpecifiedValue());
-
-
-		//add a Value member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAnyElementMappingTests.this.addXmlAnyElementTypeMemberValuePair(declaration, JAXB.XML_ANY_ELEMENT__VALUE, "Foo");
-			}
-		});
-		assertEquals("Foo", attributeMapping.getValue());
-
-		//remove the Value member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementAnnotation = (NormalAnnotation) GenericJavaXmlAnyElementMappingTests.this.getXmlAnyElementAnnotation(declaration);
-				GenericJavaXmlAnyElementMappingTests.this.values(xmlElementAnnotation).remove(0);
-			}
-		});
-		assertNull(attributeMapping.getSpecifiedValue());
-	}
-
-	protected Annotation getXmlAnyElementAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_ANY_ELEMENT);
-	}
-	
-	protected void addXmlAnyElementMemberValuePair(ModifiedDeclaration declaration, String name, boolean value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlAnyElementAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlAnyElementTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlAnyElementAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-	
-	
-	// ***** XmlElementRefs *****
-	
-	public void testSyncXmlElementRefs() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		Iterable<XmlElementRef> xmlElementRefs = attributeMapping.getXmlElementRefs().getXmlElementRefs();
-		assertTrue(CollectionTools.isEmpty(xmlElementRefs));
-		assertEquals(0, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		
-		//add XmlElementRef annotation
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlAnyElementMappingTests.this.addMemberValuePair(
-								GenericJavaXmlAnyElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT_REF),
-								JAXB.XML_ELEMENT_REF__NAME, "foo");
-					}
-				});
-		xmlElementRefs = attributeMapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertFalse(CollectionTools.isEmpty(attributeMapping.getXmlElementRefs().getXmlElementRefs()));
-		assertEquals(1, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("foo", CollectionTools.get(xmlElementRefs, 0).getQName().getName());
-		
-		// add XmlElementRefs annotation with nested annotation
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlAnyElementMappingTests.this.addMarkerAnnotation(
-								declaration.getDeclaration(), JAXB.XML_ELEMENT_REFS);
-						NormalAnnotation annotation = 
-								GenericJavaXmlAnyElementMappingTests.this.newNormalAnnotation(declaration.getAst(), JAXB.XML_ELEMENT_REF);
-						GenericJavaXmlAnyElementMappingTests.this.addMemberValuePair(
-								annotation, JAXB.XML_ELEMENT_REF__NAME, "bar");
-						GenericJavaXmlAnyElementMappingTests.this.addArrayElement(
-								declaration, JAXB.XML_ELEMENT_REFS, 0, JAXB.XML_ELEMENT_REFS__VALUE, annotation);		
-					}
-				});
-		xmlElementRefs = attributeMapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertFalse(CollectionTools.isEmpty(attributeMapping.getXmlElementRefs().getXmlElementRefs()));
-		assertEquals(1, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("bar", CollectionTools.get(xmlElementRefs, 0).getQName().getName());
-				
-		// add second nested XmlElementRef annotation
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						NormalAnnotation annotation = 
-								GenericJavaXmlAnyElementMappingTests.this.newNormalAnnotation(declaration.getAst(), JAXB.XML_ELEMENT_REF);
-						GenericJavaXmlAnyElementMappingTests.this.addMemberValuePair(
-								annotation, JAXB.XML_ELEMENT_REF__NAME, "baz");
-						GenericJavaXmlAnyElementMappingTests.this.addArrayElement(
-								declaration, JAXB.XML_ELEMENT_REFS, 1, JAXB.XML_ELEMENT_REFS__VALUE, annotation);		
-					}
-				});
-		xmlElementRefs = attributeMapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertFalse(CollectionTools.isEmpty(attributeMapping.getXmlElementRefs().getXmlElementRefs()));
-		assertEquals(2, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("bar", CollectionTools.get(xmlElementRefs, 0).getQName().getName());
-		assertEquals("baz", CollectionTools.get(xmlElementRefs, 1).getQName().getName());
-		
-		// switch nested XmlElementRef annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlAnyElementMappingTests.this.moveArrayElement(
-								(NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_ELEMENT_REFS), 
-								JAXB.XML_ELEMENT_REFS__VALUE, 0, 1);
-					}
-				});
-		xmlElementRefs = attributeMapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertFalse(CollectionTools.isEmpty(attributeMapping.getXmlElementRefs().getXmlElementRefs()));
-		assertEquals(2, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("baz", CollectionTools.get(xmlElementRefs, 0).getQName().getName());
-		assertEquals("bar", CollectionTools.get(xmlElementRefs, 1).getQName().getName());
-		
-		// remove XmlElementRefs annotation
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlAnyElementMappingTests.this.removeArrayElement(
-								(NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_ELEMENT_REFS), 
-								JAXB.XML_ELEMENT_REFS__VALUE, 1);
-						GenericJavaXmlAnyElementMappingTests.this.removeArrayElement(
-								(NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_ELEMENT_REFS), 
-								JAXB.XML_ELEMENT_REFS__VALUE, 0);
-						GenericJavaXmlAnyElementMappingTests.this.removeAnnotation(
-								declaration, JAXB.XML_ELEMENT_REFS);
-					}
-				});
-		xmlElementRefs = attributeMapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertFalse(CollectionTools.isEmpty(attributeMapping.getXmlElementRefs().getXmlElementRefs()));
-		assertEquals(1, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("foo", CollectionTools.get(xmlElementRefs, 0).getQName().getName());
-		
-		// remove XmlElementRef annotation
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlAnyElementMappingTests.this.removeAnnotation(
-								declaration, JAXB.XML_ELEMENT_REF);
-					}
-				});
-		xmlElementRefs = attributeMapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertTrue(CollectionTools.isEmpty(attributeMapping.getXmlElementRefs().getXmlElementRefs()));
-		assertEquals(0, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-	}
-
-	public void testModifyXmlElementRefs() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-		XmlElementRefsAnnotation xmlElementRefsAnnotation;
-		XmlElementRefAnnotation xmlElementRefAnnotation;
-		
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF));
-		assertEquals(0, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		
-		attributeMapping.getXmlElementRefs().addXmlElementRef(0).getQName().setSpecifiedName("foo");
-		xmlElementRefsAnnotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNull(xmlElementRefsAnnotation);
-		assertNotNull(xmlElementRefAnnotation);
-		assertEquals("foo", xmlElementRefAnnotation.getName());
-		
-		attributeMapping.getXmlElementRefs().addXmlElementRef(1).getQName().setSpecifiedName("bar");
-		xmlElementRefsAnnotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNotNull(xmlElementRefsAnnotation);
-		assertNull(xmlElementRefAnnotation);
-		assertEquals(2, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("foo", CollectionTools.get(xmlElementRefsAnnotation.getXmlElementRefs(), 0).getName());
-		assertEquals("bar", CollectionTools.get(xmlElementRefsAnnotation.getXmlElementRefs(), 1).getName());
-		
-		attributeMapping.getXmlElementRefs().moveXmlElementRef(0, 1);
-		xmlElementRefsAnnotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNotNull(xmlElementRefsAnnotation);
-		assertNull(xmlElementRefAnnotation);
-		assertEquals(2, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("bar", CollectionTools.get(xmlElementRefsAnnotation.getXmlElementRefs(), 0).getName());
-		assertEquals("foo", CollectionTools.get(xmlElementRefsAnnotation.getXmlElementRefs(), 1).getName());
-		
-		attributeMapping.getXmlElementRefs().removeXmlElementRef(0);
-		xmlElementRefsAnnotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNull(xmlElementRefsAnnotation);
-		assertNotNull(xmlElementRefAnnotation);
-		assertEquals(1, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("foo", xmlElementRefAnnotation.getName());
-		
-		attributeMapping.getXmlElementRefs().removeXmlElementRef(0);
-		xmlElementRefsAnnotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF));
-		assertEquals(0, attributeMapping.getXmlElementRefs().getXmlElementRefsSize());
-	}
-
-	public void testModifyXmlMixed() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlMixedAnnotation xmlListAnnotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(attributeMapping.getXmlMixed());
-		assertNull(xmlListAnnotation);
-
-		attributeMapping.addXmlMixed();
-		xmlListAnnotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNotNull(attributeMapping.getXmlMixed());
-		assertNotNull(xmlListAnnotation);
-
-		attributeMapping.removeXmlMixed();
-		xmlListAnnotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-	}
-
-	public void testUpdateXmlMixed() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAnyElementMapping attributeMapping = (XmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlMixedAnnotation xmlListAnnotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(attributeMapping.getXmlMixed());
-		assertNull(xmlListAnnotation);
-
-
-		//add an XmlMixed annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAnyElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_MIXED);
-			}
-		});
-		xmlListAnnotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNotNull(attributeMapping.getXmlMixed());
-		assertNotNull(xmlListAnnotation);
-
-		//remove the XmlMixed annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAnyElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_MIXED);
-			}
-		});
-		xmlListAnnotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(attributeMapping.getXmlMixed());
-		assertNull(xmlListAnnotation);
-	}
-
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java
deleted file mode 100644
index aed0072858..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java
+++ /dev/null
@@ -1,731 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAttachmentRefAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAttributeAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlIDAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlIDREFAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCase
-{
-
-	public GenericJavaXmlAttributeMappingTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTypeWithXmlAttribute() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAttribute");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTypeWithCollectionXmlAttribute() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("import java.util.List;").append(CR);
-				sb.append("import javax.xml.bind.annotation.XmlAttribute;").append(CR);
-				sb.append("import javax.xml.bind.annotation.XmlType;").append(CR);
-				sb.append(CR);
-				sb.append("@XmlType").append(CR);
-				sb.append("public class ").append(TYPE_NAME).append(" {").append(CR);
-				sb.append("    @XmlAttribute").append(CR);
-				sb.append("    public List<String> list;").append(CR);
-				sb.append("}").append(CR);
-			}
-		};
-		return this.javaProject.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter);
-	}
-	
-	
-	public void testModifyName() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlAttributeMapping.getQName().getSpecifiedName());
-		assertEquals("id", xmlAttributeMapping.getQName().getDefaultName());
-		assertEquals("id", xmlAttributeMapping.getQName().getName());
-
-		xmlAttributeMapping.getQName().setSpecifiedName("foo");
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertEquals("foo", xmlAttributeAnnotation.getName());
-		assertEquals("foo", xmlAttributeMapping.getQName().getSpecifiedName());
-		assertEquals("id", xmlAttributeMapping.getQName().getDefaultName());
-		assertEquals("foo", xmlAttributeMapping.getQName().getName());
-
-		xmlAttributeMapping.getQName().setSpecifiedName(null);
-		xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertNull(xmlAttributeAnnotation.getName());
-		assertNull(xmlAttributeMapping.getQName().getSpecifiedName());
-	}
-
-	public void testUpdateName() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlAttributeMapping.getQName().getSpecifiedName());
-
-
-		//add a Name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addXmlAttributeMemberValuePair(declaration, JAXB.XML_ATTRIBUTE__NAME, "foo");
-			}
-		});
-		assertEquals("foo", xmlAttributeMapping.getQName().getName());
-
-		//remove the Name member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlAttributeAnnotation = (NormalAnnotation) GenericJavaXmlAttributeMappingTests.this.getXmlAttributeAnnotation(declaration);
-				GenericJavaXmlAttributeMappingTests.this.values(xmlAttributeAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlAttributeMapping.getQName().getSpecifiedName());
-	}
-
-	public void testModifyNamespace() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlAttributeMapping.getQName().getSpecifiedNamespace());
-
-		xmlAttributeMapping.getQName().setSpecifiedNamespace("foo");
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertEquals("foo", xmlAttributeAnnotation.getNamespace());
-		assertEquals("foo", xmlAttributeMapping.getQName().getNamespace());
-
-		xmlAttributeMapping.getQName().setSpecifiedNamespace(null);
-		xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertNull(xmlAttributeAnnotation.getNamespace());
-		assertNull(xmlAttributeMapping.getQName().getSpecifiedNamespace());
-	}
-
-	public void testUpdateNamespace() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlAttributeMapping.getQName().getSpecifiedNamespace());
-
-
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addXmlAttributeMemberValuePair(declaration, JAXB.XML_ATTRIBUTE__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", xmlAttributeMapping.getQName().getNamespace());
-		
-		//remove the namespace member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlAttributeAnnotation = (NormalAnnotation) GenericJavaXmlAttributeMappingTests.this.getXmlAttributeAnnotation(declaration);
-				GenericJavaXmlAttributeMappingTests.this.values(xmlAttributeAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlAttributeMapping.getQName().getSpecifiedNamespace());
-	}
-
-	public void testModifyRequired() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlAttributeMapping.getSpecifiedRequired());
-		assertEquals(false, xmlAttributeMapping.isDefaultRequired());
-		assertEquals(false, xmlAttributeMapping.isRequired());
-
-		xmlAttributeMapping.setSpecifiedRequired(Boolean.TRUE);
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertEquals(Boolean.TRUE, xmlAttributeAnnotation.getRequired());
-		assertEquals(Boolean.TRUE, xmlAttributeMapping.getSpecifiedRequired());
-		assertEquals(false, xmlAttributeMapping.isDefaultRequired());
-		assertEquals(true, xmlAttributeMapping.isRequired());
-
-		xmlAttributeMapping.setSpecifiedRequired(null);
-		xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertNull(xmlAttributeAnnotation.getName());
-		assertNull(xmlAttributeMapping.getSpecifiedRequired());
-		assertEquals(false, xmlAttributeMapping.isDefaultRequired());
-		assertEquals(false, xmlAttributeMapping.isRequired());
-	}
-
-	public void testUpdateRequired() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlAttributeMapping.getSpecifiedRequired());
-		assertEquals(false, xmlAttributeMapping.isDefaultRequired());
-		assertEquals(false, xmlAttributeMapping.isRequired());
-
-
-		//add a required member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addXmlAttributeMemberValuePair(declaration, JAXB.XML_ATTRIBUTE__REQUIRED, true);
-			}
-		});
-		assertEquals(Boolean.TRUE, xmlAttributeMapping.getSpecifiedRequired());
-		assertEquals(false, xmlAttributeMapping.isDefaultRequired());
-		assertEquals(true, xmlAttributeMapping.isRequired());
-
-		//remove the required member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlAttributeAnnotation = (NormalAnnotation) GenericJavaXmlAttributeMappingTests.this.getXmlAttributeAnnotation(declaration);
-				GenericJavaXmlAttributeMappingTests.this.values(xmlAttributeAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlAttributeMapping.getSpecifiedRequired());
-		assertEquals(false, xmlAttributeMapping.isDefaultRequired());
-		assertEquals(false, xmlAttributeMapping.isRequired());
-	}
-
-	public void testChangeMappingType() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNotNull(xmlAttributeMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlElementMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlAttributeMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-	}
-
-	public void testModifyXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlAttributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-		xmlAttributeMapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(xmlAttributeMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		xmlAttributeMapping.removeXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-
-	public void testUpdateXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlAttributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-
-		//add an XmlJavaTypeAdapter annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(xmlAttributeMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		//remove the XmlJavaTypeAdapter annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlAttributeMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-
-	public void testModifyXmlSchemaType() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlSchemaTypeAnnotation xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(xmlAttributeMapping.getXmlSchemaType());
-		assertNull(xmlSchemaTypeAnnotation);
-
-		xmlAttributeMapping.addXmlSchemaType();
-		xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNotNull(xmlAttributeMapping.getXmlSchemaType());
-		assertNotNull(xmlSchemaTypeAnnotation);
-
-		xmlAttributeMapping.removeXmlSchemaType();
-		xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-	}
-
-	public void testUpdateXmlSchemaType() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlSchemaTypeAnnotation xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(xmlAttributeMapping.getXmlSchemaType());
-		assertNull(xmlSchemaTypeAnnotation);
-
-
-		//add an XmlSchemaType annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_SCHEMA_TYPE);
-			}
-		});
-		xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNotNull(xmlAttributeMapping.getXmlSchemaType());
-		assertNotNull(xmlSchemaTypeAnnotation);
-
-		//remove the XmlSchemaType annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, JAXB.XML_SCHEMA_TYPE);
-			}
-		});
-		xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(xmlAttributeMapping.getXmlSchemaType());
-		assertNull(xmlSchemaTypeAnnotation);
-	}
-
-	protected void addXmlAttributeMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlAttributeAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlAttributeMemberValuePair(ModifiedDeclaration declaration, String name, boolean value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlAttributeAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlAttributeTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlAttributeAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected Annotation getXmlAttributeAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_ATTRIBUTE);
-	}
-
-	public void testModifyXmlList1() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertFalse(xmlAttributeMapping.isXmlList());
-		assertFalse(xmlAttributeMapping.isDefaultXmlList());
-		assertFalse(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlAttributeMapping.setSpecifiedXmlList(true);
-		
-		assertTrue(xmlAttributeMapping.isXmlList());
-		assertFalse(xmlAttributeMapping.isDefaultXmlList());
-		assertTrue(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlAttributeMapping.setSpecifiedXmlList(false);
-		
-		assertFalse(xmlAttributeMapping.isXmlList());
-		assertFalse(xmlAttributeMapping.isDefaultXmlList());
-		assertFalse(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testModifyXmlList2() throws Exception {
-		createTypeWithCollectionXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertTrue(xmlAttributeMapping.isXmlList());
-		assertTrue(xmlAttributeMapping.isDefaultXmlList());
-		assertFalse(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlAttributeMapping.setSpecifiedXmlList(true);
-		
-		assertTrue(xmlAttributeMapping.isXmlList());
-		assertTrue(xmlAttributeMapping.isDefaultXmlList());
-		assertTrue(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlAttributeMapping.setSpecifiedXmlList(false);
-		
-		assertTrue(xmlAttributeMapping.isXmlList());
-		assertTrue(xmlAttributeMapping.isDefaultXmlList());
-		assertFalse(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testUpdateXmlList1() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertFalse(xmlAttributeMapping.isXmlList());
-		assertFalse(xmlAttributeMapping.isDefaultXmlList());
-		assertFalse(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//add an XmlList annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_LIST);
-			}
-		});
-		
-		assertTrue(xmlAttributeMapping.isXmlList());
-		assertFalse(xmlAttributeMapping.isDefaultXmlList());
-		assertTrue(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//remove the XmlList annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, JAXB.XML_LIST);
-			}
-		});
-		
-		assertFalse(xmlAttributeMapping.isXmlList());
-		assertFalse(xmlAttributeMapping.isDefaultXmlList());
-		assertFalse(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testUpdateXmlList2() throws Exception {
-		createTypeWithCollectionXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertTrue(xmlAttributeMapping.isXmlList());
-		assertTrue(xmlAttributeMapping.isDefaultXmlList());
-		assertFalse(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//add an XmlList annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_LIST);
-			}
-		});
-		
-		assertTrue(xmlAttributeMapping.isXmlList());
-		assertTrue(xmlAttributeMapping.isDefaultXmlList());
-		assertTrue(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//remove the XmlList annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, JAXB.XML_LIST);
-			}
-		});
-		
-		assertTrue(xmlAttributeMapping.isXmlList());
-		assertTrue(xmlAttributeMapping.isDefaultXmlList());
-		assertFalse(xmlAttributeMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testModifyXmlID() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlIDAnnotation xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNull(xmlAttributeMapping.getXmlID());
-		assertNull(xmlIDAnnotation);
-
-		xmlAttributeMapping.addXmlID();
-		xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNotNull(xmlAttributeMapping.getXmlID());
-		assertNotNull(xmlIDAnnotation);
-
-		xmlAttributeMapping.removeXmlID();
-		xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-	}
-
-	public void testUpdateXmlID() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlIDAnnotation xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNull(xmlAttributeMapping.getXmlID());
-		assertNull(xmlIDAnnotation);
-
-
-		//add an XmlID annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ID);
-			}
-		});
-		xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNotNull(xmlAttributeMapping.getXmlID());
-		assertNotNull(xmlIDAnnotation);
-
-		//remove the XmlID annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, JAXB.XML_ID);
-			}
-		});
-		xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNull(xmlAttributeMapping.getXmlID());
-		assertNull(xmlIDAnnotation);
-	}
-
-	public void testModifyXmlIDREF() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlIDREFAnnotation xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNull(xmlAttributeMapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-
-		xmlAttributeMapping.addXmlIDREF();
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNotNull(xmlAttributeMapping.getXmlIDREF());
-		assertNotNull(xmlIDREFAnnotation);
-
-		xmlAttributeMapping.removeXmlIDREF();
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-	}
-
-	public void testUpdateXmlIDREF() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlIDREFAnnotation xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNull(xmlAttributeMapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-
-
-		//add an XmlIDREF annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_IDREF);
-			}
-		});
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNotNull(xmlAttributeMapping.getXmlIDREF());
-		assertNotNull(xmlIDREFAnnotation);
-
-		//remove the XmlIDREF annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, JAXB.XML_IDREF);
-			}
-		});
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNull(xmlAttributeMapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-	}
-
-	public void testModifyXmlAttachmentRef() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlAttachmentRefAnnotation xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNull(xmlAttributeMapping.getXmlAttachmentRef());
-		assertNull(xmlAttachmentRefAnnotation);
-
-		xmlAttributeMapping.addXmlAttachmentRef();
-		xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNotNull(xmlAttributeMapping.getXmlAttachmentRef());
-		assertNotNull(xmlAttachmentRefAnnotation);
-
-		xmlAttributeMapping.removeXmlAttachmentRef();
-		xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-	}
-
-	public void testUpdateXmlAttachmentRef() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlAttributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlAttachmentRefAnnotation xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNull(xmlAttributeMapping.getXmlAttachmentRef());
-		assertNull(xmlAttachmentRefAnnotation);
-
-
-		//add an XmlAttachmentRef annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTACHMENT_REF);
-			}
-		});
-		xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNotNull(xmlAttributeMapping.getXmlAttachmentRef());
-		assertNotNull(xmlAttachmentRefAnnotation);
-
-		//remove the XmlAttachmentRef annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTACHMENT_REF);
-			}
-		});
-		xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNull(xmlAttributeMapping.getXmlAttachmentRef());
-		assertNull(xmlAttachmentRefAnnotation);
-	}
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java
deleted file mode 100644
index 64ad796fcf..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java
+++ /dev/null
@@ -1,1055 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElement;
-import org.eclipse.jpt.jaxb.core.context.XmlElementMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAttachmentRefAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlIDAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlIDREFAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase
-{
-
-	public GenericJavaXmlElementMappingTests(String name) {
-		super(name);
-	}
-	
-	private ICompilationUnit createTypeWithXmlElement() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElement");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTypeWithCollectionXmlElement() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("import java.util.List;").append(CR);
-				sb.append("import javax.xml.bind.annotation.XmlElement;").append(CR);
-				sb.append("import javax.xml.bind.annotation.XmlType;").append(CR);
-				sb.append(CR);
-				sb.append("@XmlType").append(CR);
-				sb.append("public class ").append(TYPE_NAME).append(" {").append(CR);
-				sb.append("    @XmlElement").append(CR);
-				sb.append("    public List<String> list;").append(CR);
-				sb.append("}").append(CR);
-			}
-		};
-		return this.javaProject.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter);
-	}
-	
-	private void createXmlTypeWithVariousAttributes() throws CoreException {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("import ").append(JAXB.XML_TYPE).append(";").append(CR);
-				sb.append("import java.util.List;").append(CR);
-				sb.append(CR);
-				sb.append("@XmlType").append(CR);
-				sb.append("public class ").append(TYPE_NAME).append("{").append(CR);
-				sb.append("    public String string;").append(CR);
-				sb.append("    public List<String> stringList;").append(CR);
-				sb.append("    public String[] stringArray;").append(CR);
-				sb.append("}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter);
-	}
-	
-	public void testModifyName() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(xmlElement.getQName().getSpecifiedName());
-		assertEquals("id", xmlElement.getQName().getDefaultName());
-		assertEquals("id", xmlElement.getQName().getName());
-
-		xmlElement.getQName().setSpecifiedName("foo");
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertEquals("foo", xmlElementAnnotation.getName());
-		assertEquals("foo", xmlElement.getQName().getSpecifiedName());
-		assertEquals("id", xmlElement.getQName().getDefaultName());
-		assertEquals("foo", xmlElement.getQName().getName());
-
-		xmlElement.getQName().setSpecifiedName(null);
-		xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertNull(xmlElementAnnotation.getName());
-		assertNull(xmlElement.getQName().getSpecifiedName());
-	}
-
-	public void testUpdateName() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(xmlElement.getQName().getSpecifiedName());
-
-
-		//add a Name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addXmlElementMemberValuePair(declaration, JAXB.XML_ELEMENT__NAME, "foo");
-			}
-		});
-		assertEquals("foo", xmlElement.getQName().getName());
-
-		//remove the Name member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementAnnotation = (NormalAnnotation) GenericJavaXmlElementMappingTests.this.getXmlElementAnnotation(declaration);
-				GenericJavaXmlElementMappingTests.this.values(xmlElementAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElement.getQName().getSpecifiedName());
-	}
-
-	public void testModifyNamespace() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElement.getQName().getSpecifiedNamespace());
-
-		xmlElement.getQName().setSpecifiedNamespace("foo");
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertEquals("foo", xmlElementAnnotation.getNamespace());
-		assertEquals("foo", xmlElement.getQName().getNamespace());
-
-		xmlElement.getQName().setSpecifiedNamespace(null);
-		xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertNull(xmlElementAnnotation.getNamespace());
-		assertNull(xmlElement.getQName().getSpecifiedNamespace());
-	}
-
-	public void testUpdateNamespace() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElement.getQName().getSpecifiedNamespace());
-
-
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addXmlElementMemberValuePair(declaration, JAXB.XML_ELEMENT__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", xmlElement.getQName().getNamespace());
-
-		//remove the namespace member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementAnnotation = (NormalAnnotation) GenericJavaXmlElementMappingTests.this.getXmlElementAnnotation(declaration);
-				GenericJavaXmlElementMappingTests.this.values(xmlElementAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElement.getQName().getSpecifiedNamespace());
-	}
-
-	public void testModifyRequired() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElement.getSpecifiedRequired());
-		assertEquals(false, xmlElement.isDefaultRequired());
-		assertEquals(false, xmlElement.isRequired());
-
-		xmlElement.setSpecifiedRequired(Boolean.TRUE);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertEquals(Boolean.TRUE, xmlElementAnnotation.getRequired());
-		assertEquals(Boolean.TRUE, xmlElement.getSpecifiedRequired());
-		assertEquals(false, xmlElement.isDefaultRequired());
-		assertEquals(true, xmlElement.isRequired());
-
-		xmlElement.setSpecifiedRequired(null);
-		xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertNull(xmlElementAnnotation.getName());
-		assertNull(xmlElement.getSpecifiedRequired());
-		assertEquals(false, xmlElement.isDefaultRequired());
-		assertEquals(false, xmlElement.isRequired());
-	}
-
-	public void testUpdateRequired() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElement.getSpecifiedRequired());
-		assertEquals(false, xmlElement.isDefaultRequired());
-		assertEquals(false, xmlElement.isRequired());
-
-
-		//add a required member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addXmlElementMemberValuePair(declaration, JAXB.XML_ELEMENT__REQUIRED, true);
-			}
-		});
-		assertEquals(Boolean.TRUE, xmlElement.getSpecifiedRequired());
-		assertEquals(false, xmlElement.isDefaultRequired());
-		assertEquals(true, xmlElement.isRequired());
-
-		//remove the required member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementAnnotation = (NormalAnnotation) GenericJavaXmlElementMappingTests.this.getXmlElementAnnotation(declaration);
-				GenericJavaXmlElementMappingTests.this.values(xmlElementAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElement.getSpecifiedRequired());
-		assertEquals(false, xmlElement.isDefaultRequired());
-		assertEquals(false, xmlElement.isRequired());
-	}
-
-	public void testModifyNillable() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElement.getSpecifiedNillable());
-		assertEquals(false, xmlElement.isDefaultNillable());
-		assertEquals(false, xmlElement.isNillable());
-
-		xmlElement.setSpecifiedNillable(Boolean.TRUE);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertEquals(Boolean.TRUE, xmlElementAnnotation.getNillable());
-		assertEquals(Boolean.TRUE, xmlElement.getSpecifiedNillable());
-		assertEquals(false, xmlElement.isDefaultNillable());
-		assertEquals(true, xmlElement.isNillable());
-
-		xmlElement.setSpecifiedNillable(null);
-		xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertNull(xmlElementAnnotation.getName());
-		assertNull(xmlElement.getSpecifiedNillable());
-		assertEquals(false, xmlElement.isDefaultNillable());
-		assertEquals(false, xmlElement.isNillable());
-	}
-
-	public void testUpdateNillable() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElement.getSpecifiedNillable());
-		assertEquals(false, xmlElement.isDefaultNillable());
-		assertEquals(false, xmlElement.isNillable());
-
-
-		//add a nillable member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addXmlElementMemberValuePair(declaration, JAXB.XML_ELEMENT__NILLABLE, true);
-			}
-		});
-		assertEquals(Boolean.TRUE, xmlElement.getSpecifiedNillable());
-		assertEquals(false, xmlElement.isDefaultNillable());
-		assertEquals(true, xmlElement.isNillable());
-
-		//remove the nillable member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementAnnotation = (NormalAnnotation) GenericJavaXmlElementMappingTests.this.getXmlElementAnnotation(declaration);
-				GenericJavaXmlElementMappingTests.this.values(xmlElementAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElement.getSpecifiedNillable());
-		assertEquals(false, xmlElement.isDefaultNillable());
-		assertEquals(false, xmlElement.isNillable());
-	}
-	
-	public void testDefaultNillable() throws Exception {
-		createXmlTypeWithVariousAttributes();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		
-		// string
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = persistentAttribute.getJavaResourceAttribute();
-		
-		assertEquals(false, xmlElement.isDefaultNillable());
-		
-		annotatedElement(resourceAttribute).edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT);
-					}
-				});
-		
-		assertEquals(false, xmlElement.isDefaultNillable());
-		
-		// string list
-		persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 1);
-		xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		xmlElement = xmlElementMapping.getXmlElement();
-		resourceAttribute = persistentAttribute.getJavaResourceAttribute();
-		
-		assertEquals(true, xmlElement.isDefaultNillable());
-		
-		annotatedElement(resourceAttribute).edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT);
-					}
-				});
-		
-		assertEquals(false, xmlElement.isDefaultNillable());
-		
-		// string array
-		persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 2);
-		xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		xmlElement = xmlElementMapping.getXmlElement();
-		resourceAttribute = persistentAttribute.getJavaResourceAttribute();
-		
-		assertEquals(true, xmlElement.isDefaultNillable());
-		
-		annotatedElement(resourceAttribute).edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT);
-					}
-				});
-		
-		assertEquals(false, xmlElement.isDefaultNillable());
-	}
-
-	public void testModifyDefaultValue() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElement.getDefaultValue());
-
-		xmlElement.setDefaultValue("foo");
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertEquals("foo", xmlElementAnnotation.getDefaultValue());
-		assertEquals("foo", xmlElement.getDefaultValue());
-
-		xmlElement.setDefaultValue(null);
-		xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		assertNull(xmlElementAnnotation.getDefaultValue());
-		assertNull(xmlElement.getDefaultValue());
-	}
-
-	public void testUpdateDefaultValue() throws Exception {
-		createTypeWithXmlElement();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElement.getDefaultValue());
-
-
-		//add a DefaultValue member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addXmlElementMemberValuePair(declaration, JAXB.XML_ELEMENT__DEFAULT_VALUE, "foo");
-			}
-		});
-		assertEquals("foo", xmlElement.getDefaultValue());
-
-		//remove the DefaultValue member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementAnnotation = (NormalAnnotation) GenericJavaXmlElementMappingTests.this.getXmlElementAnnotation(declaration);
-				GenericJavaXmlElementMappingTests.this.values(xmlElementAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElement.getDefaultValue());
-	}
-
-	public void testModifyType() throws Exception {
-		createTypeWithXmlElement();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		
-		assertNull(xmlElement.getSpecifiedType());
-		assertEquals("int", xmlElement.getType());
-		assertEquals("int", xmlElement.getDefaultType());
-		
-		xmlElement.setSpecifiedType("Foo");
-		assertEquals("Foo", xmlElement.getSpecifiedType());
-		assertEquals("Foo", xmlElement.getType());
-		
-		xmlElement.setSpecifiedType(null);
-		assertNull(xmlElement.getSpecifiedType());
-		assertEquals("int", xmlElement.getType());
-	}
-	
-	public void testUpdateType() throws Exception {
-		createTypeWithXmlElement();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		XmlElement xmlElement = xmlElementMapping.getXmlElement();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(xmlElement.getSpecifiedType());
-		assertEquals("int", xmlElement.getDefaultType());
-		assertEquals("int", xmlElement.getType());
-		
-		//add a Type member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addXmlElementTypeMemberValuePair(declaration, JAXB.XML_ELEMENT__TYPE, "Foo");
-			}
-		});
-		assertEquals("Foo", xmlElement.getSpecifiedType());
-		assertEquals("Foo", xmlElement.getType());
-		
-		//remove the Type member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementAnnotation = (NormalAnnotation) GenericJavaXmlElementMappingTests.this.getXmlElementAnnotation(declaration);
-				GenericJavaXmlElementMappingTests.this.values(xmlElementAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElement.getSpecifiedType());
-		assertEquals("int", xmlElement.getType());
-	}
-
-	public void testChangeMappingType() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNotNull(xmlElementMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlAttributeMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlElementMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-	}
-
-	public void testModifyXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlElement();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlElementMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-		xmlElementMapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(xmlElementMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		xmlElementMapping.removeXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlElementMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-
-	public void testUpdateXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlElementMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-
-		//add an XmlJavaTypeAdapter annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(xmlElementMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		//remove the XmlJavaTypeAdapter annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlElementMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-
-	public void testModifyXmlSchemaType() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlSchemaTypeAnnotation xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(xmlElementMapping.getXmlSchemaType());
-		assertNull(xmlSchemaTypeAnnotation);
-
-		xmlElementMapping.addXmlSchemaType();
-		xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNotNull(xmlElementMapping.getXmlSchemaType());
-		assertNotNull(xmlSchemaTypeAnnotation);
-
-		xmlElementMapping.removeXmlSchemaType();
-		xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-	}
-
-	public void testUpdateXmlSchemaType() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlSchemaTypeAnnotation xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(xmlElementMapping.getXmlSchemaType());
-		assertNull(xmlSchemaTypeAnnotation);
-
-
-		//add an XmlSchemaType annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_SCHEMA_TYPE);
-			}
-		});
-		xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNotNull(xmlElementMapping.getXmlSchemaType());
-		assertNotNull(xmlSchemaTypeAnnotation);
-
-		//remove the XmlSchemaType annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_SCHEMA_TYPE);
-			}
-		});
-		xmlSchemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(xmlElementMapping.getXmlSchemaType());
-		assertNull(xmlSchemaTypeAnnotation);
-	}
-
-	protected void addXmlElementMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlElementAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlElementMemberValuePair(ModifiedDeclaration declaration, String name, boolean value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlElementAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlElementTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlElementAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected Annotation getXmlElementAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_ELEMENT);
-	}
-
-
-	public void testModifyXmlElementWrapper() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(xmlElementMapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-
-		xmlElementMapping.addXmlElementWrapper();
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNotNull(xmlElementMapping.getXmlElementWrapper());
-		assertNotNull(xmlElementWrapperAnnotation);
-
-		xmlElementMapping.removeXmlElementWrapper();
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-	}
-
-	public void testUpdateXmlElementWrapper() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(xmlElementMapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-
-
-		//add an XmlElementWrapper annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT_WRAPPER);
-			}
-		});
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNotNull(xmlElementMapping.getXmlElementWrapper());
-		assertNotNull(xmlElementWrapperAnnotation);
-
-		//remove the XmlElementWrapper annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_ELEMENT_WRAPPER);
-			}
-		});
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(xmlElementMapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-	}
-
-	public void testModifyXmlList1() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertFalse(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertFalse(xmlElementMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlElementMapping.setSpecifiedXmlList(true);
-		
-		assertTrue(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertTrue(xmlElementMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlElementMapping.setSpecifiedXmlList(false);
-		
-		assertFalse(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertFalse(xmlElementMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testModifyXmlList2() throws Exception {
-		createTypeWithCollectionXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertFalse(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertFalse(xmlElementMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlElementMapping.setSpecifiedXmlList(true);
-		
-		assertTrue(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertTrue(xmlElementMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlElementMapping.setSpecifiedXmlList(false);
-		
-		assertFalse(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertFalse(xmlElementMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testUpdateXmlList1() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertFalse(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertFalse(xmlElementMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//add an XmlList annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_LIST);
-			}
-		});
-		
-		assertTrue(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertTrue(xmlElementMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//remove the XmlList annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_LIST);
-			}
-		});
-		
-		assertFalse(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertFalse(xmlElementMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testUpdateXmlList2() throws Exception {
-		createTypeWithCollectionXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertFalse(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertFalse(xmlElementMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//add an XmlList annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_LIST);
-			}
-		});
-		
-		assertTrue(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertTrue(xmlElementMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//remove the XmlList annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_LIST);
-			}
-		});
-		
-		assertFalse(xmlElementMapping.isXmlList());
-		assertFalse(xmlElementMapping.isDefaultXmlList());
-		assertFalse(xmlElementMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-
-	public void testModifyXmlID() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlIDAnnotation xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNull(xmlElementMapping.getXmlID());
-		assertNull(xmlIDAnnotation);
-
-		xmlElementMapping.addXmlID();
-		xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNotNull(xmlElementMapping.getXmlID());
-		assertNotNull(xmlIDAnnotation);
-
-		xmlElementMapping.removeXmlID();
-		xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-	}
-
-	public void testUpdateXmlID() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlIDAnnotation xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNull(xmlElementMapping.getXmlID());
-		assertNull(xmlIDAnnotation);
-
-
-		//add an XmlID annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ID);
-			}
-		});
-		xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNotNull(xmlElementMapping.getXmlID());
-		assertNotNull(xmlIDAnnotation);
-
-		//remove the XmlID annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_ID);
-			}
-		});
-		xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertNull(xmlElementMapping.getXmlID());
-		assertNull(xmlIDAnnotation);
-	}
-
-	public void testModifyXmlIDREF() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlIDREFAnnotation xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNull(xmlElementMapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-
-		xmlElementMapping.addXmlIDREF();
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNotNull(xmlElementMapping.getXmlIDREF());
-		assertNotNull(xmlIDREFAnnotation);
-
-		xmlElementMapping.removeXmlIDREF();
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNull(xmlElementMapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-	}
-
-	public void testUpdateXmlIDREF() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlIDREFAnnotation xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNull(xmlElementMapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-
-
-		//add an XmlIDREF annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_IDREF);
-			}
-		});
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNotNull(xmlElementMapping.getXmlIDREF());
-		assertNotNull(xmlIDREFAnnotation);
-
-		//remove the XmlIDREF annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_IDREF);
-			}
-		});
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertNull(xmlElementMapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-	}
-
-	public void testModifyXmlAttachmentRef() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlAttachmentRefAnnotation xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNull(xmlElementMapping.getXmlAttachmentRef());
-		assertNull(xmlAttachmentRefAnnotation);
-
-		xmlElementMapping.addXmlAttachmentRef();
-		xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNotNull(xmlElementMapping.getXmlAttachmentRef());
-		assertNotNull(xmlAttachmentRefAnnotation);
-
-		xmlElementMapping.removeXmlAttachmentRef();
-		xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-	}
-
-	public void testUpdateXmlAttachmentRef() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlAttachmentRefAnnotation xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNull(xmlElementMapping.getXmlAttachmentRef());
-		assertNull(xmlAttachmentRefAnnotation);
-
-
-		//add an XmlAttachmentRef annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ATTACHMENT_REF);
-			}
-		});
-		xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNotNull(xmlElementMapping.getXmlAttachmentRef());
-		assertNotNull(xmlAttachmentRefAnnotation);
-
-		//remove the XmlAttachmentRef annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementMappingTests.this.removeAnnotation(declaration, JAXB.XML_ATTACHMENT_REF);
-			}
-		});
-		xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertNull(xmlElementMapping.getXmlAttachmentRef());
-		assertNull(xmlAttachmentRefAnnotation);
-	}
-
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java
deleted file mode 100644
index 96a910d5de..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementRef;
-import org.eclipse.jpt.jaxb.core.context.XmlElementRefMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlMixedAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-public class GenericJavaXmlElementRefMappingTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaXmlElementRefMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlElementRef() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRef");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTypeWithJAXBElementXmlElementRef() throws Exception {
-		return this.createTestType(TYPE_NAME + "2", new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF, JAXB.JAXB_ELEMENT);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRef").append(CR);
-				sb.append("private JAXBElement foo;").append(CR).append(CR);
-			}
-		});
-	}
-	
-	private ICompilationUnit createTypeWithRootElementXmlElementRef() throws Exception {
-		return this.createTestType(TYPE_NAME + "3", new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF, JAXB.XML_ROOT_ELEMENT);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType").append(CR);
-				sb.append("@XmlRootElement(name=\"foo\")");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRef").append(CR);
-				sb.append("private " + TYPE_NAME + "3 foo;").append(CR).append(CR);
-			}
-		});
-	}
-	
-	
-	public void testDefaultName() throws Exception {
-		createTypeWithXmlElementRef();
-		createTypeWithJAXBElementXmlElementRef(); // FULLY_QUALIFIED_TYPE_NAME + "2"
-		createTypeWithRootElementXmlElementRef(); // FULLY_QUALIFIED_TYPE_NAME + "3"
-		
-		JaxbClass jaxbClass = (JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		
-		// XmlElementRef type is java.lang.String -> no default name or namespace
-		assertEquals("", xmlElementRef.getQName().getName());
-		assertEquals("", xmlElementRef.getQName().getNamespace());
-		
-		classMapping = ((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME + "2")).getMapping();
-		xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		
-		// XmlElementRef type is JAXBElement -> default name is name of attribute
-		assertEquals("foo", xmlElementRef.getQName().getName());
-		assertEquals("", xmlElementRef.getQName().getNamespace());
-		
-		classMapping = ((JaxbClass) getContextRoot().getType(FULLY_QUALIFIED_TYPE_NAME + "3")).getMapping();
-		xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		
-		// XmlElementRef type is type with root element -> default name is root element name
-		assertEquals("foo", xmlElementRef.getQName().getName());
-		assertEquals("", xmlElementRef.getQName().getNamespace());
-	}
-	
-	public void testModifyName() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(xmlElementRef.getQName().getSpecifiedName());
-		assertEquals("", xmlElementRef.getQName().getDefaultName());
-		assertEquals("", xmlElementRef.getQName().getName());
-
-		xmlElementRef.getQName().setSpecifiedName("foo");
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		assertEquals("foo", xmlElementRefAnnotation.getName());
-		assertEquals("foo", xmlElementRef.getQName().getSpecifiedName());
-		assertEquals("foo", xmlElementRef.getQName().getName());
-
-		xmlElementRef.getQName().setSpecifiedName(null);
-		xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		assertNull(xmlElementRefAnnotation.getName());
-		assertNull(xmlElementRef.getQName().getSpecifiedName());
-	}
-
-	public void testUpdateName() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElementRef.getQName().getSpecifiedName());
-
-
-		//add a Name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefMappingTests.this.addXmlElementRefMemberValuePair(declaration, JAXB.XML_ELEMENT_REF__NAME, "foo");
-			}
-		});
-		assertEquals("foo", xmlElementRef.getQName().getName());
-
-		//remove the Name member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementRefAnnotation = (NormalAnnotation) GenericJavaXmlElementRefMappingTests.this.getXmlElementRefAnnotation(declaration);
-				GenericJavaXmlElementRefMappingTests.this.values(xmlElementRefAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElementRef.getQName().getSpecifiedName());
-	}
-
-	public void testModifyNamespace() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElementRef.getQName().getSpecifiedNamespace());
-
-		xmlElementRef.getQName().setSpecifiedNamespace("foo");
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		assertEquals("foo", xmlElementRefAnnotation.getNamespace());
-		assertEquals("foo", xmlElementRef.getQName().getNamespace());
-
-		xmlElementRef.getQName().setSpecifiedNamespace(null);
-		xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		assertNull(xmlElementRefAnnotation.getNamespace());
-		assertNull(xmlElementRef.getQName().getSpecifiedNamespace());
-	}
-
-	public void testUpdateNamespace() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElementRef.getQName().getSpecifiedNamespace());
-
-
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefMappingTests.this.addXmlElementRefMemberValuePair(declaration, JAXB.XML_ELEMENT_REF__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", xmlElementRef.getQName().getNamespace());
-
-		//remove the namespace member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementRefAnnotation = (NormalAnnotation) GenericJavaXmlElementRefMappingTests.this.getXmlElementRefAnnotation(declaration);
-				GenericJavaXmlElementRefMappingTests.this.values(xmlElementRefAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElementRef.getQName().getSpecifiedNamespace());
-	}
-
-	public void testModifyRequired() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElementRef.getSpecifiedRequired());
-		assertEquals(false, xmlElementRef.isDefaultRequired());
-		assertEquals(false, xmlElementRef.isRequired());
-
-		xmlElementRef.setSpecifiedRequired(Boolean.TRUE);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		assertEquals(Boolean.TRUE, xmlElementRefAnnotation.getRequired());
-		assertEquals(Boolean.TRUE, xmlElementRef.getSpecifiedRequired());
-		assertEquals(false, xmlElementRef.isDefaultRequired());
-		assertEquals(true, xmlElementRef.isRequired());
-
-		xmlElementRef.setSpecifiedRequired(null);
-		xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		assertNull(xmlElementRefAnnotation.getName());
-		assertNull(xmlElementRef.getSpecifiedRequired());
-		assertEquals(false, xmlElementRef.isDefaultRequired());
-		assertEquals(false, xmlElementRef.isRequired());
-	}
-
-	public void testUpdateRequired() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNull(xmlElementRef.getSpecifiedRequired());
-		assertEquals(false, xmlElementRef.isDefaultRequired());
-		assertEquals(false, xmlElementRef.isRequired());
-
-
-		//add a required member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefMappingTests.this.addXmlElementRefMemberValuePair(declaration, JAXB.XML_ELEMENT_REF__REQUIRED, true);
-			}
-		});
-		assertEquals(Boolean.TRUE, xmlElementRef.getSpecifiedRequired());
-		assertEquals(false, xmlElementRef.isDefaultRequired());
-		assertEquals(true, xmlElementRef.isRequired());
-
-		//remove the required member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementRefAnnotation = (NormalAnnotation) GenericJavaXmlElementRefMappingTests.this.getXmlElementRefAnnotation(declaration);
-				GenericJavaXmlElementRefMappingTests.this.values(xmlElementRefAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElementRef.getSpecifiedRequired());
-		assertEquals(false, xmlElementRef.isDefaultRequired());
-		assertEquals(false, xmlElementRef.isRequired());
-	}
-
-	public void testModifyType() throws Exception {
-		createTypeWithXmlElementRef();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		
-		assertNull(xmlElementRef.getSpecifiedType());
-		assertEquals("int", xmlElementRef.getType());
-		assertEquals("int", xmlElementRef.getDefaultType());
-		
-		xmlElementRef.setSpecifiedType("Foo");
-		assertEquals("Foo", xmlElementRef.getSpecifiedType());
-		assertEquals("Foo", xmlElementRef.getType());
-		
-		xmlElementRef.setSpecifiedType(null);
-		assertNull(xmlElementRef.getSpecifiedType());
-		assertEquals("int", xmlElementRef.getType());
-	}
-	
-	public void testUpdateType() throws Exception {
-		createTypeWithXmlElementRef();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		XmlElementRef xmlElementRef = xmlElementRefMapping.getXmlElementRef();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(xmlElementRef.getSpecifiedType());
-		assertEquals("int", xmlElementRef.getDefaultType());
-		assertEquals("int", xmlElementRef.getType());
-		
-		//add a Type member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefMappingTests.this.addXmlElementRefTypeMemberValuePair(declaration, JAXB.XML_ELEMENT_REF__TYPE, "Foo");
-			}
-		});
-		assertEquals("Foo", xmlElementRef.getSpecifiedType());
-		assertEquals("Foo", xmlElementRef.getType());
-		
-		//remove the Type member value pair
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation xmlElementRefAnnotation = (NormalAnnotation) GenericJavaXmlElementRefMappingTests.this.getXmlElementRefAnnotation(declaration);
-				GenericJavaXmlElementRefMappingTests.this.values(xmlElementRefAnnotation).remove(0);
-			}
-		});
-		assertNull(xmlElementRef.getSpecifiedType());
-		assertEquals("int", xmlElementRef.getType());
-	}
-
-	public void testChangeMappingType() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNotNull(xmlElementRefMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlAttributeMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ELEMENT_REF_ATTRIBUTE_MAPPING_KEY);
-		xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlElementRefMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-	}
-
-	public void testModifyXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlElementRefMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-		xmlElementRefMapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(xmlElementRefMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		xmlElementRefMapping.removeXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlElementRefMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-
-	public void testUpdateXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlElementRef();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlElementRefMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-
-		//add an XmlJavaTypeAdapter annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(xmlElementRefMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		//remove the XmlJavaTypeAdapter annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefMappingTests.this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlElementRefMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-
-	protected void addXmlElementRefMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlElementRefAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlElementRefMemberValuePair(ModifiedDeclaration declaration, String name, boolean value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlElementRefAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlElementRefTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlElementRefAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected Annotation getXmlElementRefAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_ELEMENT_REF);
-	}
-
-
-	public void testModifyXmlElementWrapper() throws Exception {
-		createTypeWithXmlElementRef();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(xmlElementRefMapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-		
-		xmlElementRefMapping.addXmlElementWrapper();
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNotNull(xmlElementRefMapping.getXmlElementWrapper());
-		assertNotNull(xmlElementWrapperAnnotation);
-		
-		xmlElementRefMapping.removeXmlElementWrapper();
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-	}
-	
-	public void testUpdateXmlElementRefWrapper() throws Exception {
-		createTypeWithXmlElementRef();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefMapping xmlElementRefMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlElementRefMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(xmlElementRefMapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-		
-		//add an XmlElementWrapper annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT_WRAPPER);
-			}
-		});
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNotNull(xmlElementRefMapping.getXmlElementWrapper());
-		assertNotNull(xmlElementWrapperAnnotation);
-		
-		//remove the XmlElementWrapper annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefMappingTests.this.removeAnnotation(declaration, JAXB.XML_ELEMENT_WRAPPER);
-			}
-		});
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(xmlElementRefMapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-	}
-	
-	public void testModifyXmlMixed() throws Exception {
-		createTypeWithXmlElementRef();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefMapping attributeMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlMixedAnnotation annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(attributeMapping.getXmlMixed());
-		assertNull(annotation);
-		
-		attributeMapping.addXmlMixed();
-		annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNotNull(attributeMapping.getXmlMixed());
-		assertNotNull(annotation);
-		
-		attributeMapping.removeXmlMixed();
-		annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(attributeMapping.getXmlMixed());
-		assertNull(annotation);
-	}
-	
-	public void testUpdateXmlMixed() throws Exception {
-		createTypeWithXmlElementRef();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefMapping attributeMapping = (XmlElementRefMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = attributeMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlMixedAnnotation annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(attributeMapping.getXmlMixed());
-		assertNull(annotation);
-		
-		//add an XmlMixed annotation
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementRefMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_MIXED);
-					}
-				});
-		annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNotNull(attributeMapping.getXmlMixed());
-		assertNotNull(annotation);
-		
-		//remove the XmlMixed annotation
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementRefMappingTests.this.removeAnnotation(declaration, JAXB.XML_MIXED);
-					}
-				});
-		annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(attributeMapping.getXmlMixed());
-		assertNull(annotation);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java
deleted file mode 100644
index 2d74ff09a3..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementRef;
-import org.eclipse.jpt.jaxb.core.context.XmlElementRefsMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefsAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlMixedAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-public class GenericJavaXmlElementRefsMappingTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaXmlElementRefsMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlElementRefs() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REFS);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRefs");
-			}
-		});
-	}
-	
-	protected Annotation getXmlElementRefsAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_ELEMENT_REFS);
-	}
-	
-	protected void addXmlElementRefsMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		addMemberValuePair((MarkerAnnotation) this.getXmlElementRefsAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlElementRefsMemberValuePair(ModifiedDeclaration declaration, String name, boolean value) {
-		addMemberValuePair((MarkerAnnotation) getXmlElementRefsAnnotation(declaration), name, value);
-	}
-
-	protected void addXmlElementRefsTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		addMemberValuePair(
-				(MarkerAnnotation) getXmlElementRefsAnnotation(declaration), 
-				name, 
-				newTypeLiteral(declaration.getAst(), typeName));
-	}
-	
-	
-	// ***** XmlElementRefs *****
-	
-	protected NormalAnnotation newXmlElementRefAnnotation(AST ast, String name) {
-		NormalAnnotation annotation = newNormalAnnotation(ast, JAXB.XML_ELEMENT_REF);
-		addMemberValuePair(annotation, JAXB.XML_ELEMENT_REF__NAME, name);
-		return annotation;
-	}
-	
-	protected void addXmlElementRef(ModifiedDeclaration declaration, int index, String name) {
-		NormalAnnotation arrayElement = newXmlElementRefAnnotation(declaration.getAst(), name);
-		addArrayElement(declaration, JAXB.XML_ELEMENT_REFS, index, JAXB.XML_ELEMENT_REFS__VALUE, arrayElement);		
-	}
-	
-	protected void moveXmlElementRef(ModifiedDeclaration declaration, int targetIndex, int sourceIndex) {
-		moveArrayElement((NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_ELEMENT_REFS), JAXB.XML_ELEMENT_REFS__VALUE, targetIndex, sourceIndex);
-	}
-	
-	protected void removeXmlElementRef(ModifiedDeclaration declaration, int index) {
-		removeArrayElement((NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_ELEMENT_REFS), JAXB.XML_ELEMENT_REFS__VALUE, index);
-	}
-	
-	public void testSyncXmlElementRefs() throws Exception {
-		createTypeWithXmlElementRefs();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		Iterable<XmlElementRef> xmlElementRefs = mapping.getXmlElementRefs().getXmlElementRefs();
-		assertTrue(CollectionTools.isEmpty(xmlElementRefs));
-		assertEquals(0, mapping.getXmlElementRefs().getXmlElementRefsSize());
-		
-		//add 2 XmlElementRef annotations
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementRefsMappingTests.this.addXmlElementRef(declaration, 0, "foo");
-						GenericJavaXmlElementRefsMappingTests.this.addXmlElementRef(declaration, 1, "bar");
-					}
-				});
-		
-		xmlElementRefs = mapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertFalse(CollectionTools.isEmpty(mapping.getXmlElementRefs().getXmlElementRefs()));
-		assertEquals(2, mapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("foo", CollectionTools.get(xmlElementRefs, 0).getQName().getName());
-		assertEquals("bar", CollectionTools.get(xmlElementRefs, 1).getQName().getName());
-		
-		// switch XmlElementRef annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementRefsMappingTests.this.moveXmlElementRef(declaration, 0, 1);
-					}
-				});
-		
-		xmlElementRefs = mapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertFalse(CollectionTools.isEmpty(mapping.getXmlElementRefs().getXmlElementRefs()));
-		assertEquals(2, mapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("bar", CollectionTools.get(xmlElementRefs, 0).getQName().getName());
-		assertEquals("foo", CollectionTools.get(xmlElementRefs, 1).getQName().getName());
-		
-		// remove XmlElementRef annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementRefsMappingTests.this.removeXmlElementRef(declaration, 1);
-						GenericJavaXmlElementRefsMappingTests.this.removeXmlElementRef(declaration, 0);
-					}
-				});
-		
-		xmlElementRefs = mapping.getXmlElementRefs().getXmlElementRefs();
-		
-		assertTrue(CollectionTools.isEmpty(xmlElementRefs));
-		assertEquals(0, mapping.getXmlElementRefs().getXmlElementRefsSize());
-	}
-
-	public void testModifyXmlElementRefs() throws Exception {
-		createTypeWithXmlElementRefs();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		XmlElementRefsAnnotation annotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		
-		Iterable<XmlElementRefAnnotation> annotations = annotation.getXmlElementRefs();
-		
-		assertEquals(0, annotation.getXmlElementRefsSize());
-		assertEquals(0, mapping.getXmlElementRefs().getXmlElementRefsSize());
-		
-		mapping.getXmlElementRefs().addXmlElementRef(0).getQName().setSpecifiedName("foo");
-		mapping.getXmlElementRefs().addXmlElementRef(1).getQName().setSpecifiedName("baz");
-		mapping.getXmlElementRefs().addXmlElementRef(1).getQName().setSpecifiedName("bar");
-		
-		annotations = annotation.getXmlElementRefs();
-		
-		assertEquals(3, annotation.getXmlElementRefsSize());
-		assertEquals(3, mapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("foo", CollectionTools.get(annotations, 0).getName());
-		assertEquals("bar", CollectionTools.get(annotations, 1).getName());
-		assertEquals("baz", CollectionTools.get(annotations, 2).getName());
-		
-		mapping.getXmlElementRefs().moveXmlElementRef(1, 2);
-		
-		annotations = annotation.getXmlElementRefs();
-		
-		assertEquals(3, annotation.getXmlElementRefsSize());
-		assertEquals(3, mapping.getXmlElementRefs().getXmlElementRefsSize());
-		assertEquals("foo", CollectionTools.get(annotations, 0).getName());
-		assertEquals("baz", CollectionTools.get(annotations, 1).getName());
-		assertEquals("bar", CollectionTools.get(annotations, 2).getName());
-		
-		mapping.getXmlElementRefs().removeXmlElementRef(2);
-		mapping.getXmlElementRefs().removeXmlElementRef(0);
-		mapping.getXmlElementRefs().removeXmlElementRef(0);
-		
-		assertEquals(0, annotation.getXmlElementRefsSize());
-		assertEquals(0, mapping.getXmlElementRefs().getXmlElementRefsSize());
-	}
-
-	public void testChangeMappingType() throws Exception {
-		createTypeWithXmlElementRefs();
-
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNotNull(mapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS));
-		
-		persistentAttribute.setMappingKey(MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlAttributeMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-		
-		persistentAttribute.setMappingKey(MappingKeys.XML_ELEMENT_REFS_ATTRIBUTE_MAPPING_KEY);
-		mapping = (XmlElementRefsMapping) persistentAttribute.getMapping();
-		assertNotNull(mapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-	}
-	
-	public void testModifyXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlElementRefs();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(mapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-		mapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(mapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		mapping.removeXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(mapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-
-	public void testUpdateXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlElementRefs();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(mapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-
-		//add an XmlJavaTypeAdapter annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefsMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(mapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		//remove the XmlJavaTypeAdapter annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefsMappingTests.this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(mapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-	
-	public void testModifyXmlElementWrapper() throws Exception {
-		createTypeWithXmlElementRefs();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(mapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-		
-		mapping.addXmlElementWrapper();
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNotNull(mapping.getXmlElementWrapper());
-		assertNotNull(xmlElementWrapperAnnotation);
-		
-		mapping.removeXmlElementWrapper();
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-	}
-	
-	public void testUpdateXmlElementWrapper() throws Exception {
-		createTypeWithXmlElementRefs();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(mapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-		
-		//add an XmlElementWrapper annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefsMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT_WRAPPER);
-			}
-		});
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNotNull(mapping.getXmlElementWrapper());
-		assertNotNull(xmlElementWrapperAnnotation);
-		
-		//remove the XmlElementWrapper annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlElementRefsMappingTests.this.removeAnnotation(declaration, JAXB.XML_ELEMENT_WRAPPER);
-			}
-		});
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(mapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-	}
-	
-	public void testModifyXmlMixed() throws Exception {
-		createTypeWithXmlElementRefs();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlMixedAnnotation annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(mapping.getXmlMixed());
-		assertNull(annotation);
-		
-		mapping.addXmlMixed();
-		annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNotNull(mapping.getXmlMixed());
-		assertNotNull(annotation);
-		
-		mapping.removeXmlMixed();
-		annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(mapping.getXmlMixed());
-		assertNull(annotation);
-	}
-
-	public void testUpdateXmlMixed() throws Exception {
-		createTypeWithXmlElementRefs();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlElementRefsMapping mapping = (XmlElementRefsMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlMixedAnnotation annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(mapping.getXmlMixed());
-		assertNull(annotation);
-		
-		//add an XmlMixed annotation
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementRefsMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_MIXED);
-					}
-				});
-		annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNotNull(mapping.getXmlMixed());
-		assertNotNull(annotation);
-		
-		//remove the XmlMixed annotation
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementRefsMappingTests.this.removeAnnotation(declaration, JAXB.XML_MIXED);
-					}
-				});
-		annotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertNull(mapping.getXmlMixed());
-		assertNull(annotation);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java
deleted file mode 100644
index 8b5d73cb67..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElement;
-import org.eclipse.jpt.jaxb.core.context.XmlElementsMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementsAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlIDREFAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-public class GenericJavaXmlElementsMappingTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaXmlElementsMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlElements() throws Exception {
-		return this.createTestType(
-				new DefaultAnnotationWriter() {
-					
-					@Override
-					public Iterator<String> imports() {
-						return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENTS);
-					}
-					
-					@Override
-					public void appendTypeAnnotationTo(StringBuilder sb) {
-						sb.append("@XmlType");
-					}
-					
-					@Override
-					public void appendIdFieldAnnotationTo(StringBuilder sb) {
-						sb.append("@XmlElements");
-					}
-				});
-	}
-	
-	
-	// ***** XmlElements *****
-	
-	protected NormalAnnotation newXmlElementAnnotation(AST ast, String name) {
-		NormalAnnotation annotation = newNormalAnnotation(ast, JAXB.XML_ELEMENT);
-		addMemberValuePair(annotation, JAXB.XML_ELEMENT__NAME, name);
-		return annotation;
-	}
-	
-	protected void addXmlElement(ModifiedDeclaration declaration, int index, String name) {
-		NormalAnnotation arrayElement = newXmlElementAnnotation(declaration.getAst(), name);
-		addArrayElement(declaration, JAXB.XML_ELEMENTS, index, JAXB.XML_ELEMENTS__VALUE, arrayElement);		
-	}
-	
-	protected void moveXmlElement(ModifiedDeclaration declaration, int targetIndex, int sourceIndex) {
-		moveArrayElement((NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_ELEMENTS), JAXB.XML_ELEMENTS__VALUE, targetIndex, sourceIndex);
-	}
-	
-	protected void removeXmlElement(ModifiedDeclaration declaration, int index) {
-		removeArrayElement((NormalAnnotation) declaration.getAnnotationNamed(JAXB.XML_ELEMENTS), JAXB.XML_ELEMENTS__VALUE, index);
-	}
-	
-	public void testSyncXmlElements() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementsMapping mapping = (XmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		Iterable<XmlElement> xmlElements = mapping.getXmlElements();
-		assertTrue(CollectionTools.isEmpty(xmlElements));
-		assertEquals(0, mapping.getXmlElementsSize());
-		
-		//add 2 XmlElement annotations
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.addXmlElement(declaration, 0, "foo");
-						GenericJavaXmlElementsMappingTests.this.addXmlElement(declaration, 1, "bar");
-					}
-				});
-		
-		xmlElements = mapping.getXmlElements();
-		
-		assertFalse(CollectionTools.isEmpty(mapping.getXmlElements()));
-		assertEquals(2, mapping.getXmlElementsSize());
-		assertEquals("foo", CollectionTools.get(xmlElements, 0).getQName().getName());
-		assertEquals("bar", CollectionTools.get(xmlElements, 1).getQName().getName());
-		
-		// switch XmlElement annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.moveXmlElement(declaration, 0, 1);
-					}
-				});
-		
-		xmlElements = mapping.getXmlElements();
-		
-		assertFalse(CollectionTools.isEmpty(mapping.getXmlElements()));
-		assertEquals(2, mapping.getXmlElementsSize());
-		assertEquals("bar", CollectionTools.get(xmlElements, 0).getQName().getName());
-		assertEquals("foo", CollectionTools.get(xmlElements, 1).getQName().getName());
-		
-		// remove XmlElement annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.removeXmlElement(declaration, 1);
-						GenericJavaXmlElementsMappingTests.this.removeXmlElement(declaration, 0);
-					}
-				});
-		
-		xmlElements = mapping.getXmlElements();
-		
-		assertTrue(CollectionTools.isEmpty(xmlElements));
-		assertEquals(0, mapping.getXmlElementsSize());
-	}
-
-	public void testModifyXmlElements() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementsMapping mapping = (XmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		XmlElementsAnnotation xmlElementsAnnotation = (XmlElementsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENTS);
-		
-		Iterable<XmlElementAnnotation> xmlElementAnnotations = xmlElementsAnnotation.getXmlElements();
-		
-		assertEquals(0, xmlElementsAnnotation.getXmlElementsSize());
-		assertEquals(0, mapping.getXmlElementsSize());
-		
-		mapping.addXmlElement(0).getQName().setSpecifiedName("foo");
-		mapping.addXmlElement(1).getQName().setSpecifiedName("baz");
-		mapping.addXmlElement(1).getQName().setSpecifiedName("bar");
-		
-		xmlElementAnnotations = xmlElementsAnnotation.getXmlElements();
-		
-		assertEquals(3, xmlElementsAnnotation.getXmlElementsSize());
-		assertEquals(3, mapping.getXmlElementsSize());
-		assertEquals("foo", CollectionTools.get(xmlElementAnnotations, 0).getName());
-		assertEquals("bar", CollectionTools.get(xmlElementAnnotations, 1).getName());
-		assertEquals("baz", CollectionTools.get(xmlElementAnnotations, 2).getName());
-		
-		mapping.moveXmlElement(1, 2);
-		
-		xmlElementAnnotations = xmlElementsAnnotation.getXmlElements();
-		
-		assertEquals(3, xmlElementsAnnotation.getXmlElementsSize());
-		assertEquals(3, mapping.getXmlElementsSize());
-		assertEquals("foo", CollectionTools.get(xmlElementAnnotations, 0).getName());
-		assertEquals("baz", CollectionTools.get(xmlElementAnnotations, 1).getName());
-		assertEquals("bar", CollectionTools.get(xmlElementAnnotations, 2).getName());
-		
-		mapping.removeXmlElement(2);
-		mapping.removeXmlElement(0);
-		mapping.removeXmlElement(0);
-		
-		assertEquals(0, xmlElementsAnnotation.getXmlElementsSize());
-		assertEquals(0, mapping.getXmlElementsSize());
-	}
-	
-	public void testModifyXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementsMapping mapping = (XmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		
-		assertNull(mapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-		
-		mapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(mapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-		
-		mapping.removeXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		
-		assertNull(mapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-	
-	public void testUpdateXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementsMapping mapping = (XmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		
-		assertNull(mapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-		
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_JAVA_TYPE_ADAPTER);
-					}
-				});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		
-		assertNotNull(mapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-		
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);
-					}
-				});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		
-		assertNull(mapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-	
-	public void testModifyXmlElementWrapper() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementsMapping mapping = (XmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		
-		assertNull(mapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-		
-		mapping.addXmlElementWrapper();
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		
-		assertNotNull(mapping.getXmlElementWrapper());
-		assertNotNull(xmlElementWrapperAnnotation);
-		
-		mapping.removeXmlElementWrapper();
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		
-		assertNull(mapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-	}
-
-	public void testUpdateXmlElementWrapper() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementsMapping mapping = (XmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		
-		assertNull(mapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-		
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ELEMENT_WRAPPER);
-					}
-				});
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		
-		assertNotNull(mapping.getXmlElementWrapper());
-		assertNotNull(xmlElementWrapperAnnotation);
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(
-					ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.removeAnnotation(declaration, JAXB.XML_ELEMENT_WRAPPER);
-					}
-				});
-		xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		
-		assertNull(mapping.getXmlElementWrapper());
-		assertNull(xmlElementWrapperAnnotation);
-	}
-
-	public void testModifyXmlIDREF() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementsMapping mapping = (XmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlIDREFAnnotation xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		
-		assertNull(mapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-		
-		mapping.addXmlIDREF();
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		
-		assertNotNull(mapping.getXmlIDREF());
-		assertNotNull(xmlIDREFAnnotation);
-		
-		mapping.removeXmlIDREF();
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		
-		assertNull(mapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-	}
-	
-	public void testUpdateXmlIDREF() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlElementsMapping mapping = (XmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		XmlIDREFAnnotation xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		
-		assertNull(mapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-		
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_IDREF);
-					}
-				});
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		
-		assertNotNull(mapping.getXmlIDREF());
-		assertNotNull(xmlIDREFAnnotation);
-		
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						GenericJavaXmlElementsMappingTests.this.removeAnnotation(declaration, JAXB.XML_IDREF);
-					}
-				});
-		xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		
-		assertNull(mapping.getXmlIDREF());
-		assertNull(xmlIDREFAnnotation);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java
deleted file mode 100644
index c4382408a0..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.beans.Introspector;
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlRootElement;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaXmlRootElementTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaXmlRootElementTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTypeWithXmlTypeWithXmlRootElement() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ROOT_ELEMENT);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType").append(CR);
-				sb.append("@XmlRootElement").append(CR);
-			}
-		});
-	}
-
-	
-	public void testModifyNamespace() throws Exception {
-		createTypeWithXmlTypeWithXmlRootElement();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlRootElement contextRootElement = classMapping.getXmlRootElement();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(contextRootElement.getQName().getSpecifiedNamespace());
-		assertEquals("", contextRootElement.getQName().getDefaultNamespace());
-		assertEquals("", contextRootElement.getQName().getNamespace());
-		
-		contextRootElement.getQName().setSpecifiedNamespace("foo");
-		XmlRootElementAnnotation rootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertEquals("foo", rootElementAnnotation.getNamespace());
-		assertEquals("foo", contextRootElement.getQName().getSpecifiedNamespace());
-		assertEquals("foo", contextRootElement.getQName().getNamespace());
-		
-		contextRootElement.getQName().setSpecifiedNamespace(null);
-		rootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertNull(rootElementAnnotation.getNamespace());
-		assertNull(contextRootElement.getQName().getSpecifiedNamespace());
-		assertEquals("", contextRootElement.getQName().getNamespace());
-	}
-	
-	public void testUpdateNamespace() throws Exception {
-		createTypeWithXmlTypeWithXmlRootElement();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlRootElement contextRootElement = classMapping.getXmlRootElement();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertNull(contextRootElement.getQName().getSpecifiedNamespace());
-		assertEquals("", contextRootElement.getQName().getDefaultNamespace());
-		assertEquals("", contextRootElement.getQName().getNamespace());
-		
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlRootElementTests.this.addXmlRootElementMemberValuePair(declaration, JAXB.XML_ROOT_ELEMENT__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", contextRootElement.getQName().getSpecifiedNamespace());
-		assertEquals("foo", contextRootElement.getQName().getNamespace());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlRootElementTests.this.removeAnnotation(declaration, JAXB.XML_ROOT_ELEMENT);
-			}
-		});
-		assertNull(classMapping.getXmlRootElement());
-	}
-
-	public void testModifyName() throws Exception {
-		createTypeWithXmlTypeWithXmlRootElement();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlRootElement contextRootElement = classMapping.getXmlRootElement();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		String defaultName = Introspector.decapitalize(TYPE_NAME);
-		
-		assertNull(contextRootElement.getQName().getSpecifiedName());
-		assertEquals(defaultName, contextRootElement.getQName().getDefaultName());
-		assertEquals(defaultName, contextRootElement.getQName().getName());
-		
-		contextRootElement.getQName().setSpecifiedName("foo");
-		XmlRootElementAnnotation rootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertEquals("foo", rootElementAnnotation.getName());
-		assertEquals("foo", contextRootElement.getQName().getSpecifiedName());
-		assertEquals("foo", contextRootElement.getQName().getName());
-		
-		contextRootElement.getQName().setSpecifiedName(null);
-		rootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertNull(rootElementAnnotation.getName());
-		assertNull(contextRootElement.getQName().getSpecifiedName());
-		assertEquals(defaultName, contextRootElement.getQName().getName());
-	}
-	
-	public void testUpdateName() throws Exception {
-		createTypeWithXmlTypeWithXmlRootElement();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlRootElement contextRootElement = classMapping.getXmlRootElement();
-		JavaResourceAbstractType resourceType = jaxbClass.getJavaResourceType();
-		String defaultName = Introspector.decapitalize(TYPE_NAME);
-		
-		assertNull(contextRootElement.getQName().getSpecifiedName());
-		assertEquals(defaultName, contextRootElement.getQName().getDefaultName());
-		assertEquals(defaultName, contextRootElement.getQName().getName());
-		
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlRootElementTests.this.addXmlRootElementMemberValuePair(declaration, JAXB.XML_ROOT_ELEMENT__NAME, "foo");
-			}
-		});
-		assertEquals("foo", contextRootElement.getQName().getSpecifiedName());
-		assertEquals("foo", contextRootElement.getQName().getName());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlRootElementTests.this.removeAnnotation(declaration, JAXB.XML_ROOT_ELEMENT);
-			}
-		});
-		assertNull(classMapping.getXmlRootElement());
-	}
-
-	protected void addXmlRootElementMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlRootElementAnnotation(declaration), name, value);
-	}
-
-	protected Annotation getXmlRootElementAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_ROOT_ELEMENT);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java
deleted file mode 100644
index 05f0a4c3a3..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java
+++ /dev/null
@@ -1,669 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.ListIterator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
-import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
-import org.eclipse.jpt.jaxb.core.context.XmlNs;
-import org.eclipse.jpt.jaxb.core.context.XmlNsForm;
-import org.eclipse.jpt.jaxb.core.context.XmlSchema;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlNsAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
-{
-	
-	public GenericJavaXmlSchemaTests(String name) {
-		super(name);
-	}
-	
-	private ICompilationUnit createPackageInfoWithXmlSchema() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchema",
-				JAXB.XML_SCHEMA);
-	}
-	
-	private ICompilationUnit createPackageInfoWithAccessorType() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlAccessorType(value = XmlAccessType.PROPERTY)",
-				JAXB.XML_ACCESS_TYPE, JAXB.XML_ACCESSOR_TYPE);
-	}
-	
-	public void testModifyNamespace() throws Exception {
-		createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-		
-		assertEquals("", contextXmlSchema.getNamespace());
-		assertNull(contextXmlSchema.getSpecifiedNamespace());
-		
-		contextXmlSchema.setSpecifiedNamespace("foo");
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals("foo", schemaAnnotation.getNamespace());
-		assertEquals("foo", contextXmlSchema.getNamespace());
-		assertEquals("foo", contextXmlSchema.getSpecifiedNamespace());
-		
-		 //set another annotation so the context model is not blown away by removing the XmlSchema annotation
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD);
-		contextXmlSchema.setSpecifiedNamespace(null);
-		schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertNull(schemaAnnotation.getNamespace());
-		assertEquals("", contextXmlSchema.getNamespace());
-		assertNull(contextXmlSchema.getSpecifiedNamespace());
-		
-		//set namespace again, this time starting with no XmlSchema annotation
-		contextXmlSchema.setSpecifiedNamespace("foo");
-		schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals("foo", schemaAnnotation.getNamespace());
-		assertEquals("foo", contextXmlSchema.getSpecifiedNamespace());
-		assertEquals("foo", contextXmlSchema.getNamespace());
-	}
-	
-	public void testUpdateNamespace() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-		
-		assertEquals("", contextXmlSchema.getNamespace());
-		assertNull(contextXmlSchema.getSpecifiedNamespace());
-		
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.addXmlSchemaMemberValuePair(declaration, JAXB.XML_SCHEMA__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", contextXmlSchema.getNamespace());
-		assertEquals("foo", contextXmlSchema.getSpecifiedNamespace());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.removeXmlSchemaAnnotation(declaration);
-			}
-		});
-		contextXmlSchema = contextPackageInfo.getXmlSchema();
-		assertEquals("", contextXmlSchema.getNamespace());
-		assertNull(contextXmlSchema.getSpecifiedNamespace());
-	}
-	
-	public void testModifyLocation() throws Exception {
-		createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-	
-		assertNull(contextXmlSchema.getLocation());
-		
-		contextXmlSchema.setLocation("foo");
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals("foo", schemaAnnotation.getLocation());
-		assertEquals("foo", contextXmlSchema.getLocation());
-		
-		 //set another annotation so the context model is not blown away by removing the XmlSchema annotation
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD);
-		contextXmlSchema.setLocation(null);
-		schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertNull(schemaAnnotation.getLocation());
-		assertNull(contextXmlSchema.getLocation());
-
-		//set location again, this time starting with no XmlSchema annotation
-		contextXmlSchema.setLocation("foo");
-		schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals("foo", schemaAnnotation.getLocation());
-		assertEquals("foo", contextXmlSchema.getLocation());
-	}
-	
-	public void testUpdateLocation() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlSchema.getLocation());
-		
-		//add a location member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.addXmlSchemaMemberValuePair(declaration, JAXB.XML_SCHEMA__LOCATION, "foo");
-			}
-		});
-
-		assertEquals("foo", contextXmlSchema.getLocation());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.removeXmlSchemaAnnotation(declaration);
-			}
-		});
-		contextXmlSchema = contextPackageInfo.getXmlSchema();
-		assertNull(contextXmlSchema.getLocation());
-	}
-	
-	public void testModifyAttributeFormDefault() throws Exception {
-		createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-		
-		assertNull(contextXmlSchema.getSpecifiedAttributeFormDefault());
-		assertEquals(XmlNsForm.UNSET, contextXmlSchema.getAttributeFormDefault());
-		
-		contextXmlSchema.setSpecifiedAttributeFormDefault(XmlNsForm.QUALIFIED);
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.QUALIFIED, schemaAnnotation.getAttributeFormDefault());
-		assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getAttributeFormDefault());
-		
-		contextXmlSchema.setSpecifiedAttributeFormDefault(XmlNsForm.UNQUALIFIED);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.UNQUALIFIED, schemaAnnotation.getAttributeFormDefault());
-		assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getAttributeFormDefault());
-		
-		 //set another annotation so the context model is not blown away by removing the XmlSchema annotation
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD);
-		contextXmlSchema.setSpecifiedAttributeFormDefault(null);
-		schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertNull(schemaAnnotation.getAttributeFormDefault());
-		assertNull(contextXmlSchema.getSpecifiedAttributeFormDefault());
-		
-		//set attribute form default again, this time starting with no XmlSchema annotation
-		contextXmlSchema.setSpecifiedAttributeFormDefault(XmlNsForm.QUALIFIED);
-		schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.QUALIFIED, schemaAnnotation.getAttributeFormDefault());
-		assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getAttributeFormDefault());
-	}
-	
-	public void testUpdateAttributeFormDefault() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-		
-		assertNull(contextXmlSchema.getSpecifiedAttributeFormDefault());
-		assertEquals(XmlNsForm.UNSET, contextXmlSchema.getAttributeFormDefault());
-		
-		//set the attribute form default value to QUALIFIED
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.addXmlSchemaEnumMemberValuePair(
-					declaration,
-					JAXB.XML_SCHEMA__ATTRIBUTE_FORM_DEFAULT, 
-					JAXB.XML_NS_FORM__QUALIFIED);
-			}
-		});
-		
-		assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getSpecifiedAttributeFormDefault());
-		assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getAttributeFormDefault());
-		
-		//set the attribute form default value to UNQUALIFIED
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.setXmlSchemaEnumMemberValuePair(
-					declaration,
-					JAXB.XML_SCHEMA__ATTRIBUTE_FORM_DEFAULT, 
-					JAXB.XML_NS_FORM__UNQUALIFIED);
-			}
-		});
-
-		assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getSpecifiedAttributeFormDefault());
-		assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getAttributeFormDefault());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.removeXmlSchemaAnnotation(declaration);
-			}
-		});
-		
-		contextXmlSchema = contextPackageInfo.getXmlSchema();
-		assertNull(contextXmlSchema.getSpecifiedAttributeFormDefault());
-		assertEquals(XmlNsForm.UNSET, contextXmlSchema.getAttributeFormDefault());
-	}
-	
-	public void testModifyElementFormDefault() throws Exception {
-		createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-		
-		assertNull(contextXmlSchema.getSpecifiedElementFormDefault());
-		assertEquals(XmlNsForm.UNSET, contextXmlSchema.getElementFormDefault());
-		
-		contextXmlSchema.setSpecifiedElementFormDefault(XmlNsForm.QUALIFIED);
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.QUALIFIED, schemaAnnotation.getElementFormDefault());
-		assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getElementFormDefault());
-		
-		contextXmlSchema.setSpecifiedElementFormDefault(XmlNsForm.UNQUALIFIED);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.UNQUALIFIED, schemaAnnotation.getElementFormDefault());
-		assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getElementFormDefault());
-		
-		 //set another annotation so the context model is not blown away by removing the XmlSchema annotation
-		contextPackageInfo.setSpecifiedAccessType(XmlAccessType.FIELD);
-		contextXmlSchema.setSpecifiedElementFormDefault(null);
-		schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertNull(schemaAnnotation.getElementFormDefault());
-		assertNull(contextXmlSchema.getSpecifiedElementFormDefault());
-		
-		//set element form default again, this time starting with no XmlSchema annotation
-		contextXmlSchema.setSpecifiedElementFormDefault(XmlNsForm.QUALIFIED);
-		schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals(org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm.QUALIFIED, schemaAnnotation.getElementFormDefault());
-		assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getElementFormDefault());
-	}
-	
-	public void testUpdateElementFormDefault() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlSchema.getSpecifiedElementFormDefault());
-		assertEquals(XmlNsForm.UNSET, contextXmlSchema.getElementFormDefault());
-		
-		//set the element form default value to QUALIFIED
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.addXmlSchemaEnumMemberValuePair(
-					declaration,
-					JAXB.XML_SCHEMA__ELEMENT_FORM_DEFAULT, 
-					JAXB.XML_NS_FORM__QUALIFIED);
-			}
-		});
-		
-		assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getSpecifiedElementFormDefault());
-		assertEquals(XmlNsForm.QUALIFIED, contextXmlSchema.getElementFormDefault());
-		
-		//set the element form default value to UNQUALIFIED
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.setXmlSchemaEnumMemberValuePair(
-					declaration,
-					JAXB.XML_SCHEMA__ELEMENT_FORM_DEFAULT, 
-					JAXB.XML_NS_FORM__UNQUALIFIED);
-			}
-		});
-		
-		assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getSpecifiedElementFormDefault());
-		assertEquals(XmlNsForm.UNQUALIFIED, contextXmlSchema.getElementFormDefault());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.removeXmlSchemaAnnotation(declaration);
-			}
-		});
-		
-		contextXmlSchema = contextPackageInfo.getXmlSchema();
-		assertNull(contextXmlSchema.getSpecifiedElementFormDefault());
-		assertEquals(XmlNsForm.UNSET, contextXmlSchema.getElementFormDefault());
-	}
-	
-	public void testGetXmlNsPrefixes() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		ListIterable<XmlNs> xmlNsPrefixes = contextXmlSchema.getXmlNsPrefixes();
-		assertFalse(xmlNsPrefixes.iterator().hasNext());
-
-		//add 2 XmlNs prefixes
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.addXmlNs(declaration, 0, "bar", "barPrefix");
-				GenericJavaXmlSchemaTests.this.addXmlNs(declaration, 1, "foo", "fooPrefix");
-			}
-		});
-
-		xmlNsPrefixes = contextXmlSchema.getXmlNsPrefixes();
-		ListIterator<XmlNs> xmlNsPrefixesIterator = xmlNsPrefixes.iterator();
-		assertTrue(xmlNsPrefixesIterator.hasNext());
-		XmlNs xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("bar", xmlNsPref.getNamespaceURI());
-		assertEquals("barPrefix", xmlNsPref.getPrefix());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("foo", xmlNsPref.getNamespaceURI());
-		assertEquals("fooPrefix", xmlNsPref.getPrefix());
-		assertFalse(xmlNsPrefixesIterator.hasNext());
-	}
-	
-	protected void addXmlNs(ModifiedDeclaration declaration, int index, String namespaceURI, String prefix) {
-		NormalAnnotation arrayElement = this.newXmlNsAnnotation(declaration.getAst(), namespaceURI, prefix);
-		this.addArrayElement(declaration, JAXB.XML_SCHEMA, index, JAXB.XML_SCHEMA__XMLNS, arrayElement);		
-	}
-
-	protected NormalAnnotation newXmlNsAnnotation(AST ast, String namespaceURI, String prefix) {
-		NormalAnnotation annotation = this.newNormalAnnotation(ast, JAXB.XML_NS);
-		this.addMemberValuePair(annotation, JAXB.XML_NS__NAMESPACE_URI, namespaceURI);
-		this.addMemberValuePair(annotation, JAXB.XML_NS__PREFIX, prefix);
-		return annotation;
-	}
-
-	public void testGetXmlNsPrexiesSize() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertEquals(0, contextXmlSchema.getXmlNsPrefixesSize());
-
-		//add 2 XmlNs prefixes
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.addXmlNs(declaration, 0, "bar", "barPrefix");
-				GenericJavaXmlSchemaTests.this.addXmlNs(declaration, 1, "foo", "fooPrefix");
-			}
-		});
-		assertEquals(2, contextXmlSchema.getXmlNsPrefixesSize());
-	}
-
-	public void testAddXmlNsPrefix() throws Exception {
-		//create a package info with an annotation other than XmlSchema to test
-		//adding things to the null schema annotation
-		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		XmlNs xmlNsPrefix = contextXmlSchema.addXmlNsPrefix(0);
-		xmlNsPrefix.setNamespaceURI("bar");
-		xmlNsPrefix.setPrefix("barPrefix");
-		xmlNsPrefix = contextXmlSchema.addXmlNsPrefix(0);
-		xmlNsPrefix.setNamespaceURI("foo");
-		xmlNsPrefix.setPrefix("fooPrefix");
-		xmlNsPrefix = contextXmlSchema.addXmlNsPrefix(0);
-		xmlNsPrefix.setNamespaceURI("baz");
-		xmlNsPrefix.setPrefix("bazPrefix");
-
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		ListIterator<XmlNsAnnotation> xmlNsPrefixes = schemaAnnotation.getXmlns().iterator();
-
-		XmlNsAnnotation xmlNsAnnotation = xmlNsPrefixes.next();
-		assertEquals("baz", xmlNsAnnotation.getNamespaceURI());
-		assertEquals("bazPrefix", xmlNsAnnotation.getPrefix());
-		xmlNsAnnotation = xmlNsPrefixes.next();
-		assertEquals("foo", xmlNsAnnotation.getNamespaceURI());
-		assertEquals("fooPrefix", xmlNsAnnotation.getPrefix());
-		xmlNsAnnotation = xmlNsPrefixes.next();
-		assertEquals("bar", xmlNsAnnotation.getNamespaceURI());
-		assertEquals("barPrefix", xmlNsAnnotation.getPrefix());
-		assertFalse(xmlNsPrefixes.hasNext());
-	}
-
-	public void testAddXmlNsPrefix2() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		XmlNs xmlNsPrefix = contextXmlSchema.addXmlNsPrefix(0);
-		xmlNsPrefix.setNamespaceURI("bar");
-		xmlNsPrefix.setPrefix("barPrefix");
-		xmlNsPrefix = contextXmlSchema.addXmlNsPrefix(1);
-		xmlNsPrefix.setNamespaceURI("foo");
-		xmlNsPrefix.setPrefix("fooPrefix");
-		xmlNsPrefix = contextXmlSchema.addXmlNsPrefix(0);
-		xmlNsPrefix.setNamespaceURI("baz");
-		xmlNsPrefix.setPrefix("bazPrefix");
-
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		ListIterator<XmlNsAnnotation> xmlNsPrefixes = schemaAnnotation.getXmlns().iterator();
-
-		XmlNsAnnotation xmlNsAnnotation = xmlNsPrefixes.next();
-		assertEquals("baz", xmlNsAnnotation.getNamespaceURI());
-		assertEquals("bazPrefix", xmlNsAnnotation.getPrefix());
-		xmlNsAnnotation = xmlNsPrefixes.next();
-		assertEquals("bar", xmlNsAnnotation.getNamespaceURI());
-		assertEquals("barPrefix", xmlNsAnnotation.getPrefix());
-		xmlNsAnnotation = xmlNsPrefixes.next();
-		assertEquals("foo", xmlNsAnnotation.getNamespaceURI());
-		assertEquals("fooPrefix", xmlNsAnnotation.getPrefix());
-		assertFalse(xmlNsPrefixes.hasNext());
-	}
-
-	public void testRemoveXmlNsPrefix() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextXmlSchema.addXmlNsPrefix(0).setNamespaceURI("bar");
-		contextXmlSchema.addXmlNsPrefix(1).setNamespaceURI("foo");
-		contextXmlSchema.addXmlNsPrefix(2).setNamespaceURI("baz");
-
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-		assertEquals(3, schemaAnnotation.getXmlnsSize());
-
-		contextXmlSchema.removeXmlNsPrefix(1);
-
-		ListIterator<XmlNsAnnotation> xmlNsPrefixes = schemaAnnotation.getXmlns().iterator();
-		assertEquals("bar", xmlNsPrefixes.next().getNamespaceURI());		
-		assertEquals("baz", xmlNsPrefixes.next().getNamespaceURI());
-		assertFalse(xmlNsPrefixes.hasNext());
-
-		contextXmlSchema.removeXmlNsPrefix(1);
-		xmlNsPrefixes = schemaAnnotation.getXmlns().iterator();
-		assertEquals("bar", xmlNsPrefixes.next().getNamespaceURI());
-		assertFalse(xmlNsPrefixes.hasNext());
-
-		contextXmlSchema.removeXmlNsPrefix(0);
-		xmlNsPrefixes = schemaAnnotation.getXmlns().iterator();
-		assertFalse(xmlNsPrefixes.hasNext());
-	}
-
-	public void testMoveXmlNsPrefix() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		contextXmlSchema.addXmlNsPrefix(0).setNamespaceURI("bar");
-		contextXmlSchema.addXmlNsPrefix(1).setNamespaceURI("foo");
-		contextXmlSchema.addXmlNsPrefix(2).setNamespaceURI("baz");
-
-
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) resourcePackage.getAnnotation(JAXB.XML_SCHEMA);
-
-		assertEquals(3, schemaAnnotation.getXmlnsSize());		
-
-		contextXmlSchema.moveXmlNsPrefix(2, 0);
-		ListIterator<XmlNs> xmlNsPrefixes = contextXmlSchema.getXmlNsPrefixes().iterator();
-		assertEquals("foo", xmlNsPrefixes.next().getNamespaceURI());
-		assertEquals("baz", xmlNsPrefixes.next().getNamespaceURI());
-		assertEquals("bar", xmlNsPrefixes.next().getNamespaceURI());		
-		assertFalse(xmlNsPrefixes.hasNext());
-
-		ListIterator<XmlNsAnnotation> xmlNsAnnotations = schemaAnnotation.getXmlns().iterator();
-		assertEquals("foo", xmlNsAnnotations.next().getNamespaceURI());
-		assertEquals("baz", xmlNsAnnotations.next().getNamespaceURI());
-		assertEquals("bar", xmlNsAnnotations.next().getNamespaceURI());
-
-
-		contextXmlSchema.moveXmlNsPrefix(0, 1);
-		xmlNsPrefixes = contextXmlSchema.getXmlNsPrefixes().iterator();
-		assertEquals("baz", xmlNsPrefixes.next().getNamespaceURI());
-		assertEquals("foo", xmlNsPrefixes.next().getNamespaceURI());
-		assertEquals("bar", xmlNsPrefixes.next().getNamespaceURI());		
-		assertFalse(xmlNsPrefixes.hasNext());
-
-		xmlNsAnnotations = schemaAnnotation.getXmlns().iterator();
-		assertEquals("baz", xmlNsAnnotations.next().getNamespaceURI());
-		assertEquals("foo", xmlNsAnnotations.next().getNamespaceURI());
-		assertEquals("bar", xmlNsAnnotations.next().getNamespaceURI());
-	}
-
-	public void testSyncXmlNsPrefixes() throws Exception {
-		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		ListIterable<XmlNs> xmlNsPrefixes = contextXmlSchema.getXmlNsPrefixes();
-		assertFalse(xmlNsPrefixes.iterator().hasNext());
-
-		//add 3 XmlNs prefixes
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.addXmlNs(declaration, 0, "bar", "barPrefix");
-				GenericJavaXmlSchemaTests.this.addXmlNs(declaration, 1, "foo", "fooPrefix");
-				GenericJavaXmlSchemaTests.this.addXmlNs(declaration, 2, "baz", "bazPrefix");
-			}
-		});
-
-		xmlNsPrefixes = contextXmlSchema.getXmlNsPrefixes();
-		ListIterator<XmlNs> xmlNsPrefixesIterator = xmlNsPrefixes.iterator();
-		assertTrue(xmlNsPrefixesIterator.hasNext());
-		XmlNs xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("bar", xmlNsPref.getNamespaceURI());
-		assertEquals("barPrefix", xmlNsPref.getPrefix());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("foo", xmlNsPref.getNamespaceURI());
-		assertEquals("fooPrefix", xmlNsPref.getPrefix());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("baz", xmlNsPref.getNamespaceURI());
-		assertEquals("bazPrefix", xmlNsPref.getPrefix());
-		assertFalse(xmlNsPrefixesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.moveXmlNsPrefix(declaration, 2, 0);
-			}
-		});
-
-		xmlNsPrefixesIterator = xmlNsPrefixes.iterator();
-		assertTrue(xmlNsPrefixesIterator.hasNext());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("foo", xmlNsPref.getNamespaceURI());
-		assertEquals("fooPrefix", xmlNsPref.getPrefix());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("baz", xmlNsPref.getNamespaceURI());
-		assertEquals("bazPrefix", xmlNsPref.getPrefix());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("bar", xmlNsPref.getNamespaceURI());
-		assertEquals("barPrefix", xmlNsPref.getPrefix());
-		assertFalse(xmlNsPrefixesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.moveXmlNsPrefix(declaration, 0, 1);
-			}
-		});
-
-		xmlNsPrefixesIterator = xmlNsPrefixes.iterator();
-		assertTrue(xmlNsPrefixesIterator.hasNext());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("baz", xmlNsPref.getNamespaceURI());
-		assertEquals("bazPrefix", xmlNsPref.getPrefix());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("foo", xmlNsPref.getNamespaceURI());
-		assertEquals("fooPrefix", xmlNsPref.getPrefix());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("bar", xmlNsPref.getNamespaceURI());
-		assertEquals("barPrefix", xmlNsPref.getPrefix());
-		assertFalse(xmlNsPrefixesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.removeXmlNsPrefix(declaration, 1);
-			}
-		});
-
-		xmlNsPrefixesIterator = xmlNsPrefixes.iterator();
-		assertTrue(xmlNsPrefixesIterator.hasNext());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("baz", xmlNsPref.getNamespaceURI());
-		assertEquals("bazPrefix", xmlNsPref.getPrefix());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("bar", xmlNsPref.getNamespaceURI());
-		assertEquals("barPrefix", xmlNsPref.getPrefix());
-		assertFalse(xmlNsPrefixesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.removeXmlNsPrefix(declaration, 1);
-			}
-		});
-
-		xmlNsPrefixesIterator = xmlNsPrefixes.iterator();
-		assertTrue(xmlNsPrefixesIterator.hasNext());
-		xmlNsPref = xmlNsPrefixesIterator.next();
-		assertEquals("baz", xmlNsPref.getNamespaceURI());
-		assertEquals("bazPrefix", xmlNsPref.getPrefix());
-		assertFalse(xmlNsPrefixesIterator.hasNext());
-
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTests.this.removeXmlNsPrefix(declaration, 0);
-			}
-		});
-
-		xmlNsPrefixesIterator = xmlNsPrefixes.iterator();
-		assertFalse(xmlNsPrefixesIterator.hasNext());
-	}
-
-	protected void addXmlSchemaEnumMemberValuePair(ModifiedDeclaration declaration, String elementName, String value) {
-		this.addEnumMemberValuePair((MarkerAnnotation) this.getXmlSchemaAnnotation(declaration), elementName, value);
-	}
-
-	protected void setXmlSchemaEnumMemberValuePair(ModifiedDeclaration declaration, String elementName, String enumValue) {
-		this.setEnumMemberValuePair((NormalAnnotation) this.getXmlSchemaAnnotation(declaration), elementName, enumValue);
-	}
-
-	protected void addXmlSchemaMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlSchemaAnnotation(declaration), name, value);
-	}
-
-	//add another package annotation so that the context model object doesn't get removed when 
-	//removing the XmlSchema annotation. Only "annotated" packages are added to the context model
-	protected void removeXmlSchemaAnnotation(ModifiedDeclaration declaration) {
-		this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ACCESSOR_ORDER);
-		this.removeAnnotation(declaration, JAXB.XML_SCHEMA);
-	}
-
-	protected Annotation getXmlSchemaAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_SCHEMA);
-	}
-
-	protected void moveXmlNsPrefix(ModifiedDeclaration declaration, int targetIndex, int sourceIndex) {
-		this.moveArrayElement((NormalAnnotation) getXmlSchemaAnnotation(declaration), JAXB.XML_SCHEMA__XMLNS, targetIndex, sourceIndex);
-	}
-
-	protected void removeXmlNsPrefix(ModifiedDeclaration declaration, int index) {
-		this.removeArrayElement((NormalAnnotation) getXmlSchemaAnnotation(declaration), JAXB.XML_SCHEMA__XMLNS, index);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java
deleted file mode 100644
index 412482cabb..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
-import org.eclipse.jpt.jaxb.core.context.XmlSchemaType;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-import org.eclipse.xsd.util.XSDUtil;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
-{
-	
-	public GenericJavaXmlSchemaTypeTests(String name) {
-		super(name);
-	}
-	
-	private ICompilationUnit createPackageInfoWithXmlSchemaType() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchemaType",
-				JAXB.XML_SCHEMA_TYPE);
-	}
-	
-	public void testModifyName() throws Exception {
-		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlSchemaType.getQName().getName());
-		
-		contextXmlSchemaType.getQName().setSpecifiedName("foo");
-		XmlSchemaTypeAnnotation schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertEquals("foo", schemaTypeAnnotation.getName());
-		assertEquals("foo", contextXmlSchemaType.getQName().getName());
-		
-		 //verify the xml schema type annotation is not removed when the name is set to null
-		contextXmlSchemaType.getQName().setSpecifiedName(null);
-		schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(schemaTypeAnnotation.getName());
-		assertNull(contextXmlSchemaType.getQName().getName());
-	}
-	
-	public void testUpdateName() throws Exception {
-		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlSchemaType.getQName().getName());
-		
-		//add a name member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTypeTests.this.addXmlSchemaTypeMemberValuePair(declaration, JAXB.XML_SCHEMA_TYPE__NAME, "foo");
-			}
-		});
-		assertEquals("foo", contextXmlSchemaType.getQName().getName());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTypeTests.this.removeXmlSchemaTypeAnnotation(declaration);
-			}
-		});
-		assertFalse(contextPackageInfo.getXmlSchemaTypes().iterator().hasNext());
-	}
-	
-	public void testModifyNamespace() throws Exception {
-		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-	
-		assertNull(contextXmlSchemaType.getQName().getSpecifiedNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getDefaultNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace());
-		
-		contextXmlSchemaType.getQName().setSpecifiedNamespace("foo");
-		XmlSchemaTypeAnnotation schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertEquals("foo", schemaTypeAnnotation.getNamespace());
-		assertEquals("foo", contextXmlSchemaType.getQName().getSpecifiedNamespace());
-		assertEquals("foo", contextXmlSchemaType.getQName().getNamespace());
-		
-		 //verify the xml schema type annotation is not removed when the namespace is set to null
-		contextXmlSchemaType.getQName().setSpecifiedNamespace(null);
-		schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(schemaTypeAnnotation.getNamespace());
-		assertNull(contextXmlSchemaType.getQName().getSpecifiedNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace());
-	}
-	
-	public void testUpdateNamespace() throws Exception {
-		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlSchemaType.getQName().getSpecifiedNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getDefaultNamespace());
-		assertEquals(XSDUtil.SCHEMA_FOR_SCHEMA_URI_2001, contextXmlSchemaType.getQName().getNamespace());
-		
-		//add a namespace member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTypeTests.this.addXmlSchemaTypeMemberValuePair(declaration, JAXB.XML_SCHEMA_TYPE__NAMESPACE, "foo");
-			}
-		});
-		assertEquals("foo", contextXmlSchemaType.getQName().getSpecifiedNamespace());
-		assertEquals("foo", contextXmlSchemaType.getQName().getNamespace());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTypeTests.this.removeXmlSchemaTypeAnnotation(declaration);
-			}
-		});
-		assertFalse(contextPackageInfo.getXmlSchemaTypes().iterator().hasNext());
-	}
-	
-	public void testModifyType() throws Exception {
-		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-	
-		assertNull(contextXmlSchemaType.getType());
-		
-		contextXmlSchemaType.setType("foo");
-		XmlSchemaTypeAnnotation schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertEquals("foo", schemaTypeAnnotation.getType());
-		assertEquals("foo", contextXmlSchemaType.getType());
-		
-		 //verify the xml schema type annotation is not removed when the type is set to null
-		contextXmlSchemaType.setType(null);
-		schemaTypeAnnotation = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertNull(schemaTypeAnnotation.getType());
-		assertNull(contextXmlSchemaType.getType());
-	}
-	
-	public void testUpdateType() throws Exception {
-		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
-		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
-		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
-
-		assertNull(contextXmlSchemaType.getType());
-		
-		//add a type member value pair
-		AnnotatedElement annotatedElement = this.annotatedElement(resourcePackage);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTypeTests.this.addXmlSchemaTypeTypeMemberValuePair(declaration, JAXB.XML_SCHEMA_TYPE__TYPE, "String");
-			}
-		});
-		assertEquals("String", contextXmlSchemaType.getType());
-
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSchemaTypeTests.this.removeXmlSchemaTypeAnnotation(declaration);
-			}
-		});
-		assertFalse(contextPackageInfo.getXmlSchemaTypes().iterator().hasNext());
-	}
-
-	protected void addXmlSchemaTypeTypeMemberValuePair(ModifiedDeclaration declaration, String name, String typeName) {
-		this.addMemberValuePair(
-			(MarkerAnnotation) this.getXmlSchemaTypeAnnotation(declaration), 
-			name, 
-			this.newTypeLiteral(declaration.getAst(), typeName));
-	}
-
-	protected void addXmlSchemaTypeMemberValuePair(ModifiedDeclaration declaration, String name, String value) {
-		this.addMemberValuePair((MarkerAnnotation) this.getXmlSchemaTypeAnnotation(declaration), name, value);
-	}
-
-	//add another package annotation so that the context model object doesn't get removed when 
-	//removing the XmlSchemaType annotation. Only "annotated" packages are added to the context model
-	protected void removeXmlSchemaTypeAnnotation(ModifiedDeclaration declaration) {
-		this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_ACCESSOR_ORDER);
-		this.removeAnnotation(declaration, JAXB.XML_SCHEMA_TYPE);		
-	}
-
-	protected Annotation getXmlSchemaTypeAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_SCHEMA_TYPE);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java
deleted file mode 100644
index 0ede8a964d..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlSeeAlso;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSeeAlsoAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-public class GenericJavaXmlSeeAlsoTests
-		extends JaxbContextModelTestCase {
-	
-	public GenericJavaXmlSeeAlsoTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createAnnotatedPersistentClassWithXmlSeeAlso() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_SEE_ALSO);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType" + CR);
-				sb.append("@XmlSeeAlso");
-			}
-		});
-	}
-	
-	public void testModifyClasses() throws Exception {
-		createAnnotatedPersistentClassWithXmlSeeAlso();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlSeeAlso contextXmlSeeAlso = classMapping.getXmlSeeAlso();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		assertEquals(0, contextXmlSeeAlso.getClassesSize());
-		
-		// add a class
-		contextXmlSeeAlso.addClass(0, "foo");
-		XmlSeeAlsoAnnotation annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertEquals(1, annotation.getClassesSize());
-		assertTrue(CollectionTools.contains(annotation.getClasses(), "foo"));
-		assertFalse(CollectionTools.contains(annotation.getClasses(), "bar"));
-		
-		// add another
-		contextXmlSeeAlso.addClass(0, "bar");
-		annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertEquals(2, annotation.getClassesSize());
-		assertTrue(CollectionTools.contains(annotation.getClasses(), "foo"));
-		assertTrue(CollectionTools.contains(annotation.getClasses(), "bar"));
-		
-		 // remove one
-		contextXmlSeeAlso.removeClass(1);
-		annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertEquals(1, annotation.getClassesSize());
-		assertFalse(CollectionTools.contains(annotation.getClasses(), "foo"));
-		assertTrue(CollectionTools.contains(annotation.getClasses(), "bar"));
-		
-		// remove the other
-		contextXmlSeeAlso.removeClass(0);
-		annotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertEquals(0, annotation.getClassesSize());
-		assertFalse(CollectionTools.contains(annotation.getClasses(), "bar"));
-		assertFalse(CollectionTools.contains(annotation.getClasses(), "foo"));
-	}
-	
-	public void testUpdateClasses() throws Exception {
-		createAnnotatedPersistentClassWithXmlSeeAlso();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		XmlSeeAlso contextXmlSeeAlso = classMapping.getXmlSeeAlso();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		AnnotatedElement annotatedElement = annotatedElement(resourceType);
-		
-		assertEquals(0, contextXmlSeeAlso.getClassesSize());
-		
-		// add a class
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSeeAlsoTests.this.addClass(declaration, 0, "foo");
-			}
-		});
-		assertEquals(1, contextXmlSeeAlso.getClassesSize());
-		assertTrue(CollectionTools.contains(contextXmlSeeAlso.getClasses(), "foo"));
-		assertFalse(CollectionTools.contains(contextXmlSeeAlso.getClasses(), "bar"));
-		
-		// add another
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSeeAlsoTests.this.addClass(declaration, 0, "bar");
-			}
-		});
-		assertEquals(2, contextXmlSeeAlso.getClassesSize());
-		assertTrue(CollectionTools.contains(contextXmlSeeAlso.getClasses(), "foo"));
-		assertTrue(CollectionTools.contains(contextXmlSeeAlso.getClasses(), "bar"));
-		
-		 // remove one
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSeeAlsoTests.this.removeClass(declaration, 1);
-			}
-		});
-		assertEquals(1, contextXmlSeeAlso.getClassesSize());
-		assertFalse(CollectionTools.contains(contextXmlSeeAlso.getClasses(), "foo"));
-		assertTrue(CollectionTools.contains(contextXmlSeeAlso.getClasses(), "bar"));
-		
-		// remove the other
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlSeeAlsoTests.this.removeClass(declaration, 0);
-			}
-		});
-		assertEquals(0, contextXmlSeeAlso.getClassesSize());
-		assertFalse(CollectionTools.contains(contextXmlSeeAlso.getClasses(), "bar"));
-		assertFalse(CollectionTools.contains(contextXmlSeeAlso.getClasses(), "foo"));
-	}
-	
-	protected void addClass(ModifiedDeclaration declaration, int index, String clazz) {
-		addArrayElement(declaration, JAXB.XML_SEE_ALSO, index, JAXB.XML_SEE_ALSO__VALUE, newTypeLiteral(declaration.getAst(), clazz));		
-	}
-	
-	protected void removeClass(ModifiedDeclaration declaration, int index) {
-		removeArrayElement((NormalAnnotation) getXmlSeeAlsoAnnotation(declaration), JAXB.XML_SEE_ALSO__VALUE, index);
-	}
-	
-	protected Annotation getXmlSeeAlsoAnnotation(ModifiedDeclaration declaration) {
-		return declaration.getAnnotationNamed(JAXB.XML_SEE_ALSO);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java
deleted file mode 100644
index d5d0d01dad..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlElementMapping;
-import org.eclipse.jpt.jaxb.core.context.XmlValueMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-
-
-@SuppressWarnings("nls")
-public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase
-{
-
-	public GenericJavaXmlValueMappingTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTypeWithXmlValue() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_VALUE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlValue");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTypeWithCollectionXmlValue() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("import java.util.List;").append(CR);
-				sb.append("import javax.xml.bind.annotation.XmlValue;").append(CR);
-				sb.append("import javax.xml.bind.annotation.XmlType;").append(CR);
-				sb.append(CR);
-				sb.append("@XmlType").append(CR);
-				sb.append("public class ").append(TYPE_NAME).append(" {").append(CR);
-				sb.append("    @XmlValue").append(CR);
-				sb.append("    public List<String> list;").append(CR);
-				sb.append("}").append(CR);
-			}
-		};
-		return this.javaProject.createCompilationUnit(PACKAGE_NAME, TYPE_NAME + ".java", sourceWriter);
-	}
-
-	public void testChangeMappingType() throws Exception {
-		createTypeWithXmlValue();
-
-		JaxbClassMapping classMapping = ((JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0)).getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlValueMapping xmlValueMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlValueMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		assertNotNull(xmlValueMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_VALUE));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		XmlAttributeMapping xmlAttributeMapping = (XmlAttributeMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlAttributeMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_VALUE));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_VALUE_ATTRIBUTE_MAPPING_KEY);
-		xmlValueMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlValueMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_VALUE));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE));
-
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		XmlElementMapping xmlElementMapping = (XmlElementMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlElementMapping);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_VALUE));
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-
-		persistentAttribute.setMappingKey(MappingKeys.XML_VALUE_ATTRIBUTE_MAPPING_KEY);
-		xmlValueMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		assertNotNull(xmlValueMapping);
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_VALUE));
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-	}
-
-	public void testModifyXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlValue();
-
-		JaxbClassMapping classMapping = ((JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0)).getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlValueMapping xmlValueMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlValueMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlValueMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-		xmlValueMapping.addXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(xmlValueMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		xmlValueMapping.removeXmlJavaTypeAdapter();
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-
-	public void testUpdateXmlJavaTypeAdapter() throws Exception {
-		createTypeWithXmlValue();
-
-		JaxbClassMapping classMapping = ((JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0)).getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlValueMapping xmlValueMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlValueMapping.getPersistentAttribute().getJavaResourceAttribute();
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlValueMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-
-
-		//add an XmlJavaTypeAdapter annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlValueMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNotNull(xmlValueMapping.getXmlJavaTypeAdapter());
-		assertNotNull(xmlJavaTypeAdapterAnnotation);
-
-		//remove the XmlJavaTypeAdapter annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlValueMappingTests.this.removeAnnotation(declaration, JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-		});
-		xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlValueMapping.getXmlJavaTypeAdapter());
-		assertNull(xmlJavaTypeAdapterAnnotation);
-	}
-	
-	public void testModifyXmlList1() throws Exception {
-		createTypeWithXmlValue();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlValueMapping xmlMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertFalse(xmlMapping.isXmlList());
-		assertFalse(xmlMapping.isDefaultXmlList());
-		assertFalse(xmlMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlMapping.setSpecifiedXmlList(true);
-		
-		assertTrue(xmlMapping.isXmlList());
-		assertFalse(xmlMapping.isDefaultXmlList());
-		assertTrue(xmlMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlMapping.setSpecifiedXmlList(false);
-		
-		assertFalse(xmlMapping.isXmlList());
-		assertFalse(xmlMapping.isDefaultXmlList());
-		assertFalse(xmlMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testModifyXmlList2() throws Exception {
-		createTypeWithCollectionXmlValue();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlValueMapping xmlMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertTrue(xmlMapping.isXmlList());
-		assertTrue(xmlMapping.isDefaultXmlList());
-		assertFalse(xmlMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlMapping.setSpecifiedXmlList(true);
-		
-		assertTrue(xmlMapping.isXmlList());
-		assertTrue(xmlMapping.isDefaultXmlList());
-		assertTrue(xmlMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		xmlMapping.setSpecifiedXmlList(false);
-		
-		assertTrue(xmlMapping.isXmlList());
-		assertTrue(xmlMapping.isDefaultXmlList());
-		assertFalse(xmlMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testUpdateXmlList1() throws Exception {
-		createTypeWithXmlValue();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlValueMapping xmlMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertFalse(xmlMapping.isXmlList());
-		assertFalse(xmlMapping.isDefaultXmlList());
-		assertFalse(xmlMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//add an XmlList annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlValueMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_LIST);
-			}
-		});
-		
-		assertTrue(xmlMapping.isXmlList());
-		assertFalse(xmlMapping.isDefaultXmlList());
-		assertTrue(xmlMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//remove the XmlList annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlValueMappingTests.this.removeAnnotation(declaration, JAXB.XML_LIST);
-			}
-		});
-		
-		assertFalse(xmlMapping.isXmlList());
-		assertFalse(xmlMapping.isDefaultXmlList());
-		assertFalse(xmlMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-	
-	public void testUpdateXmlList2() throws Exception {
-		createTypeWithCollectionXmlValue();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		XmlValueMapping xmlMapping = (XmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = xmlMapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertTrue(xmlMapping.isXmlList());
-		assertTrue(xmlMapping.isDefaultXmlList());
-		assertFalse(xmlMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//add an XmlList annotation
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlValueMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_LIST);
-			}
-		});
-		
-		assertTrue(xmlMapping.isXmlList());
-		assertTrue(xmlMapping.isDefaultXmlList());
-		assertTrue(xmlMapping.isSpecifiedXmlList());
-		assertNotNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-		
-		//remove the XmlList annotation
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				GenericJavaXmlValueMappingTests.this.removeAnnotation(declaration, JAXB.XML_LIST);
-			}
-		});
-		
-		assertTrue(xmlMapping.isXmlList());
-		assertTrue(xmlMapping.isDefaultXmlList());
-		assertFalse(xmlMapping.isSpecifiedXmlList());
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_LIST));
-	}
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/JaxbCoreJavaContextModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/JaxbCoreJavaContextModelTests.java
deleted file mode 100644
index 5ff192e9f1..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/JaxbCoreJavaContextModelTests.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.context.java;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class JaxbCoreJavaContextModelTests
-		extends TestCase {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite(JaxbCoreJavaContextModelTests.class.getName());
-		suite.addTestSuite(GenericJavaElementFactoryMethodTests.class);
-		suite.addTestSuite(GenericJavaEnumConstantTests.class);
-		suite.addTestSuite(GenericJavaPackageInfoTests.class);
-		suite.addTestSuite(GenericJavaPersistentAttributeTests.class);
-		suite.addTestSuite(GenericJavaClassMappingTests.class);
-		suite.addTestSuite(GenericJavaEnumMappingTests.class);
-		suite.addTestSuite(GenericJavaRegistryTests.class);
-		suite.addTestSuite(GenericJavaXmlAdapterTests.class);
-		suite.addTestSuite(GenericJavaXmlAnyAttributeMappingTests.class);
-		suite.addTestSuite(GenericJavaXmlAnyElementMappingTests.class);
-		suite.addTestSuite(GenericJavaXmlAttributeMappingTests.class);
-		suite.addTestSuite(GenericJavaXmlElementMappingTests.class);
-		suite.addTestSuite(GenericJavaXmlElementRefMappingTests.class);
-		suite.addTestSuite(GenericJavaXmlElementRefsMappingTests.class);
-		suite.addTestSuite(GenericJavaXmlElementsMappingTests.class);
-		suite.addTestSuite(GenericJavaPackageXmlJavaTypeAdapterTests.class);
-		suite.addTestSuite(GenericJavaTypeXmlJavaTypeAdapterTests.class);
-		suite.addTestSuite(GenericJavaAttributeXmlJavaTypeAdapterTests.class);
-		suite.addTestSuite(GenericJavaXmlRootElementTests.class);
-		suite.addTestSuite(GenericJavaXmlSchemaTests.class);
-		suite.addTestSuite(GenericJavaXmlSchemaTypeTests.class);
-		suite.addTestSuite(GenericJavaXmlSeeAlsoTests.class);
-		suite.addTestSuite(GenericJavaXmlValueMappingTests.class);
-		return suite;
-	}
-	
-	
-	private JaxbCoreJavaContextModelTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java
deleted file mode 100644
index bba329c672..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/projects/TestJaxbProject.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.projects;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject;
-import org.eclipse.jpt.common.utility.command.Command;
-import org.eclipse.jpt.common.utility.internal.synchronizers.CallbackSynchronousSynchronizer;
-import org.eclipse.jpt.common.utility.internal.synchronizers.SynchronousSynchronizer;
-import org.eclipse.jpt.common.utility.synchronizers.CallbackSynchronizer;
-import org.eclipse.jpt.common.utility.synchronizers.Synchronizer;
-import org.eclipse.jpt.jaxb.core.JaxbFacet;
-import org.eclipse.jpt.jaxb.core.JaxbProject;
-import org.eclipse.jpt.jaxb.core.JptJaxbCorePlugin;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * This builds and holds a "JAXB" project.
- * Support for adding packages and types.
- * 
- * The JPA project's settings (platform, database connection, etc.) can be
- * controlled by building a data model and passing it into the constructor.
- */
-public class TestJaxbProject
-		extends TestJavaProject {
-	
-	private final JaxbProject jaxbProject;
-	
-	
-	// ***** static methods *****
-	
-	public static final String JAXB_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.jaxb.jar";
-	public static final String ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY = "org.eclipse.jpt.eclipselink.jar";
-	
-	public static String jaxbJarName() {
-		return getSystemProperty(JAXB_JAR_NAME_SYSTEM_PROPERTY);
-	}
-	
-	public static String eclipselinkJarName() {
-		return getSystemProperty(ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY);
-	}
-	
-	private static String getSystemProperty(String propertyName) {
-		return System.getProperty(propertyName);
-	}
-	
-	
-	// ********** builders **********
-	
-	public static TestJaxbProject buildJaxbProject(
-			String baseProjectName, boolean autoBuild, IDataModel config)
-			throws CoreException {
-		return new TestJaxbProject(baseProjectName, autoBuild, config);
-	}
-	
-	
-	// ********** constructors/initialization **********
-	
-	public TestJaxbProject(String projectName) throws CoreException {
-		this(projectName, false);
-	}
-	
-	public TestJaxbProject(String projectName, boolean autoBuild) throws CoreException {
-		this(projectName, autoBuild, null);
-	}
-	
-	public TestJaxbProject(String projectName, boolean autoBuild, IDataModel config) throws CoreException {
-		super(projectName, autoBuild);
-		String jaxbFacetVersion = 
-				((IProjectFacetVersion) config.getProperty(IFacetDataModelProperties.FACET_VERSION)).getVersionString();
-		this.installFacet(JaxbFacet.ID, jaxbFacetVersion, config);
-		this.addJar(jaxbJarName());
-		if (eclipselinkJarName() != null) {
-			this.addJar(eclipselinkJarName());
-		}
-		this.jaxbProject = JptJaxbCorePlugin.getJaxbProject(this.getProject());
-		this.jaxbProject.setContextModelSynchronizer(this.buildSynchronousContextModelSynchronizer());
-		this.jaxbProject.setUpdateSynchronizer(this.buildSynchronousUpdateSynchronizer());
-	}
-	
-	protected Synchronizer buildSynchronousContextModelSynchronizer() {
-		return new SynchronousSynchronizer(this.buildSynchronousContextModelSynchronizerCommand());
-	}
-
-	protected Command buildSynchronousContextModelSynchronizerCommand() {
-		return new SynchronousContextModelSynchronizerCommand();
-	}
-
-	protected class SynchronousContextModelSynchronizerCommand implements Command {
-		public void execute() {
-			TestJaxbProject.this.jaxbProject.synchronizeContextModel(new NullProgressMonitor());
-		}
-	}
-	
-	protected CallbackSynchronizer buildSynchronousUpdateSynchronizer() {
-		return new CallbackSynchronousSynchronizer(this.buildSynchronousUpdateSynchronizerCommand());
-	}
-
-	protected Command buildSynchronousUpdateSynchronizerCommand() {
-		return new SynchronousUpdateSynchronizerCommand();
-	}
-
-	protected class SynchronousUpdateSynchronizerCommand implements Command {
-		public void execute() {
-			TestJaxbProject.this.jaxbProject.update(new NullProgressMonitor());
-		}
-	}
-	
-	
-	// ********** public methods **********
-	
-	public JaxbProject getJaxbProject() {
-		return this.jaxbProject;
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbCoreResourceModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbCoreResourceModelTests.java
deleted file mode 100644
index 86faa8d47d..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbCoreResourceModelTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010 Oracle. 
- *  All rights reserved.  This program and the accompanying materials 
- *  are made available under the terms of the Eclipse Public License v1.0 
- *  which accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jpt.jaxb.core.tests.internal.JaxbCoreTests;
-import org.eclipse.jpt.jaxb.core.tests.internal.resource.java.JaxbJavaResourceModelTests;
-
-
-public class JaxbCoreResourceModelTests extends TestCase
-{
-	public static Test suite() {
-		TestSuite suite = new TestSuite(JaxbCoreResourceModelTests.class.getName());
-
-		if (JaxbCoreTests.requiredJarsExists()) {
-			suite.addTestSuite(JaxbIndexResourceTests.class);
-			suite.addTestSuite(JaxbPropertiesResourceTests.class);
-			suite.addTest(JaxbJavaResourceModelTests.suite());
-		}
-		else {
-			suite.addTest(TestSuite.warning(JaxbCoreTests.buildMissingJarErrorMessage()));
-		}
-		return suite;
-	}
-
-	private JaxbCoreResourceModelTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java
deleted file mode 100644
index e066113983..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jpt.common.core.tests.internal.utility.jdt.AnnotationTestCase;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.jaxb.core.internal.resource.jaxbindex.JaxbIndexResourceModelProvider;
-import org.eclipse.jpt.jaxb.core.resource.jaxbindex.JaxbIndexResource;
-
-
-public class JaxbIndexResourceTests
-		extends AnnotationTestCase {
-	
-	private static String JAXB_INDEX = "jaxb.index";
-	
-	
-	public JaxbIndexResourceTests(String name) {
-		super(name);
-	}
-	
-	
-	private IFile createJaxbIndex(IPath projectRelativePath, String... classNames) throws Exception {
-		IFolder folder = getJavaProject().getProject().getFolder(projectRelativePath);
-		if (! folder.exists()) {
-			folder.create(true, false, null);
-		}
-		IFile jaxbIndex = getJavaProject().getProject().getFile(projectRelativePath.append(new Path(JAXB_INDEX)));
-		InputStream stream = inputStream(classNames);
-		jaxbIndex.create(stream, true, null);
-		return jaxbIndex;
-	}
-	
-	private void setClassNames(IFile jaxbIndex, String... classNames) throws Exception {
-		jaxbIndex.setContents(inputStream(classNames), true, false, null);
-	}
-	
-	private InputStream inputStream(String... classNames) {
-		StringBuffer sb = new StringBuffer();
-		for (String className : classNames) {
-			sb.append(className + CR);
-		}
-		return new ByteArrayInputStream(sb.toString().getBytes());
-	}
-	
-	public void testUpdateClasses() throws Exception {
-		IFile jaxbIndex = createJaxbIndex(new Path("src/test"), "foo", "bar");
-		JaxbIndexResource resource = JaxbIndexResourceModelProvider.instance().buildResourceModel(jaxbIndex);
-		
-		assertTrue(CollectionTools.elementsAreEqual(
-				resource.getFullyQualifiedClassNames(), 
-				new ArrayIterable<String>(new String[] {"test.foo", "test.bar"})));
-		
-		setClassNames(jaxbIndex, "foo", "bar", "baz");
-		
-		assertTrue(CollectionTools.elementsAreEqual(
-				resource.getFullyQualifiedClassNames(), 
-				new ArrayIterable<String>(new String[] {"test.foo", "test.bar", "test.baz"})));
-		
-		setClassNames(jaxbIndex);
-		
-		assertTrue(CollectionTools.isEmpty(resource.getFullyQualifiedClassNames()));
-		
-		jaxbIndex = createJaxbIndex(new Path("src"), "foo", "bar");
-		resource = JaxbIndexResourceModelProvider.instance().buildResourceModel(jaxbIndex);
-		
-		assertTrue(CollectionTools.elementsAreEqual(
-				resource.getFullyQualifiedClassNames(), 
-				new ArrayIterable<String>(new String[] {"foo", "bar"})));
-		
-		setClassNames(jaxbIndex, "foo", "bar", "baz");
-		
-		assertTrue(CollectionTools.elementsAreEqual(
-				resource.getFullyQualifiedClassNames(), 
-				new ArrayIterable<String>(new String[] {"foo", "bar", "baz"})));
-		
-		setClassNames(jaxbIndex);
-		
-		assertTrue(CollectionTools.isEmpty(resource.getFullyQualifiedClassNames()));
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java
deleted file mode 100644
index bc0684fc7a..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbPropertiesResourceTests.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jpt.common.core.tests.internal.utility.jdt.AnnotationTestCase;
-import org.eclipse.jpt.jaxb.core.internal.resource.jaxbprops.JaxbPropertiesResourceModelProvider;
-import org.eclipse.jpt.jaxb.core.resource.jaxbprops.JaxbPropertiesResource;
-
-
-public class JaxbPropertiesResourceTests
-		extends AnnotationTestCase {
-	
-	private static String JAXB_PROPERTIES = "jaxb.properties";
-	
-	
-	public JaxbPropertiesResourceTests(String name) {
-		super(name);
-	}
-	
-	
-	private IFile createJaxbProperties(IPath projectRelativePath, String[] ... propertyValuePairs) throws Exception {
-		IFolder folder = getJavaProject().getProject().getFolder(projectRelativePath);
-		if (! folder.exists()) {
-			folder.create(true, false, null);
-		}
-		IFile jaxbProperties = getJavaProject().getProject().getFile(projectRelativePath.append(new Path(JAXB_PROPERTIES)));
-		InputStream stream = inputStream(propertyValuePairs);
-		jaxbProperties.create(stream, true, null);
-		return jaxbProperties;
-	}
-	
-	private void setProperties(IFile jaxbProperties, String[] ... propertyValuePairs) throws Exception {
-		jaxbProperties.setContents(inputStream(propertyValuePairs), true, false, null);
-	}
-	
-	private InputStream inputStream(String[] ... propertyValuePairs) {
-		StringBuffer sb = new StringBuffer();
-		for (String[] propertyValuePair : propertyValuePairs) {
-			sb.append(propertyValuePair[0] + "=" + propertyValuePair[1] + CR);
-		}
-		return new ByteArrayInputStream(sb.toString().getBytes());
-	}
-	
-	public void testUpdateProperties() throws Exception {
-		IFile jaxbProperties = createJaxbProperties(new Path("src/test"), new String[] {"foo", "fooProp"}, new String[] {"bar", "barProp"});
-		JaxbPropertiesResource resource = JaxbPropertiesResourceModelProvider.instance().buildResourceModel(jaxbProperties);
-		
-		assertEquals(resource.getProperty("foo"), "fooProp");
-		assertEquals(resource.getProperty("bar"), "barProp");
-		
-		setProperties(jaxbProperties, new String[] {"foo", "fooProp2"}, new String[] {"baz", "bazProp"});
-		
-		assertEquals(resource.getProperty("foo"), "fooProp2");
-		assertNull(resource.getProperty("bar"));
-		assertEquals(resource.getProperty("baz"), "bazProp");
-		
-		setProperties(jaxbProperties);
-		
-		assertNull(resource.getProperty("foo"));
-		assertNull(resource.getProperty("bar"));
-		assertNull(resource.getProperty("baz"));
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java
deleted file mode 100644
index 21427213ba..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTestCase.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.core.tests.internal.resource.java.JavaResourceModelTestCase;
-import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_PlatformDefinition;
-import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject;
-
-public class JaxbJavaResourceModelTestCase
-		extends JavaResourceModelTestCase {	
-
-	public JaxbJavaResourceModelTestCase(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		this.javaProject.addJar(TestJaxbProject.jaxbJarName());
-	}
-	
-	@Override
-	protected AnnotationDefinition[] annotationDefinitions() {
-		return GenericJaxb_2_1_PlatformDefinition.instance().getAnnotationDefinitions();
-	}
-	
-	@Override
-	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {
-		return GenericJaxb_2_1_PlatformDefinition.instance().getNestableAnnotationDefinitions();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTests.java
deleted file mode 100644
index e3864f284e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/JaxbJavaResourceModelTests.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JaxbJavaResourceModelTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(JaxbJavaResourceModelTests.class.getName());
-		suite.addTestSuite(XmlAccessorOrderPackageAnnotationTests.class);
-		suite.addTestSuite(XmlAccessorOrderTypeAnnotationTests.class);
-		suite.addTestSuite(XmlAccessorTypePackageAnnotationTests.class);
-		suite.addTestSuite(XmlAccessorTypeTypeAnnotationTests.class);
-		suite.addTestSuite(XmlAnyAttributeAnnotationTests.class);
-		suite.addTestSuite(XmlAnyElementAnnotationTests.class);
-		suite.addTestSuite(XmlAttachmentRefAnnotationTests.class);
-		suite.addTestSuite(XmlAttributeAnnotationTests.class);
-		suite.addTestSuite(XmlElementAnnotationTests.class);
-		suite.addTestSuite(XmlElementDeclAnnotationTests.class);
-		suite.addTestSuite(XmlElementRefAnnotationTests.class);
-		suite.addTestSuite(XmlElementRefsAnnotationTests.class);
-		suite.addTestSuite(XmlElementsAnnotationTests.class);
-		suite.addTestSuite(XmlElementWrapperAnnotationTests.class);
-		suite.addTestSuite(XmlEnumAnnotationTests.class);
-		suite.addTestSuite(XmlEnumValueAnnotationTests.class);
-		suite.addTestSuite(XmlIDAnnotationTests.class);
-		suite.addTestSuite(XmlIDREFAnnotationTests.class);
-		suite.addTestSuite(XmlInlineBinaryDataAttributeAnnotationTests.class);
-		suite.addTestSuite(XmlInlineBinaryDataTypeAnnotationTests.class);
-		suite.addTestSuite(XmlJavaTypeAdapterPackageAnnotationTests.class);
-		suite.addTestSuite(XmlJavaTypeAdapterTypeAnnotationTests.class);
-		suite.addTestSuite(XmlListAnnotationTests.class);
-		suite.addTestSuite(XmlMimeTypeAnnotationTests.class);
-		suite.addTestSuite(XmlMixedAnnotationTests.class);
-		suite.addTestSuite(XmlRegistryAnnotationTests.class);
-		suite.addTestSuite(XmlRootElementAnnotationTests.class);
-		suite.addTestSuite(XmlSchemaAnnotationTests.class);
-		suite.addTestSuite(XmlSchemaTypeAttributeAnnotationTests.class);
-		suite.addTestSuite(XmlSchemaTypePackageAnnotationTests.class);
-		suite.addTestSuite(XmlSeeAlsoAnnotationTests.class);
-		suite.addTestSuite(XmlTransientAttributeAnnotationTests.class);
-		suite.addTestSuite(XmlTransientTypeAnnotationTests.class);
-		suite.addTestSuite(XmlTypeAnnotationTests.class);
-		suite.addTestSuite(XmlValueAnnotationTests.class);
-
-		return suite;
-	}
-
-	private JaxbJavaResourceModelTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderPackageAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderPackageAnnotationTests.java
deleted file mode 100644
index 32cb73c062..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderPackageAnnotationTests.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorOrderAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlAccessorOrderPackageAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	public XmlAccessorOrderPackageAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createPackageInfoWithAccessorOrder() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlAccessorOrder(XmlAccessOrder.UNDEFINED)",
-				JAXB.XML_ACCESS_ORDER, JAXB.XML_ACCESSOR_ORDER);
-	}
-	
-	public void testValue() 
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithAccessorOrder();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu); 
-		
-		XmlAccessorOrderAnnotation annotation = 
-				(XmlAccessorOrderAnnotation) resourcePackage.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertNotNull(annotation);
-		assertEquals(XmlAccessOrder.UNDEFINED, annotation.getValue());
-		
-		annotation.setValue(XmlAccessOrder.ALPHABETICAL);
-		assertEquals(XmlAccessOrder.ALPHABETICAL, annotation.getValue());
-		assertSourceContains("@XmlAccessorOrder(ALPHABETICAL)", cu);
-		
-		annotation.setValue(null);
-		annotation = (XmlAccessorOrderAnnotation) resourcePackage.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertNull(annotation.getValue());
-		assertSourceDoesNotContain("@XmlAccessorOrder(", cu);
-		
-//		TODO uncomment when bug 328400 is addressed
-//		annotation = (XmlAccessorOrderAnnotation) packageResource.addAnnotation(JAXB.XML_ACCESSOR_ORDER);
-//		annotation.setValue(XmlAccessOrder.UNDEFINED);
-//		assertEquals(XmlAccessOrder.UNDEFINED, annotation.getValue());
-//		assertSourceContains("@XmlAccessorOrder(UNDEFINED)", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderTypeAnnotationTests.java
deleted file mode 100644
index 1518c916ef..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderTypeAnnotationTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorOrderAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlAccessorOrderTypeAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	public XmlAccessorOrderTypeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlAccessorOrder() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ACCESSOR_ORDER);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAccessorOrder");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlAccessorOrderWithValue() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ACCESSOR_ORDER, JAXB.XML_ACCESS_ORDER);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAccessorOrder(value = XmlAccessOrder.ALPHABETICAL)");
-			}
-		});
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAccessorOrder();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlAccessorOrderAnnotation xmlAccessorOrderAnnotation = (XmlAccessorOrderAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertTrue(xmlAccessorOrderAnnotation != null);
-		assertNull(xmlAccessorOrderAnnotation.getValue());
-	}
-
-	public void testGetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAccessorOrderWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu);
-
-		XmlAccessorOrderAnnotation xmlAccessorOrderAnnotation = (XmlAccessorOrderAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertEquals(XmlAccessOrder.ALPHABETICAL, xmlAccessorOrderAnnotation.getValue());
-	}
-
-	public void testSetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAccessorOrder();
-		JavaResourceType resourceType = buildJavaResourceType(cu);
-
-		XmlAccessorOrderAnnotation xmlAccessorOrderAnnotation = (XmlAccessorOrderAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertEquals(null, xmlAccessorOrderAnnotation.getValue());
-
-		xmlAccessorOrderAnnotation.setValue(XmlAccessOrder.UNDEFINED);
-		assertEquals(XmlAccessOrder.UNDEFINED, xmlAccessorOrderAnnotation.getValue());
-
-		assertSourceContains("@XmlAccessorOrder(UNDEFINED)", cu);
-	}
-
-	public void testSetValueNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAccessorOrderWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu);
-
-		XmlAccessorOrderAnnotation xmlAccessorOrderAnnotation = (XmlAccessorOrderAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_ORDER);
-		assertEquals(XmlAccessOrder.ALPHABETICAL, xmlAccessorOrderAnnotation.getValue());
-
-		xmlAccessorOrderAnnotation.setValue(null);
-		assertNull(xmlAccessorOrderAnnotation.getValue());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypePackageAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypePackageAnnotationTests.java
deleted file mode 100644
index fc3e737548..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypePackageAnnotationTests.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorTypeAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlAccessorTypePackageAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	public XmlAccessorTypePackageAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createPackageInfoWithAccessorType() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlAccessorType(value = XmlAccessType.PROPERTY)",
-				JAXB.XML_ACCESS_TYPE, JAXB.XML_ACCESSOR_TYPE);
-	}
-	
-	public void testValue() 
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithAccessorType();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu); 
-		
-		XmlAccessorTypeAnnotation annotation = 
-				(XmlAccessorTypeAnnotation) resourcePackage.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertTrue(annotation != null);
-		assertEquals(XmlAccessType.PROPERTY, annotation.getValue());
-		
-		annotation.setValue(XmlAccessType.FIELD);
-		assertEquals(XmlAccessType.FIELD, annotation.getValue());
-		assertSourceContains("@XmlAccessorType(value = FIELD)", cu);
-		
-		annotation.setValue(XmlAccessType.NONE);
-		assertEquals(XmlAccessType.NONE, annotation.getValue());
-		assertSourceContains("@XmlAccessorType(value = NONE)", cu);
-		
-		annotation.setValue(XmlAccessType.PUBLIC_MEMBER);
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, annotation.getValue());
-		assertSourceContains("@XmlAccessorType(value = PUBLIC_MEMBER)", cu);
-		
-		annotation.setValue(null);
-		assertSourceDoesNotContain("@XmlAccessorType(", cu);
-		
-//		TODO uncomment when bug 328400 is addressed
-//		annotation = (XmlAccessorTypeAnnotation) packageResource.addAnnotation(JAXB.XML_ACCESSOR_TYPE);
-//		annotation.setValue(XmlAccessType.PROPERTY);
-//		assertEquals(XmlAccessType.PROPERTY, annotation.getValue());
-//		assertSourceContains("@XmlAccessorType(PROPERTY)", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypeTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypeTypeAnnotationTests.java
deleted file mode 100644
index 4c7c4f32b7..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypeTypeAnnotationTests.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorTypeAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlAccessorTypeTypeAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	public XmlAccessorTypeTypeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlAccessorType() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ACCESSOR_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAccessorType");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlAccessorTypeWithValue() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAccessorType(value = XmlAccessType.FIELD)");
-			}
-		});
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAccessorType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlAccessorTypeAnnotation xmlAccessorTypeAnnotation = (XmlAccessorTypeAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertTrue(xmlAccessorTypeAnnotation != null);
-		assertNull(xmlAccessorTypeAnnotation.getValue());
-	}
-
-	public void testGetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAccessorTypeWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu);
-
-		XmlAccessorTypeAnnotation xmlAccessorTypeAnnotation = (XmlAccessorTypeAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertEquals(XmlAccessType.FIELD, xmlAccessorTypeAnnotation.getValue());
-	}
-
-	public void testSetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAccessorType();
-		JavaResourceType resourceType = buildJavaResourceType(cu);
-
-		XmlAccessorTypeAnnotation xmlAccessorTypeAnnotation = (XmlAccessorTypeAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertEquals(null, xmlAccessorTypeAnnotation.getValue());
-
-		xmlAccessorTypeAnnotation.setValue(XmlAccessType.PUBLIC_MEMBER);
-		assertEquals(XmlAccessType.PUBLIC_MEMBER, xmlAccessorTypeAnnotation.getValue());
-
-		assertSourceContains("@XmlAccessorType(PUBLIC_MEMBER)", cu);
-
-		xmlAccessorTypeAnnotation.setValue(XmlAccessType.PROPERTY);
-		assertEquals(XmlAccessType.PROPERTY, xmlAccessorTypeAnnotation.getValue());
-
-		assertSourceContains("@XmlAccessorType(PROPERTY)", cu);
-
-		xmlAccessorTypeAnnotation.setValue(XmlAccessType.NONE);
-		assertEquals(XmlAccessType.NONE, xmlAccessorTypeAnnotation.getValue());
-
-		assertSourceContains("@XmlAccessorType(NONE)", cu);
-	}
-
-	public void testSetValueNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAccessorTypeWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu);
-
-		XmlAccessorTypeAnnotation xmlAccessorTypeAnnotation = (XmlAccessorTypeAnnotation) resourceType.getAnnotation(JAXB.XML_ACCESSOR_TYPE);
-		assertEquals(XmlAccessType.FIELD, xmlAccessorTypeAnnotation.getValue());
-
-		xmlAccessorTypeAnnotation.setValue(null);
-		assertNull(xmlAccessorTypeAnnotation.getValue());
-
-		assertSourceDoesNotContain("@XmlAccessorType(", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyAttributeAnnotationTests.java
deleted file mode 100644
index 1758e19fb9..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyAttributeAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAnyAttributeAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlAnyAttributeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlAnyAttributeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlAnyAttribute() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ANY_ATTRIBUTE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAnyAttribute");
-			}
-		});
-	}
-
-	public void testGetXmlAnyAttribute() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAnyAttribute();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAnyAttributeAnnotation xmlAnyAttributeAnnotation = (XmlAnyAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ATTRIBUTE);
-		assertTrue(xmlAnyAttributeAnnotation != null);
-
-		resourceAttribute.removeAnnotation(JAXB.XML_ANY_ATTRIBUTE);
-		assertSourceDoesNotContain("@XmlAnyAttribute", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyElementAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyElementAnnotationTests.java
deleted file mode 100644
index 3ae8713f60..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyElementAnnotationTests.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAnyElementAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlAnyElementAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_ANY_ELEMENT_VALUE = "String";
-
-	public XmlAnyElementAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlAnyElement() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ANY_ELEMENT);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAnyElement");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlAnyElementWithBooleanElement(final String booleanElement) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ANY_ELEMENT);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAnyElement(" + booleanElement + " = true)");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlAnyElementWithValue() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ANY_ELEMENT);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAnyElement(value = " + XML_ANY_ELEMENT_VALUE  + ".class)");
-			}
-		});
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAnyElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAnyElementAnnotation xmlAnyElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-		assertTrue(xmlAnyElementAnnotation != null);
-		assertNull(xmlAnyElementAnnotation.getLax());
-		assertNull(xmlAnyElementAnnotation.getValue());
-	}
-
-	public void testGetLax() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAnyElementWithBooleanElement("lax");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlAnyElementAnnotation xmlAnyElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-
-		assertEquals(Boolean.TRUE, xmlAnyElementAnnotation.getLax());
-	}
-
-	public void testSetLax() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAnyElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlAnyElementAnnotation xmlAnyElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-
-		assertNotNull(xmlAnyElementAnnotation);
-		assertNull(xmlAnyElementAnnotation.getLax());
-
-		xmlAnyElementAnnotation.setLax(Boolean.FALSE);
-		assertEquals(Boolean.FALSE, xmlAnyElementAnnotation.getLax());
-
-		assertSourceContains("@XmlAnyElement(lax = false)", cu);
-
-		xmlAnyElementAnnotation.setLax(null);
-		assertSourceContains("@XmlAnyElement", cu);
-		assertSourceDoesNotContain("lax", cu);
-	}
-
-	public void testGetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAnyElementWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAnyElementAnnotation xmlAnyElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-		assertTrue(xmlAnyElementAnnotation != null);
-		assertEquals(XML_ANY_ELEMENT_VALUE, xmlAnyElementAnnotation.getValue());
-		assertEquals("java.lang." + XML_ANY_ELEMENT_VALUE, xmlAnyElementAnnotation.getFullyQualifiedValueClassName());
-	}
-
-	public void testSetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAnyElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAnyElementAnnotation xmlAnyElementAnnotation = (XmlAnyElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ANY_ELEMENT);
-		assertNull(xmlAnyElementAnnotation.getValue());
-		xmlAnyElementAnnotation.setValue(XML_ANY_ELEMENT_VALUE);
-		assertEquals(XML_ANY_ELEMENT_VALUE, xmlAnyElementAnnotation.getValue());
-
-		assertSourceContains("@XmlAnyElement(" + XML_ANY_ELEMENT_VALUE  + ".class)", cu);
-
-		xmlAnyElementAnnotation.setValue(null);
-		assertNull(xmlAnyElementAnnotation.getValue());
-
-		assertSourceContains("@XmlAnyElement", cu);
-		assertSourceDoesNotContain("@XmlAnyElement(value = " + XML_ANY_ELEMENT_VALUE  + ".class)", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttachmentRefAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttachmentRefAnnotationTests.java
deleted file mode 100644
index 9f10d0714c..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttachmentRefAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAttachmentRefAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlAttachmentRefAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlAttachmentRefAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlAttachmentRef() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ATTACHMENT_REF);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAttachmentRef");
-			}
-		});
-	}
-
-	public void testGetXmlAttachmentRef() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttachmentRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAttachmentRefAnnotation xmlAttachmentRefAnnotation = (XmlAttachmentRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertTrue(xmlAttachmentRefAnnotation != null);
-
-		resourceAttribute.removeAnnotation(JAXB.XML_ATTACHMENT_REF);
-		assertSourceDoesNotContain("@XmlAttachmentRef", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttributeAnnotationTests.java
deleted file mode 100644
index d2527290f6..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttributeAnnotationTests.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlAttributeAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlAttributeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_ATTRIBUTE_NAME = "elementName";
-	private static final String XML_ATTRIBUTE_NAMESPACE = "XmlAttributeNamespace";
-
-	public XmlAttributeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlAttribute() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ATTRIBUTE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAttribute");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlAttributeWithName() throws Exception {
-		return this.createTestXmlAttributeWithStringElement("name", XML_ATTRIBUTE_NAME);
-	}
-
-	private ICompilationUnit createTestXmlAttributeWithNamespace() throws Exception {
-		return this.createTestXmlAttributeWithStringElement("namespace", XML_ATTRIBUTE_NAMESPACE);
-	}
-
-	private ICompilationUnit createTestXmlAttributeWithStringElement(final String element, final String value) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ATTRIBUTE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAttribute(" + element + " = \"" + value + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlAttributeWithBooleanElement(final String booleanElement) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ATTRIBUTE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAttribute(" + booleanElement + " = true)");
-			}
-		});
-	}
-
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttributeWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertTrue(xmlAttributeAnnotation != null);
-		assertEquals(XML_ATTRIBUTE_NAME, xmlAttributeAnnotation.getName());
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttribute();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertTrue(xmlAttributeAnnotation != null);
-		assertNull(xmlAttributeAnnotation.getName());
-		assertNull(xmlAttributeAnnotation.getNamespace());
-		assertNull(xmlAttributeAnnotation.getRequired());
-	}
-
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttribute();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertNull(xmlAttributeAnnotation.getName());
-		xmlAttributeAnnotation.setName(XML_ATTRIBUTE_NAME);
-		assertEquals(XML_ATTRIBUTE_NAME, xmlAttributeAnnotation.getName());
-
-		assertSourceContains("@XmlAttribute(name = \"" + XML_ATTRIBUTE_NAME + "\")", cu);
-
-		xmlAttributeAnnotation.setName(null);
-		assertNull(xmlAttributeAnnotation.getName());
-
-		assertSourceContains("@XmlAttribute", cu);
-		assertSourceDoesNotContain("@XmlAttribute(name = \"" + XML_ATTRIBUTE_NAME + "\")", cu);
-	}
-
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttributeWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertTrue(xmlAttributeAnnotation != null);
-		assertEquals(XML_ATTRIBUTE_NAMESPACE, xmlAttributeAnnotation.getNamespace());
-	}
-
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttribute();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-		assertNull(xmlAttributeAnnotation.getNamespace());
-		xmlAttributeAnnotation.setNamespace(XML_ATTRIBUTE_NAMESPACE);
-		assertEquals(XML_ATTRIBUTE_NAMESPACE, xmlAttributeAnnotation.getNamespace());
-
-		assertSourceContains("@XmlAttribute(namespace = \"" + XML_ATTRIBUTE_NAMESPACE + "\")", cu);
-
-		xmlAttributeAnnotation.setNamespace(null);
-		assertNull(xmlAttributeAnnotation.getNamespace());
-
-		assertSourceContains("@XmlAttribute", cu);
-		assertSourceDoesNotContain("@XmlAttribute(namespace = \"" + XML_ATTRIBUTE_NAMESPACE + "\")", cu);
-	}
-
-	public void testGetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttributeWithBooleanElement("required");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-
-		assertEquals(Boolean.TRUE, xmlAttributeAnnotation.getRequired());
-	}
-
-	public void testSetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttribute();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlAttributeAnnotation xmlAttributeAnnotation = (XmlAttributeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ATTRIBUTE);
-
-		assertNotNull(xmlAttributeAnnotation);
-		assertNull(xmlAttributeAnnotation.getRequired());
-
-		xmlAttributeAnnotation.setRequired(Boolean.FALSE);
-		assertEquals(Boolean.FALSE, xmlAttributeAnnotation.getRequired());
-
-		assertSourceContains("@XmlAttribute(required = false)", cu);
-
-		xmlAttributeAnnotation.setRequired(null);
-		assertSourceContains("@XmlAttribute", cu);
-		assertSourceDoesNotContain("required", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementAnnotationTests.java
deleted file mode 100644
index 12589383e8..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementAnnotationTests.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlElementAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	private static final String XML_ELEMENT_NAME = "elementName";
-	private static final String XML_ELEMENT_NAMESPACE = "XmlElementNamespace";
-	private static final String XML_ELEMENT_DEFAULT_VALUE = "myDefaultValue";
-	private static final String XML_ELEMENT_TYPE = "String";
-	
-	
-	public XmlElementAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTestXmlElement() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElement");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementWithName() throws Exception {
-		return this.createTestXmlElementWithStringElement("name", XML_ELEMENT_NAME);
-	}
-	
-	private ICompilationUnit createTestXmlElementWithNamespace() throws Exception {
-		return this.createTestXmlElementWithStringElement("namespace", XML_ELEMENT_NAMESPACE);
-	}
-	
-	private ICompilationUnit createTestXmlElementWithDefaultValue() throws Exception {
-		return this.createTestXmlElementWithStringElement("defaultValue", XML_ELEMENT_DEFAULT_VALUE);
-	}
-	
-	private ICompilationUnit createTestXmlElementWithStringElement(final String element, final String value) throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElement(" + element + " = \"" + value + "\")");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementWithBooleanElement(final String booleanElement) throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElement(" + booleanElement + " = true)");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementWithType() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElement(type = " + XML_ELEMENT_TYPE  + ".class)");
-			}
-		});
-	}
-	
-	
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertNull(xmlElementAnnotation.getName());
-		assertNull(xmlElementAnnotation.getNamespace());
-		assertNull(xmlElementAnnotation.getDefaultValue());
-		assertNull(xmlElementAnnotation.getNillable());
-		assertNull(xmlElementAnnotation.getRequired());
-		assertNull(xmlElementAnnotation.getType());
-	}
-	
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertEquals(XML_ELEMENT_NAME, xmlElementAnnotation.getName());
-	}
-	
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertNull(xmlElementAnnotation.getName());
-		
-		xmlElementAnnotation.setName(XML_ELEMENT_NAME);
-		
-		assertEquals(XML_ELEMENT_NAME, xmlElementAnnotation.getName());
-		assertSourceContains("@XmlElement(name = \"" + XML_ELEMENT_NAME + "\")", cu);
-		
-		xmlElementAnnotation.setName(null);
-		
-		assertNull(xmlElementAnnotation.getName());
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("@XmlElement(name = \"" + XML_ELEMENT_NAME + "\")", cu);
-	}
-	
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertEquals(XML_ELEMENT_NAMESPACE, xmlElementAnnotation.getNamespace());
-	}
-	
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertNull(xmlElementAnnotation.getNamespace());
-		
-		xmlElementAnnotation.setNamespace(XML_ELEMENT_NAMESPACE);
-		
-		assertEquals(XML_ELEMENT_NAMESPACE, xmlElementAnnotation.getNamespace());
-		assertSourceContains("@XmlElement(namespace = \"" + XML_ELEMENT_NAMESPACE + "\")", cu);
-		
-		xmlElementAnnotation.setNamespace(null);
-		
-		assertNull(xmlElementAnnotation.getNamespace());
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("@XmlElement(namespace = \"" + XML_ELEMENT_NAMESPACE + "\")", cu);
-	}
-	
-	public void testGetDefaultValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithDefaultValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertEquals(XML_ELEMENT_DEFAULT_VALUE, xmlElementAnnotation.getDefaultValue());
-	}
-	
-	public void testSetDefaultValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertNull(xmlElementAnnotation.getDefaultValue());
-		
-		xmlElementAnnotation.setDefaultValue(XML_ELEMENT_DEFAULT_VALUE);
-		
-		assertEquals(XML_ELEMENT_DEFAULT_VALUE, xmlElementAnnotation.getDefaultValue());
-		assertSourceContains("@XmlElement(defaultValue = \"" + XML_ELEMENT_DEFAULT_VALUE + "\")", cu);
-		
-		xmlElementAnnotation.setDefaultValue(null);
-		
-		assertNull(xmlElementAnnotation.getDefaultValue());
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("@XmlElement(defaultValue = \"" + XML_ELEMENT_DEFAULT_VALUE + "\")", cu);
-	}
-	
-	public void testGetNillable() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithBooleanElement("nillable");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertEquals(Boolean.TRUE, xmlElementAnnotation.getNillable());
-	}
-	
-	public void testSetNillable() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertNotNull(xmlElementAnnotation);
-		assertNull(xmlElementAnnotation.getNillable());
-		
-		xmlElementAnnotation.setNillable(Boolean.FALSE);
-		
-		assertEquals(Boolean.FALSE, xmlElementAnnotation.getNillable());
-		assertSourceContains("@XmlElement(nillable = false)", cu);
-		
-		xmlElementAnnotation.setNillable(null);
-		
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("nillable", cu);
-	}
-	
-	public void testGetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithBooleanElement("required");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertEquals(Boolean.TRUE, xmlElementAnnotation.getRequired());
-	}
-	
-	public void testSetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertNotNull(xmlElementAnnotation);
-		assertNull(xmlElementAnnotation.getRequired());
-		
-		xmlElementAnnotation.setRequired(Boolean.FALSE);
-		
-		assertEquals(Boolean.FALSE, xmlElementAnnotation.getRequired());
-		assertSourceContains("@XmlElement(required = false)", cu);
-		
-		xmlElementAnnotation.setRequired(null);
-		
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("required", cu);
-	}
-	
-	public void testGetType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertEquals(XML_ELEMENT_TYPE, xmlElementAnnotation.getType());
-		assertEquals("java.lang." + XML_ELEMENT_TYPE, xmlElementAnnotation.getFullyQualifiedTypeName());
-	}
-	
-	public void testSetType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = (XmlElementAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT);
-		
-		assertNull(xmlElementAnnotation.getType());
-		
-		xmlElementAnnotation.setType(XML_ELEMENT_TYPE);
-		
-		assertEquals(XML_ELEMENT_TYPE, xmlElementAnnotation.getType());
-		assertSourceContains("@XmlElement(type = " + XML_ELEMENT_TYPE  + ".class", cu);
-		
-		xmlElementAnnotation.setType(null);
-		
-		assertNull(xmlElementAnnotation.getType());
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("@XmlElement(type = " + XML_ELEMENT_TYPE  + ".class", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementDeclAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementDeclAnnotationTests.java
deleted file mode 100644
index a782a0b072..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementDeclAnnotationTests.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementDeclAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlElementDeclAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_ELEMENT_DECL_NAME = "elementName";
-	private static final String XML_ELEMENT_DECL_NAMESPACE = "XmlElementDeclNamespace";
-	private static final String XML_ELEMENT_DECL_DEFAULT_VALUE = "myDefaultValue";
-	private static final String XML_ELEMENT_DECL_SCOPE = "XmlElementDecl.GLOBAL";
-
-	public XmlElementDeclAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlElementDecl() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_DECL);
-			}
-			@Override
-			public void appendGetIdMethodAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementDecl");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlElementDeclWithName() throws Exception {
-		return this.createTestXmlElementDeclWithStringElementDecl("name", XML_ELEMENT_DECL_NAME);
-	}
-
-	private ICompilationUnit createTestXmlElementDeclWithNamespace() throws Exception {
-		return this.createTestXmlElementDeclWithStringElementDecl("namespace", XML_ELEMENT_DECL_NAMESPACE);
-	}
-
-	private ICompilationUnit createTestXmlElementDeclWithDefaultValue() throws Exception {
-		return this.createTestXmlElementDeclWithStringElementDecl("defaultValue", XML_ELEMENT_DECL_DEFAULT_VALUE);
-	}
-
-	private ICompilationUnit createTestXmlElementDeclWithSubstitutionHeadName() throws Exception {
-		return this.createTestXmlElementDeclWithStringElementDecl("substitutionHeadName", XML_ELEMENT_DECL_NAME);
-	}
-
-	private ICompilationUnit createTestXmlElementDeclWithSubstitutionHeadNamespace() throws Exception {
-		return this.createTestXmlElementDeclWithStringElementDecl("substitutionHeadNamespace", XML_ELEMENT_DECL_NAME);
-	}
-
-	private ICompilationUnit createTestXmlElementDeclWithStringElementDecl(final String element, final String value) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_DECL);
-			}
-			@Override
-			public void appendGetIdMethodAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementDecl(" + element + " = \"" + value + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlElementDeclWithScope() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_DECL);
-			}
-			@Override
-			public void appendGetIdMethodAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementDecl(scope = " + XML_ELEMENT_DECL_SCOPE  + ".class)");
-			}
-		});
-	}
-
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDeclWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertTrue(xmlElementDeclAnnotation != null);
-		assertEquals(XML_ELEMENT_DECL_NAME, xmlElementDeclAnnotation.getName());
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDecl();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertTrue(xmlElementDeclAnnotation != null);
-		assertNull(xmlElementDeclAnnotation.getName());
-		assertNull(xmlElementDeclAnnotation.getNamespace());
-		assertNull(xmlElementDeclAnnotation.getDefaultValue());
-		assertNull(xmlElementDeclAnnotation.getScope());
-		assertNull(xmlElementDeclAnnotation.getSubstitutionHeadName());
-		assertNull(xmlElementDeclAnnotation.getSubstitutionHeadNamespace());
-	}
-
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDecl();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(xmlElementDeclAnnotation.getName());
-		xmlElementDeclAnnotation.setName(XML_ELEMENT_DECL_NAME);
-		assertEquals(XML_ELEMENT_DECL_NAME, xmlElementDeclAnnotation.getName());
-
-		assertSourceContains("@XmlElementDecl(name = \"" + XML_ELEMENT_DECL_NAME + "\")", cu);
-
-		xmlElementDeclAnnotation.setName(null);
-		assertNull(xmlElementDeclAnnotation.getName());
-
-		assertSourceContains("@XmlElementDecl", cu);
-		assertSourceDoesNotContain("@XmlElementDecl(name = \"" + XML_ELEMENT_DECL_NAME + "\")", cu);
-	}
-
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDeclWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertTrue(xmlElementDeclAnnotation != null);
-		assertEquals(XML_ELEMENT_DECL_NAMESPACE, xmlElementDeclAnnotation.getNamespace());
-	}
-
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDecl();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(xmlElementDeclAnnotation.getNamespace());
-		xmlElementDeclAnnotation.setNamespace(XML_ELEMENT_DECL_NAMESPACE);
-		assertEquals(XML_ELEMENT_DECL_NAMESPACE, xmlElementDeclAnnotation.getNamespace());
-
-		assertSourceContains("@XmlElementDecl(namespace = \"" + XML_ELEMENT_DECL_NAMESPACE + "\")", cu);
-
-		xmlElementDeclAnnotation.setNamespace(null);
-		assertNull(xmlElementDeclAnnotation.getNamespace());
-
-		assertSourceContains("@XmlElementDecl", cu);
-		assertSourceDoesNotContain("@XmlElementDecl(namespace = \"" + XML_ELEMENT_DECL_NAMESPACE + "\")", cu);
-	}
-
-	public void testGetDefaultValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDeclWithDefaultValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertTrue(xmlElementDeclAnnotation != null);
-		assertEquals(XML_ELEMENT_DECL_DEFAULT_VALUE, xmlElementDeclAnnotation.getDefaultValue());
-	}
-
-	public void testSetDefaultValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDecl();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(xmlElementDeclAnnotation.getDefaultValue());
-		xmlElementDeclAnnotation.setDefaultValue(XML_ELEMENT_DECL_DEFAULT_VALUE);
-		assertEquals(XML_ELEMENT_DECL_DEFAULT_VALUE, xmlElementDeclAnnotation.getDefaultValue());
-
-		assertSourceContains("@XmlElementDecl(defaultValue = \"" + XML_ELEMENT_DECL_DEFAULT_VALUE + "\")", cu);
-
-		xmlElementDeclAnnotation.setDefaultValue(null);
-		assertNull(xmlElementDeclAnnotation.getDefaultValue());
-
-		assertSourceContains("@XmlElementDecl", cu);
-		assertSourceDoesNotContain("@XmlElementDecl(defaultValue = \"" + XML_ELEMENT_DECL_DEFAULT_VALUE + "\")", cu);
-	}
-
-	public void testGetScope() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDeclWithScope();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertTrue(xmlElementDeclAnnotation != null);
-		assertEquals(XML_ELEMENT_DECL_SCOPE, xmlElementDeclAnnotation.getScope());
-		assertEquals("javax.xml.bind.annotation." + XML_ELEMENT_DECL_SCOPE, xmlElementDeclAnnotation.getFullyQualifiedScopeClassName());
-	}
-
-	public void testSetScope() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDecl();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(xmlElementDeclAnnotation.getScope());
-		xmlElementDeclAnnotation.setScope(XML_ELEMENT_DECL_SCOPE);
-		assertEquals(XML_ELEMENT_DECL_SCOPE, xmlElementDeclAnnotation.getScope());
-
-		assertSourceContains("@XmlElementDecl(scope = " + XML_ELEMENT_DECL_SCOPE  + ".class", cu);
-
-		xmlElementDeclAnnotation.setScope(null);
-		assertNull(xmlElementDeclAnnotation.getScope());
-
-		assertSourceContains("@XmlElementDecl", cu);
-		assertSourceDoesNotContain("@XmlElementDecl(scope = " + XML_ELEMENT_DECL_SCOPE  + ".class", cu);
-	}
-
-	public void testGetSubstitutionHeadName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDeclWithSubstitutionHeadName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertTrue(xmlElementDeclAnnotation != null);
-		assertEquals(XML_ELEMENT_DECL_NAME, xmlElementDeclAnnotation.getSubstitutionHeadName());
-	}
-
-	public void testSetSubstitutionHeadName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDecl();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(xmlElementDeclAnnotation.getSubstitutionHeadName());
-		xmlElementDeclAnnotation.setSubstitutionHeadName(XML_ELEMENT_DECL_NAME);
-		assertEquals(XML_ELEMENT_DECL_NAME, xmlElementDeclAnnotation.getSubstitutionHeadName());
-
-		assertSourceContains("@XmlElementDecl(substitutionHeadName = \"" + XML_ELEMENT_DECL_NAME + "\")", cu);
-
-		xmlElementDeclAnnotation.setSubstitutionHeadName(null);
-		assertNull(xmlElementDeclAnnotation.getSubstitutionHeadName());
-
-		assertSourceContains("@XmlElementDecl", cu);
-		assertSourceDoesNotContain("@XmlElementDecl(substitutionHeadName = \"" + XML_ELEMENT_DECL_NAME + "\")", cu);
-	}
-
-	public void testGetSubstitutionHeadNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDeclWithSubstitutionHeadNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertTrue(xmlElementDeclAnnotation != null);
-		assertEquals(XML_ELEMENT_DECL_NAME, xmlElementDeclAnnotation.getSubstitutionHeadNamespace());
-	}
-
-	public void testSetSubstitutionHeadNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementDecl();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = getMethod(resourceType, 0);
-
-		XmlElementDeclAnnotation xmlElementDeclAnnotation = (XmlElementDeclAnnotation) resourceMethod.getAnnotation(JAXB.XML_ELEMENT_DECL);
-		assertNull(xmlElementDeclAnnotation.getSubstitutionHeadNamespace());
-		xmlElementDeclAnnotation.setSubstitutionHeadNamespace(XML_ELEMENT_DECL_NAME);
-		assertEquals(XML_ELEMENT_DECL_NAME, xmlElementDeclAnnotation.getSubstitutionHeadNamespace());
-
-		assertSourceContains("@XmlElementDecl(substitutionHeadNamespace = \"" + XML_ELEMENT_DECL_NAME + "\")", cu);
-
-		xmlElementDeclAnnotation.setSubstitutionHeadNamespace(null);
-		assertNull(xmlElementDeclAnnotation.getSubstitutionHeadNamespace());
-
-		assertSourceContains("@XmlElementDecl", cu);
-		assertSourceDoesNotContain("@XmlElementDecl(substitutionHeadNamespace = \"" + XML_ELEMENT_DECL_NAME + "\")", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefAnnotationTests.java
deleted file mode 100644
index 18eb4da02f..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefAnnotationTests.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlElementRefAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	private static final String XML_ELEMENT_REF_NAME = "elementName";
-	private static final String XML_ELEMENT_REF_NAMESPACE = "XmlElementRefNamespace";
-	private static final String XML_ELEMENT_REF_TYPE = "String";
-	
-	
-	public XmlElementRefAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTestXmlElementRef() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRef");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithName() throws Exception {
-		return this.createTestXmlElementRefWithStringElement("name", XML_ELEMENT_REF_NAME);
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithNamespace() throws Exception {
-		return this.createTestXmlElementRefWithStringElement("namespace", XML_ELEMENT_REF_NAMESPACE);
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithStringElement(final String element, final String value) throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRef(" + element + " = \"" + value + "\")");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithBooleanElement(final String booleanElement) throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRef(" + booleanElement + " = true)");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithType() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRef(type = " + XML_ELEMENT_REF_TYPE  + ".class)");
-			}
-		});
-	}
-	
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertTrue(xmlElementRefAnnotation != null);
-		assertNull(xmlElementRefAnnotation.getName());
-		assertNull(xmlElementRefAnnotation.getNamespace());
-		assertNull(xmlElementRefAnnotation.getType());
-	}
-	
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertTrue(xmlElementRefAnnotation != null);
-		assertEquals(XML_ELEMENT_REF_NAME, xmlElementRefAnnotation.getName());
-	}
-	
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNull(xmlElementRefAnnotation.getName());
-		
-		xmlElementRefAnnotation.setName(XML_ELEMENT_REF_NAME);
-		
-		assertEquals(XML_ELEMENT_REF_NAME, xmlElementRefAnnotation.getName());
-		assertSourceContains("@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME + "\")", cu);
-		
-		xmlElementRefAnnotation.setName(null);
-		
-		assertNull(xmlElementRefAnnotation.getName());
-		assertSourceContains("@XmlElementRef", cu);
-		assertSourceDoesNotContain("@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME + "\")", cu);
-	}
-	
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertTrue(xmlElementRefAnnotation != null);
-		assertEquals(XML_ELEMENT_REF_NAMESPACE, xmlElementRefAnnotation.getNamespace());
-	}
-	
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNull(xmlElementRefAnnotation.getNamespace());
-		
-		xmlElementRefAnnotation.setNamespace(XML_ELEMENT_REF_NAMESPACE);
-		
-		assertEquals(XML_ELEMENT_REF_NAMESPACE, xmlElementRefAnnotation.getNamespace());
-		assertSourceContains("@XmlElementRef(namespace = \"" + XML_ELEMENT_REF_NAMESPACE + "\")", cu);
-		
-		xmlElementRefAnnotation.setNamespace(null);
-		
-		assertNull(xmlElementRefAnnotation.getNamespace());
-		assertSourceContains("@XmlElementRef", cu);
-		assertSourceDoesNotContain("@XmlElementRef(namespace = \"" + XML_ELEMENT_REF_NAMESPACE + "\")", cu);
-	}
-	
-	public void testGetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithBooleanElement("required");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertEquals(Boolean.TRUE, xmlElementRefAnnotation.getRequired());
-	}
-	
-	public void testSetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNotNull(xmlElementRefAnnotation);
-		assertNull(xmlElementRefAnnotation.getRequired());
-		
-		xmlElementRefAnnotation.setRequired(Boolean.FALSE);
-		
-		assertEquals(Boolean.FALSE, xmlElementRefAnnotation.getRequired());
-		assertSourceContains("@XmlElementRef(required = false)", cu);
-		
-		xmlElementRefAnnotation.setRequired(null);
-		
-		assertSourceContains("@XmlElementRef", cu);
-		assertSourceDoesNotContain("required", cu);
-	}
-	
-	public void testGetType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertTrue(xmlElementRefAnnotation != null);
-		assertEquals(XML_ELEMENT_REF_TYPE, xmlElementRefAnnotation.getType());
-		assertEquals("java.lang." + XML_ELEMENT_REF_TYPE, xmlElementRefAnnotation.getFullyQualifiedTypeName());
-	}
-	
-	public void testSetType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = (XmlElementRefAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF);
-		
-		assertNull(xmlElementRefAnnotation.getType());
-		
-		xmlElementRefAnnotation.setType(XML_ELEMENT_REF_TYPE);
-		
-		assertEquals(XML_ELEMENT_REF_TYPE, xmlElementRefAnnotation.getType());
-		assertSourceContains("@XmlElementRef(type = " + XML_ELEMENT_REF_TYPE  + ".class", cu);
-		
-		xmlElementRefAnnotation.setType(null);
-		
-		assertNull(xmlElementRefAnnotation.getType());
-		assertSourceContains("@XmlElementRef", cu);
-		assertSourceDoesNotContain("@XmlElementRef(type = " + XML_ELEMENT_REF_TYPE  + ".class", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java
deleted file mode 100644
index 835c30641e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefsAnnotation;
-
-
-public class XmlElementRefsAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	private static final String XML_ELEMENT_REF_NAME = "elementName";
-	private static final String XML_ELEMENT_REF_NAMESPACE = "XmlElementRefNamespace";
-	private static final String XML_ELEMENT_REF_TYPE = "String";
-	
-	
-	public XmlElementRefsAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTestXmlElementRef() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRefs(@XmlElementRef)");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithName() throws Exception {
-		return this.createTestXmlElementRefWithStringElement("name", XML_ELEMENT_REF_NAME);
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithNamespace() throws Exception {
-		return this.createTestXmlElementRefWithStringElement("namespace", XML_ELEMENT_REF_NAMESPACE);
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithStringElement(final String element, final String value) throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRefs(@XmlElementRef(" + element + " = \"" + value + "\"))");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithType() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRefs(@XmlElementRef(type = " + XML_ELEMENT_REF_TYPE  + ".class))");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementRefWithAll() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementRefs(@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME + "\", namespace = \"" + XML_ELEMENT_REF_NAMESPACE + "\", type = " + XML_ELEMENT_REF_TYPE  + ".class))");
-			}
-		});
-	}
-	
-	
-	private XmlElementRefAnnotation getXmlElementRefAnnotation(JavaResourceAttribute resourceAttribute) {
-		XmlElementRefsAnnotation refsAnnotation 
-				= (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		return refsAnnotation.xmlElementRefAt(0);
-	}
-	
-	private XmlElementRefAnnotation addXmlElementRefAnnotation(int index, JavaResourceAttribute resourceAttribute) {
-		XmlElementRefsAnnotation refsAnnotation 
-				= (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		return refsAnnotation.addXmlElementRef(index);
-	}
-	
-	private void removeXmlElementRefAnnotation(int index, JavaResourceAttribute resourceAttribute) {
-		XmlElementRefsAnnotation refsAnnotation 
-				= (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		refsAnnotation.removeXmlElementRef(index);
-	}
-	
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = getXmlElementRefAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementRefAnnotation != null);
-		assertNull(xmlElementRefAnnotation.getName());
-		assertNull(xmlElementRefAnnotation.getNamespace());
-		assertNull(xmlElementRefAnnotation.getType());
-	}
-
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = getXmlElementRefAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementRefAnnotation != null);
-		assertEquals(XML_ELEMENT_REF_NAME, xmlElementRefAnnotation.getName());
-	}
-
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = getXmlElementRefAnnotation(resourceAttribute);
-		
-		assertNull(xmlElementRefAnnotation.getName());
-		
-		xmlElementRefAnnotation.setName(XML_ELEMENT_REF_NAME);
-		assertEquals(XML_ELEMENT_REF_NAME, xmlElementRefAnnotation.getName());
-
-		assertSourceContains("@XmlElementRefs(@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME + "\"))", cu);
-
-		xmlElementRefAnnotation.setName(null);
-		assertNull(xmlElementRefAnnotation.getName());
-
-		assertSourceContains("@XmlElementRefs(@XmlElementRef)", cu);
-	}
-	
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = getXmlElementRefAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementRefAnnotation != null);
-		assertEquals(XML_ELEMENT_REF_NAMESPACE, xmlElementRefAnnotation.getNamespace());
-	}
-	
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = getXmlElementRefAnnotation(resourceAttribute);
-		
-		assertNull(xmlElementRefAnnotation.getNamespace());
-		
-		xmlElementRefAnnotation.setNamespace(XML_ELEMENT_REF_NAMESPACE);
-		
-		assertEquals(XML_ELEMENT_REF_NAMESPACE, xmlElementRefAnnotation.getNamespace());
-		assertSourceContains("@XmlElementRefs(@XmlElementRef(namespace = \"" + XML_ELEMENT_REF_NAMESPACE + "\"))", cu);
-		
-		xmlElementRefAnnotation.setNamespace(null);
-		
-		assertNull(xmlElementRefAnnotation.getNamespace());
-		assertSourceContains("@XmlElementRefs(@XmlElementRef)", cu);
-	}
-	
-	public void testGetType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = getXmlElementRefAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementRefAnnotation != null);
-		assertEquals(XML_ELEMENT_REF_TYPE, xmlElementRefAnnotation.getType());
-		assertEquals("java.lang." + XML_ELEMENT_REF_TYPE, xmlElementRefAnnotation.getFullyQualifiedTypeName());
-	}
-	
-	public void testSetType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRef();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementRefAnnotation xmlElementRefAnnotation = getXmlElementRefAnnotation(resourceAttribute);
-		
-		assertNull(xmlElementRefAnnotation.getType());
-		
-		xmlElementRefAnnotation.setType(XML_ELEMENT_REF_TYPE);
-		
-		assertEquals(XML_ELEMENT_REF_TYPE, xmlElementRefAnnotation.getType());
-		assertSourceContains("@XmlElementRefs(@XmlElementRef(type = " + XML_ELEMENT_REF_TYPE  + ".class))", cu);
-		
-		xmlElementRefAnnotation.setType(null);
-		
-		assertNull(xmlElementRefAnnotation.getType());
-		assertSourceContains("@XmlElementRefs(@XmlElementRef)", cu);
-	}
-	
-	public void testAddXmlElementRef() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithAll();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		addXmlElementRefAnnotation(1, resourceAttribute);
-		XmlElementRefsAnnotation refsAnnotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		
-		assertSourceContains(
-				"@XmlElementRefs({@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME 
-						+ "\", namespace = \"" + XML_ELEMENT_REF_NAMESPACE
-						+ "\", type = " + XML_ELEMENT_REF_TYPE 
-						+ ".class),@XmlElementRef})", cu);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF));
-		assertNotNull(refsAnnotation);
-		assertEquals(2, refsAnnotation.getXmlElementRefsSize());
-	}
-	
-	public void testAddXmlElementRefToBeginningOfList() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithAll();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		addXmlElementRefAnnotation(1, resourceAttribute);
-		XmlElementRefsAnnotation refsAnnotation = (XmlElementRefsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REFS);
-		
-		assertSourceContains(
-				"@XmlElementRefs({@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME 
-						+ "\", namespace = \"" + XML_ELEMENT_REF_NAMESPACE
-						+ "\", type = " + XML_ELEMENT_REF_TYPE 
-						+ ".class),@XmlElementRef})", cu);
-				
-		addXmlElementRefAnnotation(0, resourceAttribute);
-		
-		assertSourceContains(
-				"@XmlElementRefs({@XmlElementRef,@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME 
-						+ "\", namespace = \"" + XML_ELEMENT_REF_NAMESPACE
-						+ "\", type = " + XML_ELEMENT_REF_TYPE 
-						+ ".class), @XmlElementRef})", cu);
-		
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_REF));
-		assertNotNull(refsAnnotation);
-		assertEquals(3, refsAnnotation.getXmlElementRefsSize());
-	}
-	
-	public void testRemoveXmlElementRef() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementRefWithAll();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		addXmlElementRefAnnotation(1, resourceAttribute);
-		
-		assertSourceContains(
-				"@XmlElementRefs({@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME 
-						+ "\", namespace = \"" + XML_ELEMENT_REF_NAMESPACE
-						+ "\", type = " + XML_ELEMENT_REF_TYPE 
-						+ ".class),@XmlElementRef})", cu);
-		
-		removeXmlElementRefAnnotation(1, resourceAttribute);
-		
-		assertSourceContains(
-				"@XmlElementRef(name = \"" + XML_ELEMENT_REF_NAME 
-						+ "\", namespace = \"" + XML_ELEMENT_REF_NAMESPACE
-						+ "\", type = " + XML_ELEMENT_REF_TYPE 
-						+ ".class)", cu);
-	}
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementWrapperAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementWrapperAnnotationTests.java
deleted file mode 100644
index 638c375733..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementWrapperAnnotationTests.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlElementWrapperAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_ELEMENT_WRAPPER_NAME = "elementName";
-	private static final String XML_ELEMENT_WRAPPER_NAMESPACE = "XmlElementWrapperNamespace";
-
-	public XmlElementWrapperAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlElementWrapper() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_WRAPPER);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementWrapper");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlElementWrapperWithName() throws Exception {
-		return this.createTestXmlElementWrapperWithStringElement("name", XML_ELEMENT_WRAPPER_NAME);
-	}
-
-	private ICompilationUnit createTestXmlElementWrapperWithNamespace() throws Exception {
-		return this.createTestXmlElementWrapperWithStringElement("namespace", XML_ELEMENT_WRAPPER_NAMESPACE);
-	}
-
-	private ICompilationUnit createTestXmlElementWrapperWithStringElement(final String element, final String value) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_WRAPPER);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementWrapper(" + element + " = \"" + value + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlElementWrapperWithBooleanElement(final String booleanElement) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENT_WRAPPER);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElementWrapper(" + booleanElement + " = true)");
-			}
-		});
-	}
-
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapperWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertTrue(xmlElementWrapperAnnotation != null);
-		assertEquals(XML_ELEMENT_WRAPPER_NAME, xmlElementWrapperAnnotation.getName());
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapper();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertTrue(xmlElementWrapperAnnotation != null);
-		assertNull(xmlElementWrapperAnnotation.getName());
-		assertNull(xmlElementWrapperAnnotation.getNamespace());
-		assertNull(xmlElementWrapperAnnotation.getNillable());
-		assertNull(xmlElementWrapperAnnotation.getRequired());
-	}
-
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapper();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(xmlElementWrapperAnnotation.getName());
-		xmlElementWrapperAnnotation.setName(XML_ELEMENT_WRAPPER_NAME);
-		assertEquals(XML_ELEMENT_WRAPPER_NAME, xmlElementWrapperAnnotation.getName());
-
-		assertSourceContains("@XmlElementWrapper(name = \"" + XML_ELEMENT_WRAPPER_NAME + "\")", cu);
-
-		xmlElementWrapperAnnotation.setName(null);
-		assertNull(xmlElementWrapperAnnotation.getName());
-
-		assertSourceContains("@XmlElementWrapper", cu);
-		assertSourceDoesNotContain("@XmlElementWrapper(name = \"" + XML_ELEMENT_WRAPPER_NAME + "\")", cu);
-	}
-
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapperWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertTrue(xmlElementWrapperAnnotation != null);
-		assertEquals(XML_ELEMENT_WRAPPER_NAMESPACE, xmlElementWrapperAnnotation.getNamespace());
-	}
-
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapper();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-		assertNull(xmlElementWrapperAnnotation.getNamespace());
-		xmlElementWrapperAnnotation.setNamespace(XML_ELEMENT_WRAPPER_NAMESPACE);
-		assertEquals(XML_ELEMENT_WRAPPER_NAMESPACE, xmlElementWrapperAnnotation.getNamespace());
-
-		assertSourceContains("@XmlElementWrapper(namespace = \"" + XML_ELEMENT_WRAPPER_NAMESPACE + "\")", cu);
-
-		xmlElementWrapperAnnotation.setNamespace(null);
-		assertNull(xmlElementWrapperAnnotation.getNamespace());
-
-		assertSourceContains("@XmlElementWrapper", cu);
-		assertSourceDoesNotContain("@XmlElementWrapper(namespace = \"" + XML_ELEMENT_WRAPPER_NAMESPACE + "\")", cu);
-	}
-
-	public void testGetNillable() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapperWithBooleanElement("nillable");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-
-		assertEquals(Boolean.TRUE, xmlElementWrapperAnnotation.getNillable());
-	}
-
-	public void testSetNillable() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapper();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-
-		assertNotNull(xmlElementWrapperAnnotation);
-		assertNull(xmlElementWrapperAnnotation.getNillable());
-
-		xmlElementWrapperAnnotation.setNillable(Boolean.FALSE);
-		assertEquals(Boolean.FALSE, xmlElementWrapperAnnotation.getNillable());
-
-		assertSourceContains("@XmlElementWrapper(nillable = false)", cu);
-
-		xmlElementWrapperAnnotation.setNillable(null);
-		assertSourceContains("@XmlElementWrapper", cu);
-		assertSourceDoesNotContain("nillable", cu);
-	}
-
-	public void testGetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapperWithBooleanElement("required");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-
-		assertEquals(Boolean.TRUE, xmlElementWrapperAnnotation.getRequired());
-	}
-
-	public void testSetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWrapper();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementWrapperAnnotation xmlElementWrapperAnnotation = (XmlElementWrapperAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENT_WRAPPER);
-
-		assertNotNull(xmlElementWrapperAnnotation);
-		assertNull(xmlElementWrapperAnnotation.getRequired());
-
-		xmlElementWrapperAnnotation.setRequired(Boolean.FALSE);
-		assertEquals(Boolean.FALSE, xmlElementWrapperAnnotation.getRequired());
-
-		assertSourceContains("@XmlElementWrapper(required = false)", cu);
-
-		xmlElementWrapperAnnotation.setRequired(null);
-		assertSourceContains("@XmlElementWrapper", cu);
-		assertSourceDoesNotContain("required", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java
deleted file mode 100644
index db85a0cf63..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlElementsAnnotation;
-
-
-public class XmlElementsAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	private static final String XML_ELEMENT_NAME = "elementName";
-	private static final String XML_ELEMENT_NAMESPACE = "XmlElementNamespace";
-	private static final String XML_ELEMENT_DEFAULT_VALUE = "myDefaultValue";
-	private static final String XML_ELEMENT_TYPE = "String";
-	
-	
-	public XmlElementsAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTestXmlElement() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElements(@XmlElement)");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementWithName() throws Exception {
-		return this.createTestXmlElementWithStringElement("name", XML_ELEMENT_NAME);
-	}
-	
-	private ICompilationUnit createTestXmlElementWithNamespace() throws Exception {
-		return this.createTestXmlElementWithStringElement("namespace", XML_ELEMENT_NAMESPACE);
-	}
-	
-	private ICompilationUnit createTestXmlElementWithDefaultValue() throws Exception {
-		return this.createTestXmlElementWithStringElement("defaultValue", XML_ELEMENT_DEFAULT_VALUE);
-	}
-	
-	private ICompilationUnit createTestXmlElementWithStringElement(final String element, final String value) throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElements(@XmlElement(" + element + " = \"" + value + "\"))");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementWithBooleanElement(final String booleanElement) throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElements(@XmlElement(" + booleanElement + " = true))");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlElementWithType() throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElements(@XmlElement(type = " + XML_ELEMENT_TYPE  + ".class))");
-			}
-		});
-	}
-	
-	
-	private XmlElementAnnotation getXmlElementAnnotation(JavaResourceAttribute resourceAttribute) {
-		XmlElementsAnnotation annotation 
-				= (XmlElementsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENTS);
-		return annotation.xmlElementAt(0);
-	}
-	
-	private XmlElementAnnotation addXmlElementAnnotation(int index, JavaResourceAttribute resourceAttribute) {
-		XmlElementsAnnotation annotation 
-				= (XmlElementsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENTS);
-		return annotation.addXmlElement(index);
-	}
-	
-	private void removeXmlElementAnnotation(int index, JavaResourceAttribute resourceAttribute) {
-		XmlElementsAnnotation annotation 
-				= (XmlElementsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENTS);
-		annotation.removeXmlElement(index);
-	}
-	
-	
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertNull(xmlElementAnnotation.getName());
-		assertNull(xmlElementAnnotation.getNamespace());
-		assertNull(xmlElementAnnotation.getDefaultValue());
-		assertNull(xmlElementAnnotation.getNillable());
-		assertNull(xmlElementAnnotation.getRequired());
-		assertNull(xmlElementAnnotation.getType());
-	}
-	
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertEquals(XML_ELEMENT_NAME, xmlElementAnnotation.getName());
-	}
-	
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertNull(xmlElementAnnotation.getName());
-		
-		xmlElementAnnotation.setName(XML_ELEMENT_NAME);
-		
-		assertEquals(XML_ELEMENT_NAME, xmlElementAnnotation.getName());
-		assertSourceContains("@XmlElement(name = \"" + XML_ELEMENT_NAME + "\")", cu);
-		
-		xmlElementAnnotation.setName(null);
-		
-		assertNull(xmlElementAnnotation.getName());
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("@XmlElement(name = \"" + XML_ELEMENT_NAME + "\")", cu);
-	}
-	
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertEquals(XML_ELEMENT_NAMESPACE, xmlElementAnnotation.getNamespace());
-	}
-	
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertNull(xmlElementAnnotation.getNamespace());
-		
-		xmlElementAnnotation.setNamespace(XML_ELEMENT_NAMESPACE);
-		
-		assertEquals(XML_ELEMENT_NAMESPACE, xmlElementAnnotation.getNamespace());
-		assertSourceContains("@XmlElement(namespace = \"" + XML_ELEMENT_NAMESPACE + "\")", cu);
-		
-		xmlElementAnnotation.setNamespace(null);
-		
-		assertNull(xmlElementAnnotation.getNamespace());
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("@XmlElement(namespace = \"" + XML_ELEMENT_NAMESPACE + "\")", cu);
-	}
-	
-	public void testGetDefaultValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithDefaultValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertEquals(XML_ELEMENT_DEFAULT_VALUE, xmlElementAnnotation.getDefaultValue());
-	}
-	
-	public void testSetDefaultValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertNull(xmlElementAnnotation.getDefaultValue());
-		
-		xmlElementAnnotation.setDefaultValue(XML_ELEMENT_DEFAULT_VALUE);
-		
-		assertEquals(XML_ELEMENT_DEFAULT_VALUE, xmlElementAnnotation.getDefaultValue());
-		assertSourceContains("@XmlElement(defaultValue = \"" + XML_ELEMENT_DEFAULT_VALUE + "\")", cu);
-		
-		xmlElementAnnotation.setDefaultValue(null);
-		
-		assertNull(xmlElementAnnotation.getDefaultValue());
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("@XmlElement(defaultValue = \"" + XML_ELEMENT_DEFAULT_VALUE + "\")", cu);
-	}
-	
-	public void testGetNillable() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithBooleanElement("nillable");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertEquals(Boolean.TRUE, xmlElementAnnotation.getNillable());
-	}
-	
-	public void testSetNillable() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertNotNull(xmlElementAnnotation);
-		assertNull(xmlElementAnnotation.getNillable());
-		
-		xmlElementAnnotation.setNillable(Boolean.FALSE);
-		
-		assertEquals(Boolean.FALSE, xmlElementAnnotation.getNillable());
-		assertSourceContains("@XmlElement(nillable = false)", cu);
-		
-		xmlElementAnnotation.setNillable(null);
-		
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("nillable", cu);
-	}
-	
-	public void testGetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithBooleanElement("required");
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertEquals(Boolean.TRUE, xmlElementAnnotation.getRequired());
-	}
-	
-	public void testSetRequired() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertNotNull(xmlElementAnnotation);
-		assertNull(xmlElementAnnotation.getRequired());
-		
-		xmlElementAnnotation.setRequired(Boolean.FALSE);
-		
-		assertEquals(Boolean.FALSE, xmlElementAnnotation.getRequired());
-		assertSourceContains("@XmlElement(required = false)", cu);
-		
-		xmlElementAnnotation.setRequired(null);
-		
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("required", cu);
-	}
-	
-	public void testGetType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElementWithType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertTrue(xmlElementAnnotation != null);
-		assertEquals(XML_ELEMENT_TYPE, xmlElementAnnotation.getType());
-		assertEquals("java.lang." + XML_ELEMENT_TYPE, xmlElementAnnotation.getFullyQualifiedTypeName());
-	}
-	
-	public void testSetType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlElementAnnotation xmlElementAnnotation = getXmlElementAnnotation(resourceAttribute);
-		
-		assertNull(xmlElementAnnotation.getType());
-		
-		xmlElementAnnotation.setType(XML_ELEMENT_TYPE);
-		
-		assertEquals(XML_ELEMENT_TYPE, xmlElementAnnotation.getType());
-		assertSourceContains("@XmlElement(type = " + XML_ELEMENT_TYPE  + ".class", cu);
-		
-		xmlElementAnnotation.setType(null);
-		
-		assertNull(xmlElementAnnotation.getType());
-		assertSourceContains("@XmlElement", cu);
-		assertSourceDoesNotContain("@XmlElement(type = " + XML_ELEMENT_TYPE  + ".class", cu);
-	}
-	
-	public void testAddXmlElement() throws Exception {
-		ICompilationUnit cu = createTestXmlElementWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		addXmlElementAnnotation(1, resourceAttribute);
-		XmlElementsAnnotation annotation = (XmlElementsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENTS);
-		
-		assertSourceContains(
-				"@XmlElements({@XmlElement(name = \"" + XML_ELEMENT_NAME + "\"),@XmlElement})", 
-				cu);
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-		assertNotNull(annotation);
-		assertEquals(2, annotation.getXmlElementsSize());
-	}
-	
-	public void testAddXmlElementToBeginningOfList() throws Exception {
-		ICompilationUnit cu = createTestXmlElementWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		addXmlElementAnnotation(1, resourceAttribute);
-		XmlElementsAnnotation annotation = (XmlElementsAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ELEMENTS);
-		
-		assertSourceContains(
-				"@XmlElements({@XmlElement(name = \"" + XML_ELEMENT_NAME + "\"),@XmlElement})", 
-				cu);
-				
-		addXmlElementAnnotation(0, resourceAttribute);
-		
-		assertSourceContains(
-				"@XmlElements({@XmlElement,@XmlElement(name = \"" + XML_ELEMENT_NAME + "\"), @XmlElement})", 
-				cu);
-		
-		assertNull(resourceAttribute.getAnnotation(JAXB.XML_ELEMENT));
-		assertNotNull(annotation);
-		assertEquals(3, annotation.getXmlElementsSize());
-	}
-	
-	public void testRemoveXmlElement() throws Exception {
-		ICompilationUnit cu = createTestXmlElementWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		addXmlElementAnnotation(1, resourceAttribute);
-		
-		assertSourceContains(
-				"@XmlElements({@XmlElement(name = \"" + XML_ELEMENT_NAME + "\"),@XmlElement})", 
-				cu);
-		
-		removeXmlElementAnnotation(1, resourceAttribute);
-		
-		assertSourceContains(
-				"@XmlElement(name = \"" + XML_ELEMENT_NAME + "\")", 
-				cu);
-	}
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumAnnotationTests.java
deleted file mode 100644
index 02d0d62311..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumAnnotationTests.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlEnumAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_ENUM_JAVA_TYPE = "String";
-
-	public XmlEnumAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlEnum() throws Exception {
-		return this.createTestEnum(new DefaultEnumAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ENUM);
-			}
-			@Override
-			public void appendEnumAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlEnum");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlEnumWithValue() throws Exception {
-		return this.createTestEnum(new DefaultEnumAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ENUM);
-			}
-			@Override
-			public void appendEnumAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlEnum(value = " + XML_ENUM_JAVA_TYPE  + ".class)");
-			}
-		});
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlEnum();
-		JavaResourceEnum resourceEnum = this.buildJavaResourceEnum(cu); 
-
-		XmlEnumAnnotation xmlEnumAnnotation = (XmlEnumAnnotation) resourceEnum.getAnnotation(JAXB.XML_ENUM);
-		assertTrue(xmlEnumAnnotation != null);
-		assertNull(xmlEnumAnnotation.getValue());
-	}
-
-	public void testGetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlEnumWithValue();
-		JavaResourceEnum resourceEnum = this.buildJavaResourceEnum(cu); 
-
-		XmlEnumAnnotation xmlEnumAnnotation = (XmlEnumAnnotation) resourceEnum.getAnnotation(JAXB.XML_ENUM);
-		assertTrue(xmlEnumAnnotation != null);
-		assertEquals(XML_ENUM_JAVA_TYPE, xmlEnumAnnotation.getValue());
-		assertEquals("java.lang." + XML_ENUM_JAVA_TYPE, xmlEnumAnnotation.getFullyQualifiedValueClassName());
-	}
-
-	public void testSetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlEnum();
-		JavaResourceEnum resourceEnum = this.buildJavaResourceEnum(cu); 
-
-		XmlEnumAnnotation xmlEnumAnnotation = (XmlEnumAnnotation) resourceEnum.getAnnotation(JAXB.XML_ENUM);
-		assertNull(xmlEnumAnnotation.getValue());
-		xmlEnumAnnotation.setValue(XML_ENUM_JAVA_TYPE);
-		assertEquals(XML_ENUM_JAVA_TYPE, xmlEnumAnnotation.getValue());
-
-		assertSourceContains("@XmlEnum(" + XML_ENUM_JAVA_TYPE  + ".class)", cu);
-
-		xmlEnumAnnotation.setValue(null);
-		assertNull(xmlEnumAnnotation.getValue());
-
-		assertSourceContains("@XmlEnum", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumValueAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumValueAnnotationTests.java
deleted file mode 100644
index 4629e37f00..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumValueAnnotationTests.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceEnumConstant;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumValueAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlEnumValueAnnotationTests extends JaxbJavaResourceModelTestCase {
-	
-	private static final String XML_ENUM_VALUE_VALUE = "myEnumValue";
-
-	public XmlEnumValueAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlEnumValue() throws Exception {
-		return this.createTestEnum(new DefaultEnumAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ENUM_VALUE);
-			}
-			@Override
-			public void appendSundayEnumConstantAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlEnumValue");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlEnumValueWithValue() throws Exception {
-		return this.createTestXmlEnumValueWithStringElement("value", XML_ENUM_VALUE_VALUE);
-	}
-
-	private ICompilationUnit createTestXmlEnumValueWithStringElement(final String element, final String value) throws Exception {
-		return this.createTestEnum(new DefaultEnumAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ENUM_VALUE);
-			}
-			@Override
-			public void appendSundayEnumConstantAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlEnumValue(" + element + " = \"" + value + "\")");
-			}
-		});
-	}
-
-	public void testGetXmlEnumValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlEnumValue();
-		JavaResourceEnum resourceEnum = buildJavaResourceEnum(cu); 
-		JavaResourceEnumConstant enumConstant = getEnumConstant(resourceEnum, 0);
-
-		XmlEnumValueAnnotation xmlEnumValueAnnotation = (XmlEnumValueAnnotation) enumConstant.getAnnotation(JAXB.XML_ENUM_VALUE);
-		assertTrue(xmlEnumValueAnnotation != null);
-
-		enumConstant.removeAnnotation(JAXB.XML_ENUM_VALUE);
-		assertSourceDoesNotContain("@XmlEnumValue", cu);
-	}
-
-
-	public void testGetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlEnumValueWithValue();
-		JavaResourceEnum resourceEnum = buildJavaResourceEnum(cu); 
-		JavaResourceEnumConstant enumConstant = getEnumConstant(resourceEnum, 0);
-
-		XmlEnumValueAnnotation xmlEnumValueAnnotation = (XmlEnumValueAnnotation) enumConstant.getAnnotation(JAXB.XML_ENUM_VALUE);
-		assertTrue(xmlEnumValueAnnotation != null);
-		assertEquals(XML_ENUM_VALUE_VALUE, xmlEnumValueAnnotation.getValue());
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlEnumValue();
-		JavaResourceEnum resourceEnum = buildJavaResourceEnum(cu); 
-		JavaResourceEnumConstant enumConstant = getEnumConstant(resourceEnum, 0);
-
-		XmlEnumValueAnnotation xmlEnumValueAnnotation = (XmlEnumValueAnnotation) enumConstant.getAnnotation(JAXB.XML_ENUM_VALUE);
-		assertTrue(xmlEnumValueAnnotation != null);
-		assertNull(xmlEnumValueAnnotation.getValue());
-	}
-
-	public void testSetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlEnumValue();
-		JavaResourceEnum resourceEnum = buildJavaResourceEnum(cu); 
-		JavaResourceEnumConstant enumConstant = getEnumConstant(resourceEnum, 0);
-
-		XmlEnumValueAnnotation xmlEnumValueAnnotation = (XmlEnumValueAnnotation) enumConstant.getAnnotation(JAXB.XML_ENUM_VALUE);
-		assertNull(xmlEnumValueAnnotation.getValue());
-		xmlEnumValueAnnotation.setValue(XML_ENUM_VALUE_VALUE);
-		assertEquals(XML_ENUM_VALUE_VALUE, xmlEnumValueAnnotation.getValue());
-
-		assertSourceContains("@XmlEnumValue(\"" + XML_ENUM_VALUE_VALUE + "\")", cu);
-
-		xmlEnumValueAnnotation.setValue(null);
-		assertNull(xmlEnumValueAnnotation.getValue());
-
-		assertSourceDoesNotContain("@XmlEnumValue(", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDAnnotationTests.java
deleted file mode 100644
index 3c13c6e554..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlIDAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlIDAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlIDAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlID() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ID);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlID");
-			}
-		});
-	}
-
-	public void testGetXmlID() throws Exception {
-		ICompilationUnit cu = this.createTestXmlID();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlIDAnnotation xmlIDAnnotation = (XmlIDAnnotation) resourceAttribute.getAnnotation(JAXB.XML_ID);
-		assertTrue(xmlIDAnnotation != null);
-
-		resourceAttribute.removeAnnotation(JAXB.XML_ID);
-		assertSourceDoesNotContain("@XmlID", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDREFAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDREFAnnotationTests.java
deleted file mode 100644
index 48aacb46ce..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDREFAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlIDREFAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlIDREFAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlIDREFAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlIDREF() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_IDREF);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlIDREF");
-			}
-		});
-	}
-
-	public void testGetXmlIDREF() throws Exception {
-		ICompilationUnit cu = this.createTestXmlIDREF();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlIDREFAnnotation xmlIDREFAnnotation = (XmlIDREFAnnotation) resourceAttribute.getAnnotation(JAXB.XML_IDREF);
-		assertTrue(xmlIDREFAnnotation != null);
-
-		resourceAttribute.removeAnnotation(JAXB.XML_IDREF);
-		assertSourceDoesNotContain("@XmlIDREF", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataAttributeAnnotationTests.java
deleted file mode 100644
index 47ad282afd..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataAttributeAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlInlineBinaryDataAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlInlineBinaryDataAttributeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlInlineBinaryDataAttributeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlInlineBinaryData() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_INLINE_BINARY_DATA);
-			}
-			@Override
-			public void appendGetIdMethodAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlInlineBinaryData");
-			}
-		});
-	}
-
-	public void testGetXmlInlineBinaryData() throws Exception {
-		ICompilationUnit cu = this.createTestXmlInlineBinaryData();
-		JavaResourceType resourceType = this.buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = this.getMethod(resourceType, 0);
-
-		XmlInlineBinaryDataAnnotation xmlInlineBinaryDataAnnotation = (XmlInlineBinaryDataAnnotation) resourceMethod.getAnnotation(JAXB.XML_INLINE_BINARY_DATA);
-		assertTrue(xmlInlineBinaryDataAnnotation != null);
-
-		resourceMethod.removeAnnotation(JAXB.XML_INLINE_BINARY_DATA);
-		assertSourceDoesNotContain("@XmlInlineBinaryData", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataTypeAnnotationTests.java
deleted file mode 100644
index 1ed94cbb14..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataTypeAnnotationTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlInlineBinaryDataAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlInlineBinaryDataTypeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlInlineBinaryDataTypeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlInlineBinaryData() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_INLINE_BINARY_DATA);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlInlineBinaryData");
-			}
-		});
-	}
-
-	public void testGetXmlInlineBinaryData() throws Exception {
-		ICompilationUnit cu = this.createTestXmlInlineBinaryData();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlInlineBinaryDataAnnotation xmlInlineBinaryDataAnnotation = (XmlInlineBinaryDataAnnotation) resourceType.getAnnotation(JAXB.XML_INLINE_BINARY_DATA);
-		assertTrue(xmlInlineBinaryDataAnnotation != null);
-
-		resourceType.removeAnnotation(JAXB.XML_INLINE_BINARY_DATA);
-		assertSourceDoesNotContain("@XmlInlineBinaryData", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterPackageAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterPackageAnnotationTests.java
deleted file mode 100644
index adeab40f26..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterPackageAnnotationTests.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlJavaTypeAdapterPackageAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	private static final String TEST_CLASS = "TestClass";
-	private static final String TEST_CLASS_2 = "TestClass2";
-	private static final String FQ_TEST_CLASS = PACKAGE_NAME + "." + TEST_CLASS;
-	private static final String FQ_TEST_CLASS_2 = PACKAGE_NAME + "." + TEST_CLASS_2;
-	
-	
-	public XmlJavaTypeAdapterPackageAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private void createTestClass() throws CoreException {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("public class ").append(TEST_CLASS).append(" ");
-				sb.append("{}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, TEST_CLASS + ".java", sourceWriter);
-	}
-	
-	private void createTestClass2() throws CoreException {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("public class ").append(TEST_CLASS_2).append(" ");
-				sb.append("{}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, TEST_CLASS_2 + ".java", sourceWriter);
-	}
-	
-	private ICompilationUnit createPackageInfoWithJavaTypeAdapter() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlJavaTypeAdapter",
-				JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-	
-	private ICompilationUnit createPackageInfoWithJavaTypeAdapterAndValue() throws CoreException {
-		createTestClass();
-		return createTestPackageInfo(
-				"@XmlJavaTypeAdapter(" + TEST_CLASS + ".class)",
-				JAXB.XML_JAVA_TYPE_ADAPTER, FQ_TEST_CLASS);
-	}
-	
-	private ICompilationUnit createPackageInfoWithJavaTypeAdapterAndType() throws CoreException {
-		createTestClass();
-		return createTestPackageInfo(
-				"@XmlJavaTypeAdapter(type = " + TEST_CLASS + ".class)",
-				JAXB.XML_JAVA_TYPE_ADAPTER, FQ_TEST_CLASS);
-	}
-	
-	private ICompilationUnit createPackageInfoWithJavaTypeAdapters() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlJavaTypeAdapters({@XmlJavaTypeAdapter,@XmlJavaTypeAdapter})",
-				JAXB.XML_JAVA_TYPE_ADAPTERS, JAXB.XML_JAVA_TYPE_ADAPTER);
-	}
-	
-	public void testValue() 
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithJavaTypeAdapterAndValue();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu); 
-		createTestClass2();
-		
-		XmlJavaTypeAdapterAnnotation annotation = 
-				(XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertTrue(annotation != null);
-		assertEquals(TEST_CLASS, annotation.getValue());
-		assertEquals(FQ_TEST_CLASS, annotation.getFullyQualifiedValue());
-		assertSourceContains("@XmlJavaTypeAdapter(" + TEST_CLASS + ".class)", cu);
-		
-		annotation.setValue(TEST_CLASS_2);
-		assertEquals(TEST_CLASS_2, annotation.getValue());
-		assertEquals(FQ_TEST_CLASS_2, annotation.getFullyQualifiedValue());
-		assertSourceContains("@XmlJavaTypeAdapter(" + TEST_CLASS_2 + ".class)", cu);
-		
-		annotation.setValue(null);
-		assertEquals(null, annotation.getValue());
-		assertEquals(null, annotation.getFullyQualifiedValue());
-		assertSourceContains("@XmlJavaTypeAdapter", cu);
-		
-		annotation.setValue(TEST_CLASS);
-		assertEquals(TEST_CLASS, annotation.getValue());
-		assertEquals(FQ_TEST_CLASS, annotation.getFullyQualifiedValue());
-		assertSourceContains("@XmlJavaTypeAdapter(" + TEST_CLASS + ".class)", cu);
-	}
-	
-	public void testType() 
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithJavaTypeAdapterAndType();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu); 
-		createTestClass2();
-		
-		XmlJavaTypeAdapterAnnotation annotation = 
-				(XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertTrue(annotation != null);
-		assertEquals(TEST_CLASS, annotation.getType());
-		assertEquals(FQ_TEST_CLASS, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlJavaTypeAdapter(type = " + TEST_CLASS + ".class)", cu);
-		
-		annotation.setType(TEST_CLASS_2);
-		assertEquals(TEST_CLASS_2, annotation.getType());
-		assertEquals(FQ_TEST_CLASS_2, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlJavaTypeAdapter(type = " + TEST_CLASS_2 + ".class)", cu);
-		
-		annotation.setType(null);
-		assertEquals(null, annotation.getType());
-		assertEquals(null, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlJavaTypeAdapter", cu);
-		
-		annotation.setType(TEST_CLASS);
-		assertEquals(TEST_CLASS, annotation.getType());
-		assertEquals(FQ_TEST_CLASS, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlJavaTypeAdapter(type = " + TEST_CLASS + ".class)", cu);
-	}
-	
-	public void testTypeWithValue()
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithJavaTypeAdapterAndValue();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu); 
-		createTestClass2();
-		
-		XmlJavaTypeAdapterAnnotation annotation = 
-				(XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertTrue(annotation != null);
-		assertEquals(TEST_CLASS, annotation.getValue());
-		assertSourceContains("@XmlJavaTypeAdapter(" + TEST_CLASS + ".class)", cu);
-		
-		annotation.setType(TEST_CLASS_2);
-		assertEquals(TEST_CLASS, annotation.getValue());
-		assertEquals(TEST_CLASS_2, annotation.getType());
-		assertSourceContains("@XmlJavaTypeAdapter(value = " + TEST_CLASS + ".class, type = " + TEST_CLASS_2 + ".class)", cu);
-		
-		annotation.setValue(null);
-		assertEquals(null, annotation.getValue());
-		assertEquals(TEST_CLASS_2, annotation.getType());
-		assertSourceContains("@XmlJavaTypeAdapter(type = " + TEST_CLASS_2 + ".class)", cu);
-		
-		annotation.setValue(TEST_CLASS);
-		assertEquals(TEST_CLASS, annotation.getValue());
-		assertEquals(TEST_CLASS_2, annotation.getType());
-		assertSourceContains("@XmlJavaTypeAdapter(type = " + TEST_CLASS_2 + ".class, value = " + TEST_CLASS + ".class)", cu);
-		
-		annotation.setType(null);
-		assertEquals(TEST_CLASS, annotation.getValue());
-		assertEquals(null, annotation.getType());
-		assertSourceContains("@XmlJavaTypeAdapter(" + TEST_CLASS + ".class)", cu);
-	}
-	
-	public void testContainedWithValue()
-			throws Exception {
-		// test contained annotation value setting/updating
-		
-		ICompilationUnit cu = createPackageInfoWithJavaTypeAdapters();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu);
-		createTestClass();
-		
-		XmlJavaTypeAdapterAnnotation adapterAnnotation = 
-			(XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		
-		adapterAnnotation.setValue(TEST_CLASS);
-		assertEquals(TEST_CLASS, adapterAnnotation.getValue());
-		assertEquals(FQ_TEST_CLASS, adapterAnnotation.getFullyQualifiedValue());
-		assertSourceContains(
-				"@XmlJavaTypeAdapters({@XmlJavaTypeAdapter(" + TEST_CLASS + ".class),@XmlJavaTypeAdapter})", cu);
-		
-		adapterAnnotation.setValue(null);
-		assertNull(adapterAnnotation.getValue());
-		assertNull(FQ_TEST_CLASS, adapterAnnotation.getFullyQualifiedValue());
-		assertSourceContains(
-				"@XmlJavaTypeAdapters({@XmlJavaTypeAdapter,@XmlJavaTypeAdapter})", cu);
-	}
-	
-	public void testContainedWithType()
-			throws Exception {
-		// test contained annotation type setting/updating
-		
-		ICompilationUnit cu = createPackageInfoWithJavaTypeAdapters();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu);
-		createTestClass();
-		
-		XmlJavaTypeAdapterAnnotation adapterAnnotation = 
-			(XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(1, JAXB.XML_JAVA_TYPE_ADAPTER);
-		
-		adapterAnnotation.setType(TEST_CLASS);
-		assertEquals(TEST_CLASS, adapterAnnotation.getType());
-		assertEquals(FQ_TEST_CLASS, adapterAnnotation.getFullyQualifiedType());
-		assertSourceContains(
-				"@XmlJavaTypeAdapters({@XmlJavaTypeAdapter,@XmlJavaTypeAdapter(type = " + TEST_CLASS + ".class)})", cu);
-		
-		resourcePackage.moveAnnotation(0, 1, JAXB.XML_JAVA_TYPE_ADAPTER);
-		adapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals(TEST_CLASS, adapterAnnotation.getType());
-		assertEquals(FQ_TEST_CLASS, adapterAnnotation.getFullyQualifiedType());
-		assertSourceContains(
-				"@XmlJavaTypeAdapters({@XmlJavaTypeAdapter(type = " + TEST_CLASS + ".class),@XmlJavaTypeAdapter})", cu);
-		
-		adapterAnnotation.setType(null);
-		assertNull(adapterAnnotation.getType());
-		assertNull(FQ_TEST_CLASS, adapterAnnotation.getFullyQualifiedType());
-		assertSourceContains(
-				"@XmlJavaTypeAdapters({@XmlJavaTypeAdapter,@XmlJavaTypeAdapter})", cu);
-	}
-	
-	public void testContained()
-			throws Exception {
-		// test adding/removing/moving
-		
-		ICompilationUnit cu = createPackageInfoWithJavaTypeAdapter();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu);
-		createTestClass();
-		createTestClass2();
-		
-		assertEquals(1, resourcePackage.getAnnotationsSize(JAXB.XML_JAVA_TYPE_ADAPTER));
-		
-		resourcePackage.addAnnotation(1, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals(2, resourcePackage.getAnnotationsSize(JAXB.XML_JAVA_TYPE_ADAPTER));
-		assertSourceContains("@XmlJavaTypeAdapters({ @XmlJavaTypeAdapter, @XmlJavaTypeAdapter })", cu);
-		
-		XmlJavaTypeAdapterAnnotation adapterAnnotation1 = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		adapterAnnotation1.setValue(TEST_CLASS);
-		XmlJavaTypeAdapterAnnotation adapterAnnotation2 = (XmlJavaTypeAdapterAnnotation) resourcePackage.getAnnotation(1, JAXB.XML_JAVA_TYPE_ADAPTER);
-		adapterAnnotation2.setValue(TEST_CLASS_2);
-		assertSourceContains(
-				"@XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(" + TEST_CLASS
-					+ ".class), @XmlJavaTypeAdapter(" + TEST_CLASS_2
-					+ ".class) })", cu);
-		
-		resourcePackage.moveAnnotation(0, 1, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertSourceContains(
-				"@XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(" + TEST_CLASS_2
-					+ ".class), @XmlJavaTypeAdapter(" + TEST_CLASS
-					+ ".class) })", cu);
-		
-		resourcePackage.removeAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals(1, resourcePackage.getAnnotationsSize(JAXB.XML_JAVA_TYPE_ADAPTER));
-		assertSourceContains(
-				"@XmlJavaTypeAdapter(" + TEST_CLASS + ".class)", cu);
-		assertSourceDoesNotContain("@XmlJavaTypeAdapters", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java
deleted file mode 100644
index 760feb054c..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlJavaTypeAdapterTypeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_JAVA_TYPE_ADAPTER_CLASS = "MyAdapterClass";
-
-	public XmlJavaTypeAdapterTypeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlJavaTypeAdapter() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJavaTypeAdapter");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlJavaTypeAdapterWithValue() throws Exception {
-		this.createTestAdapterClass();
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_JAVA_TYPE_ADAPTER);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJavaTypeAdapter(value = " + XML_JAVA_TYPE_ADAPTER_CLASS  + ".class)");
-			}
-		});
-	}
-
-	private void createTestAdapterClass() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("public class ").append(XML_JAVA_TYPE_ADAPTER_CLASS).append(" ");
-				sb.append("{}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "MyAdapterClass.java", sourceWriter);
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlJavaTypeAdapter();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertTrue(xmlJavaTypeAdapterAnnotation != null);
-		assertNull(xmlJavaTypeAdapterAnnotation.getValue());
-	}
-
-	public void testGetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlJavaTypeAdapterWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertTrue(xmlJavaTypeAdapterAnnotation != null);
-		assertEquals(XML_JAVA_TYPE_ADAPTER_CLASS, xmlJavaTypeAdapterAnnotation.getValue());
-		assertEquals("test." + XML_JAVA_TYPE_ADAPTER_CLASS, xmlJavaTypeAdapterAnnotation.getFullyQualifiedValue());
-	}
-
-	public void testSetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlJavaTypeAdapter();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertNull(xmlJavaTypeAdapterAnnotation.getValue());
-		xmlJavaTypeAdapterAnnotation.setValue(XML_JAVA_TYPE_ADAPTER_CLASS);
-		assertEquals(XML_JAVA_TYPE_ADAPTER_CLASS, xmlJavaTypeAdapterAnnotation.getValue());
-
-		assertSourceContains("@XmlJavaTypeAdapter(" + XML_JAVA_TYPE_ADAPTER_CLASS + ".class)", cu);
-	}
-
-	public void testSetValueNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlJavaTypeAdapterWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlJavaTypeAdapterAnnotation xmlJavaTypeAdapterAnnotation = (XmlJavaTypeAdapterAnnotation) resourceType.getAnnotation(0, JAXB.XML_JAVA_TYPE_ADAPTER);
-		assertEquals(XML_JAVA_TYPE_ADAPTER_CLASS, xmlJavaTypeAdapterAnnotation.getValue());
-
-		xmlJavaTypeAdapterAnnotation.setValue(null);
-		assertNull(xmlJavaTypeAdapterAnnotation.getValue());
-
-		assertSourceContains("@XmlJavaTypeAdapter", cu);
-		assertSourceDoesNotContain("@XmlJavaTypeAdapter(" + XML_JAVA_TYPE_ADAPTER_CLASS + ".class)", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlListAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlListAnnotationTests.java
deleted file mode 100644
index c21a90420d..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlListAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlListAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlListAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlListAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlList() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_LIST);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlList");
-			}
-		});
-	}
-
-	public void testGetXmlList() throws Exception {
-		ICompilationUnit cu = this.createTestXmlList();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlListAnnotation xmlListAnnotation = (XmlListAnnotation) resourceAttribute.getAnnotation(JAXB.XML_LIST);
-		assertTrue(xmlListAnnotation != null);
-
-		resourceAttribute.removeAnnotation(JAXB.XML_LIST);
-		assertSourceDoesNotContain("@XmlList", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMimeTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMimeTypeAnnotationTests.java
deleted file mode 100644
index 510878c149..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMimeTypeAnnotationTests.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlMimeTypeAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlMimeTypeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_MIME_TYPE_VALUE = "myMimeType";
-
-	public XmlMimeTypeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlMimeType() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_MIME_TYPE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlMimeType");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlMimeTypeWithValue() throws Exception {
-		return this.createTestXmlMimeTypeWithStringElement("value", XML_MIME_TYPE_VALUE);
-	}
-
-	private ICompilationUnit createTestXmlMimeTypeWithStringElement(final String element, final String value) throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_MIME_TYPE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlMimeType(" + element + " = \"" + value + "\")");
-			}
-		});
-	}
-
-	public void testGetXmlMimeType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlMimeType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlMimeTypeAnnotation xmlMimeTypeAnnotation = (XmlMimeTypeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIME_TYPE);
-		assertTrue(xmlMimeTypeAnnotation != null);
-
-		resourceAttribute.removeAnnotation(JAXB.XML_MIME_TYPE);
-		assertSourceDoesNotContain("@XmlMimeType", cu);
-	}
-
-	public void testGetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlMimeTypeWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlMimeTypeAnnotation xmlMimeTypeAnnotation = (XmlMimeTypeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIME_TYPE);
-		assertTrue(xmlMimeTypeAnnotation != null);
-		assertEquals(XML_MIME_TYPE_VALUE, xmlMimeTypeAnnotation.getValue());
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlMimeType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlMimeTypeAnnotation xmlMimeTypeAnnotation = (XmlMimeTypeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIME_TYPE);
-		assertTrue(xmlMimeTypeAnnotation != null);
-		assertNull(xmlMimeTypeAnnotation.getValue());
-	}
-
-	public void testSetValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlMimeType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlMimeTypeAnnotation xmlMimeTypeAnnotation = (XmlMimeTypeAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIME_TYPE);
-		assertNull(xmlMimeTypeAnnotation.getValue());
-		xmlMimeTypeAnnotation.setValue(XML_MIME_TYPE_VALUE);
-		assertEquals(XML_MIME_TYPE_VALUE, xmlMimeTypeAnnotation.getValue());
-
-		assertSourceContains("@XmlMimeType(\"" + XML_MIME_TYPE_VALUE + "\")", cu);
-
-		xmlMimeTypeAnnotation.setValue(null);
-		assertNull(xmlMimeTypeAnnotation.getValue());
-
-		assertSourceDoesNotContain("@XmlMimeType(", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMixedAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMixedAnnotationTests.java
deleted file mode 100644
index fe9e868763..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMixedAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlMixedAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlMixedAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlMixedAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlMixed() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_MIXED);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlMixed");
-			}
-		});
-	}
-
-	public void testGetXmlMixed() throws Exception {
-		ICompilationUnit cu = this.createTestXmlMixed();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlMixedAnnotation xmlMixedAnnotation = (XmlMixedAnnotation) resourceAttribute.getAnnotation(JAXB.XML_MIXED);
-		assertTrue(xmlMixedAnnotation != null);
-
-		resourceAttribute.removeAnnotation(JAXB.XML_MIXED);
-		assertSourceDoesNotContain("@XmlMixed", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRegistryAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRegistryAnnotationTests.java
deleted file mode 100644
index 2e7b36bb2e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRegistryAnnotationTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlRegistryAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlRegistryAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlRegistryAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlRegistry() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_REGISTRY);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlRegistry");
-			}
-		});
-	}
-
-	public void testGetXmlRegistry() throws Exception {
-		ICompilationUnit cu = this.createTestXmlRegistry();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlRegistryAnnotation xmlRegistryAnnotation = (XmlRegistryAnnotation) resourceType.getAnnotation(JAXB.XML_REGISTRY);
-		assertTrue(xmlRegistryAnnotation != null);
-
-		resourceType.removeAnnotation(JAXB.XML_REGISTRY);
-		assertSourceDoesNotContain("@XmlRegistry", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRootElementAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRootElementAnnotationTests.java
deleted file mode 100644
index adb6360444..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRootElementAnnotationTests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlRootElementAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_ROOT_ELEMENT_NAME = "XmlRootElementName";
-	private static final String XML_ROOT_ELEMENT_NAMESPACE = "XmlRootElementNamespace";
-
-	public XmlRootElementAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlRootElement() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ROOT_ELEMENT);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlRootElement");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlRootElementWithName() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ROOT_ELEMENT);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlRootElement(name = \"" + XML_ROOT_ELEMENT_NAME + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlRootElementWithNamespace() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_ROOT_ELEMENT);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlRootElement(namespace = \"" + XML_ROOT_ELEMENT_NAMESPACE + "\")");
-			}
-		});
-	}
-
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlRootElementWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlRootElementAnnotation xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertTrue(xmlRootElementAnnotation != null);
-		assertEquals(XML_ROOT_ELEMENT_NAME, xmlRootElementAnnotation.getName());
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlRootElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlRootElementAnnotation xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertTrue(xmlRootElementAnnotation != null);
-		assertNull(xmlRootElementAnnotation.getName());
-		assertNull(xmlRootElementAnnotation.getNamespace());
-	}
-
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlRootElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlRootElementAnnotation xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertNull(xmlRootElementAnnotation.getName());
-		xmlRootElementAnnotation.setName(XML_ROOT_ELEMENT_NAME);
-		assertEquals(XML_ROOT_ELEMENT_NAME, xmlRootElementAnnotation.getName());
-
-		assertSourceContains("@XmlRootElement(name = \"" + XML_ROOT_ELEMENT_NAME + "\")", cu);
-
-		xmlRootElementAnnotation.setName(null);
-		assertNull(xmlRootElementAnnotation.getName());
-
-		assertSourceContains("@XmlRootElement", cu);
-		assertSourceDoesNotContain("@XmlRootElement(name = \"" + XML_ROOT_ELEMENT_NAME + "\")", cu);
-	}
-
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlRootElementWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlRootElementAnnotation xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertTrue(xmlRootElementAnnotation != null);
-		assertEquals(XML_ROOT_ELEMENT_NAMESPACE, xmlRootElementAnnotation.getNamespace());
-	}
-
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlRootElement();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlRootElementAnnotation xmlRootElementAnnotation = (XmlRootElementAnnotation) resourceType.getAnnotation(JAXB.XML_ROOT_ELEMENT);
-		assertNull(xmlRootElementAnnotation.getNamespace());
-		xmlRootElementAnnotation.setNamespace(XML_ROOT_ELEMENT_NAMESPACE);
-		assertEquals(XML_ROOT_ELEMENT_NAMESPACE, xmlRootElementAnnotation.getNamespace());
-
-		assertSourceContains("@XmlRootElement(namespace = \"" + XML_ROOT_ELEMENT_NAMESPACE + "\")", cu);
-
-		xmlRootElementAnnotation.setNamespace(null);
-		assertNull(xmlRootElementAnnotation.getNamespace());
-
-		assertSourceContains("@XmlRootElement", cu);
-		assertSourceDoesNotContain("@XmlRootElement(namespace = \"" + XML_ROOT_ELEMENT_NAMESPACE + "\")", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaAnnotationTests.java
deleted file mode 100644
index 9a4bbd2ab3..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaAnnotationTests.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlNsAnnotation;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlNsForm;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlSchemaAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-	
-	private static final String TEST_LOCATION = "http://www.eclipse.org/test/schema.xsd";
-	
-	private static final String TEST_NAMESPACE = "http://www.eclipse.org/test/schema";
-	
-	private static final String TEST_PREFIX = "ts";
-	
-	private static final String TEST_NAMESPACE_2 = "http://www.eclipse.org/test/schema2";
-	
-	private static final String TEST_PREFIX_2 = "ts2";
-	
-	
-	public XmlSchemaAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createPackageInfoWithSchemaAndAttributeFormDefault() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchema(attributeFormDefault = XmlNsForm.QUALIFIED)",
-				JAXB.XML_SCHEMA, JAXB.XML_NS_FORM);
-	}
-	
-	private ICompilationUnit createPackageInfoWithSchemaAndElementFormDefault() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED)",
-				JAXB.XML_SCHEMA, JAXB.XML_NS_FORM);
-	}
-	
-	private ICompilationUnit createPackageInfoWithSchemaAndLocation() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchema(location = \"" + TEST_LOCATION + "\")",
-				JAXB.XML_SCHEMA);
-	}
-	
-	private ICompilationUnit createPackageInfoWithSchemaAndNamespace() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchema(namespace = \"" + TEST_NAMESPACE + "\")",
-				JAXB.XML_SCHEMA);
-	}
-	
-	private ICompilationUnit createPackageInfoWithSchemaAndXmlns() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchema(xmlns = @XmlNs)",
-				JAXB.XML_SCHEMA, JAXB.XML_NS);
-	}
-	
-	private ICompilationUnit createPackageInfoWithSchemaAndXmlnsWithNamespace() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchema(xmlns = @XmlNs(namespaceURI = \"" + TEST_NAMESPACE + "\"))",
-				JAXB.XML_SCHEMA, JAXB.XML_NS);
-	}
-	
-	private ICompilationUnit createPackageInfoWithSchemaAndXmlnsWithPrefix() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchema(xmlns = @XmlNs(prefix = \"" + TEST_PREFIX + "\"))",
-				JAXB.XML_SCHEMA, JAXB.XML_NS);
-	}
-	
-	public void testAttributeFormDefault() 
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithSchemaAndAttributeFormDefault();
-		JavaResourcePackage packageResource = buildJavaResourcePackage(cu); 
-		
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertTrue(schemaAnnotation != null);
-		assertEquals(XmlNsForm.QUALIFIED, schemaAnnotation.getAttributeFormDefault());
-		assertSourceContains("@XmlSchema(attributeFormDefault = XmlNsForm.QUALIFIED)", cu);
-		
-		schemaAnnotation.setAttributeFormDefault(XmlNsForm.UNQUALIFIED);
-		assertEquals(XmlNsForm.UNQUALIFIED, schemaAnnotation.getAttributeFormDefault());
-		assertSourceContains("@XmlSchema(attributeFormDefault = UNQUALIFIED)", cu);
-		
-		schemaAnnotation.setAttributeFormDefault(XmlNsForm.UNSET);
-		assertEquals(XmlNsForm.UNSET, schemaAnnotation.getAttributeFormDefault());
-		assertSourceContains("@XmlSchema(attributeFormDefault = UNSET)", cu);
-		
-		schemaAnnotation.setAttributeFormDefault(null);
-		schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertNull(schemaAnnotation.getAttributeFormDefault());
-		assertSourceDoesNotContain("@XmlSchema(", cu);
-		
-		schemaAnnotation = (XmlSchemaAnnotation) packageResource.addAnnotation(JAXB.XML_SCHEMA);
-		schemaAnnotation.setAttributeFormDefault(XmlNsForm.QUALIFIED);
-		assertEquals(XmlNsForm.QUALIFIED, schemaAnnotation.getAttributeFormDefault());
-		assertSourceContains("@XmlSchema(attributeFormDefault = QUALIFIED)", cu);
-	}
-	
-	public void testElementFormDefault() 
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithSchemaAndElementFormDefault();
-		JavaResourcePackage packageResource = buildJavaResourcePackage(cu); 
-		
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertTrue(schemaAnnotation != null);
-		assertEquals(XmlNsForm.QUALIFIED, schemaAnnotation.getElementFormDefault());
-		assertSourceContains("@XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED)", cu);
-		
-		schemaAnnotation.setElementFormDefault(XmlNsForm.UNQUALIFIED);
-		assertEquals(XmlNsForm.UNQUALIFIED, schemaAnnotation.getElementFormDefault());
-		assertSourceContains("@XmlSchema(elementFormDefault = UNQUALIFIED)", cu);
-		
-		schemaAnnotation.setElementFormDefault(XmlNsForm.UNSET);
-		assertEquals(XmlNsForm.UNSET, schemaAnnotation.getElementFormDefault());
-		assertSourceContains("@XmlSchema(elementFormDefault = UNSET)", cu);
-		
-		schemaAnnotation.setElementFormDefault(null);
-		schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertNull(schemaAnnotation.getElementFormDefault());
-		assertSourceDoesNotContain("@XmlSchema(", cu);
-		
-		schemaAnnotation = (XmlSchemaAnnotation) packageResource.addAnnotation(JAXB.XML_SCHEMA);
-		schemaAnnotation.setElementFormDefault(XmlNsForm.QUALIFIED);
-		assertEquals(XmlNsForm.QUALIFIED, schemaAnnotation.getElementFormDefault());
-		assertSourceContains("@XmlSchema(elementFormDefault = QUALIFIED)", cu);
-	}
-	
-	public void testLocation() 
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithSchemaAndLocation();
-		JavaResourcePackage packageResource = buildJavaResourcePackage(cu); 
-		
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertNotNull(schemaAnnotation.getLocation());
-		
-		schemaAnnotation.setLocation(null);
-		schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertNull(schemaAnnotation.getLocation());
-		assertSourceDoesNotContain("@XmlSchema(", cu);
-		
-		schemaAnnotation = (XmlSchemaAnnotation) packageResource.addAnnotation(JAXB.XML_SCHEMA);
-		schemaAnnotation.setLocation(TEST_LOCATION);
-		assertEquals(TEST_LOCATION, schemaAnnotation.getLocation());
-		assertSourceContains("@XmlSchema(location = \"" + TEST_LOCATION + "\")", cu);
-	}
-	
-	public void testNamespace() 
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithSchemaAndNamespace();
-		JavaResourcePackage packageResource = buildJavaResourcePackage(cu); 
-		
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertNotNull(schemaAnnotation.getNamespace());
-		
-		schemaAnnotation.setNamespace(null);
-		schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertNull(schemaAnnotation.getNamespace());
-		assertSourceDoesNotContain("@XmlSchema(", cu);
-		
-		schemaAnnotation = (XmlSchemaAnnotation) packageResource.addAnnotation(JAXB.XML_SCHEMA);
-		schemaAnnotation.setNamespace(TEST_NAMESPACE);
-		assertEquals(TEST_NAMESPACE, schemaAnnotation.getNamespace());
-		assertSourceContains("@XmlSchema(namespace = \"" + TEST_NAMESPACE + "\")", cu);
-	}
-	
-	public void testXmlnsNamespace()
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithSchemaAndXmlnsWithNamespace();
-		JavaResourcePackage packageResource = buildJavaResourcePackage(cu); 
-		
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		XmlNsAnnotation xmlnsAnnotation = schemaAnnotation.xmlnsAt(0);
-		assertNotNull(xmlnsAnnotation.getNamespaceURI());
-		
-		xmlnsAnnotation.setNamespaceURI(null);
-		assertNull(xmlnsAnnotation.getNamespaceURI());
-		assertSourceContains("@XmlSchema(xmlns = @XmlNs)", cu);
-		
-		xmlnsAnnotation.setNamespaceURI(TEST_NAMESPACE_2);
-		assertEquals(TEST_NAMESPACE_2, xmlnsAnnotation.getNamespaceURI());
-		assertSourceContains("@XmlSchema(xmlns = @XmlNs(namespaceURI = \"" + TEST_NAMESPACE_2 + "\"))", cu);
-	}
-	
-	public void testXmlnsPrefix()
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithSchemaAndXmlnsWithPrefix();
-		JavaResourcePackage packageResource = buildJavaResourcePackage(cu); 
-		
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		XmlNsAnnotation xmlnsAnnotation = schemaAnnotation.xmlnsAt(0);
-		assertNotNull(xmlnsAnnotation.getPrefix());
-		
-		xmlnsAnnotation.setPrefix(null);
-		assertNull(xmlnsAnnotation.getPrefix());
-		assertSourceContains("@XmlSchema(xmlns = @XmlNs)", cu);
-		
-		xmlnsAnnotation.setPrefix(TEST_PREFIX_2);
-		assertEquals(TEST_PREFIX_2, xmlnsAnnotation.getPrefix());
-		assertSourceContains("@XmlSchema(xmlns = @XmlNs(prefix = \"" + TEST_PREFIX_2 + "\"))", cu);
-	}
-	
-	public void testXmlns()
-			throws Exception {
-		
-		ICompilationUnit cu = createPackageInfoWithSchemaAndXmlns();
-		JavaResourcePackage packageResource = buildJavaResourcePackage(cu); 
-		
-		XmlSchemaAnnotation schemaAnnotation = (XmlSchemaAnnotation) packageResource.getAnnotation(JAXB.XML_SCHEMA);
-		assertFalse(CollectionTools.isEmpty(schemaAnnotation.getXmlns()));
-		assertEquals(1, schemaAnnotation.getXmlnsSize());
-		
-		schemaAnnotation.addXmlns(1);
-		assertEquals(2, schemaAnnotation.getXmlnsSize());
-		assertSourceContains("@XmlSchema(xmlns = {@XmlNs,@XmlNs})", cu);
-		
-		XmlNsAnnotation xmlnsAnnotation1 = schemaAnnotation.xmlnsAt(0);
-		xmlnsAnnotation1.setNamespaceURI(TEST_NAMESPACE);
-		xmlnsAnnotation1.setPrefix(TEST_PREFIX);
-		XmlNsAnnotation xmlnsAnnotation2 = schemaAnnotation.xmlnsAt(1);
-		xmlnsAnnotation2.setNamespaceURI(TEST_NAMESPACE_2);
-		xmlnsAnnotation2.setPrefix(TEST_PREFIX_2);
-		assertSourceContains(
-				"@XmlSchema(xmlns = {@XmlNs(namespaceURI = \"" + TEST_NAMESPACE 
-					+ "\", prefix = \"" + TEST_PREFIX 
-					+ "\"),@XmlNs(namespaceURI = \"" + TEST_NAMESPACE_2
-					+ "\", prefix = \"" + TEST_PREFIX_2
-					+ "\")})", cu);
-		
-		schemaAnnotation.moveXmlns(0, 1);
-		assertSourceContains(
-				"@XmlSchema(xmlns = {@XmlNs(namespaceURI = \"" + TEST_NAMESPACE_2
-					+ "\", prefix = \"" + TEST_PREFIX_2
-					+ "\"),@XmlNs(namespaceURI = \"" + TEST_NAMESPACE
-					+ "\", prefix = \"" + TEST_PREFIX
-					+ "\")})", cu);
-		
-		schemaAnnotation.removeXmlns(1);
-		assertEquals(1, schemaAnnotation.getXmlnsSize());
-		assertSourceContains(
-				"@XmlSchema(xmlns = @XmlNs(namespaceURI = \"" + TEST_NAMESPACE_2
-					+ "\", prefix = \"" + TEST_PREFIX_2
-					+ "\"))", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAttributeAnnotationTests.java
deleted file mode 100644
index adebaa97b8..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAttributeAnnotationTests.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlSchemaTypeAttributeAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-
-	private static final String TEST_NAME = "foo";
-	private static final String TEST_NAME_2 = "bar";
-
-	private static final String TEST_NAMESPACE = "http://www.eclipse.org/test/schema";
-	private static final String TEST_NAMESPACE_2 = "http://www.eclipse.org/test/schema2";
-
-	private static final String TEST_CLASS = GregorianCalendar.class.getSimpleName();
-	private static final String TEST_CLASS_2 = Date.class.getSimpleName();
-	private static final String FQ_TEST_CLASS = GregorianCalendar.class.getName();
-	private static final String FQ_TEST_CLASS_2 = Date.class.getName();
-
-
-	public XmlSchemaTypeAttributeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlAttributeWithSchemaTypeAndName() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_SCHEMA_TYPE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlSchemaType(name = \"" + TEST_NAME + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlAttributeWithSchemaTypeAndNamespace() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_SCHEMA_TYPE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlSchemaType(namespace = \"" + TEST_NAMESPACE + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlAttributeWithSchemaTypeAndType() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_SCHEMA_TYPE, FQ_TEST_CLASS, FQ_TEST_CLASS_2);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlSchemaType(type = " + TEST_CLASS + ".class)");
-			}
-		});
-	}
-
-	public void testName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttributeWithSchemaTypeAndName();
-		JavaResourceType resourceType = this.buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = this.getField(resourceType, 0);
-
-		XmlSchemaTypeAnnotation annotation = 
-				(XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertTrue(annotation != null);
-		assertEquals(TEST_NAME, annotation.getName());
-		assertSourceContains("@XmlSchemaType(name = \"" + TEST_NAME + "\")", cu);
-
-		annotation.setName(TEST_NAME_2);
-		assertEquals(TEST_NAME_2, annotation.getName());
-		assertSourceContains("@XmlSchemaType(name = \"" + TEST_NAME_2 + "\")", cu);
-
-		annotation.setName(null);
-		assertEquals(null, annotation.getName());
-		assertSourceContains("@XmlSchemaType", cu);
-
-		annotation.setName(TEST_NAME);
-		assertEquals(TEST_NAME, annotation.getName());
-		assertSourceContains("@XmlSchemaType(name = \"" + TEST_NAME + "\")", cu);
-	}
-
-	public void testNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttributeWithSchemaTypeAndNamespace();
-		JavaResourceType resourceType = this.buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = this.getField(resourceType, 0);
-
-		XmlSchemaTypeAnnotation annotation = 
-				(XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertTrue(annotation != null);
-		assertEquals(TEST_NAMESPACE, annotation.getNamespace());
-		assertSourceContains("@XmlSchemaType(namespace = \"" + TEST_NAMESPACE + "\")", cu);
-
-		annotation.setNamespace(TEST_NAMESPACE_2);
-		assertEquals(TEST_NAMESPACE_2, annotation.getNamespace());
-		assertSourceContains("@XmlSchemaType(namespace = \"" + TEST_NAMESPACE_2 + "\")", cu);
-
-		annotation.setNamespace(null);
-		assertEquals(null, annotation.getNamespace());
-		assertSourceContains("@XmlSchemaType", cu);
-
-		annotation.setNamespace(TEST_NAMESPACE);
-		assertEquals(TEST_NAMESPACE, annotation.getNamespace());
-		assertSourceContains("@XmlSchemaType(namespace = \"" + TEST_NAMESPACE + "\")", cu);
-	}
-
-	public void testType() throws Exception {
-		ICompilationUnit cu = this.createTestXmlAttributeWithSchemaTypeAndType();
-		JavaResourceType resourceType = this.buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = this.getField(resourceType, 0);
-
-		XmlSchemaTypeAnnotation annotation = 
-				(XmlSchemaTypeAnnotation) resourceAttribute.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertTrue(annotation != null);
-		assertEquals(TEST_CLASS, annotation.getType());
-		assertEquals(FQ_TEST_CLASS, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlSchemaType(type = " + TEST_CLASS + ".class)", cu);
-
-		annotation.setType(TEST_CLASS_2);
-		assertEquals(TEST_CLASS_2, annotation.getType());
-		assertEquals(FQ_TEST_CLASS_2, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlSchemaType(type = " + TEST_CLASS_2 + ".class)", cu);
-
-		annotation.setType(null);
-		assertEquals(null, annotation.getType());
-		assertEquals(null, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlSchemaType", cu);
-
-		annotation.setType(TEST_CLASS);
-		assertEquals(TEST_CLASS, annotation.getType());
-		assertEquals(FQ_TEST_CLASS, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlSchemaType(type = " + TEST_CLASS + ".class)", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypePackageAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypePackageAnnotationTests.java
deleted file mode 100644
index 5e358517c3..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypePackageAnnotationTests.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Date;
-import java.util.GregorianCalendar;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourcePackage;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlSchemaTypePackageAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-
-	private static final String TEST_NAME = "foo";
-	private static final String TEST_NAME_2 = "bar";
-
-	private static final String TEST_NAMESPACE = "http://www.eclipse.org/test/schema";
-	private static final String TEST_NAMESPACE_2 = "http://www.eclipse.org/test/schema2";
-
-	private static final String TEST_CLASS = GregorianCalendar.class.getSimpleName();
-	private static final String TEST_CLASS_2 = Date.class.getSimpleName();
-	private static final String FQ_TEST_CLASS = GregorianCalendar.class.getName();
-	private static final String FQ_TEST_CLASS_2 = Date.class.getName();
-
-
-	public XmlSchemaTypePackageAnnotationTests(String name) {
-		super(name);
-	}
-
-
-	private ICompilationUnit createPackageInfoWithSchemaType() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchemaType",
-				JAXB.XML_SCHEMA_TYPE);
-	}
-
-	private ICompilationUnit createPackageInfoWithSchemaTypeAndName() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchemaType(name = \"" + TEST_NAME + "\")",
-				JAXB.XML_SCHEMA_TYPE);
-	}
-
-	private ICompilationUnit createPackageInfoWithSchemaTypeAndNamespace() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchemaType(namespace = \"" + TEST_NAMESPACE + "\")",
-				JAXB.XML_SCHEMA_TYPE);
-	}
-
-	private ICompilationUnit createPackageInfoWithSchemaTypeAndType() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchemaType(type = " + TEST_CLASS + ".class)",
-				JAXB.XML_SCHEMA_TYPE, FQ_TEST_CLASS, FQ_TEST_CLASS_2);
-	}
-
-	private ICompilationUnit createPackageInfoWithSchemaTypes() throws CoreException {
-		return createTestPackageInfo(
-				"@XmlSchemaTypes({@XmlSchemaType,@XmlSchemaType})",
-				JAXB.XML_SCHEMA_TYPES, JAXB.XML_SCHEMA_TYPE, FQ_TEST_CLASS, FQ_TEST_CLASS_2);
-	}
-
-	public void testName() throws Exception {
-		ICompilationUnit cu = createPackageInfoWithSchemaTypeAndName();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu); 
-
-		XmlSchemaTypeAnnotation annotation = 
-				(XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertTrue(annotation != null);
-		assertEquals(TEST_NAME, annotation.getName());
-		assertSourceContains("@XmlSchemaType(name = \"" + TEST_NAME + "\")", cu);
-
-		annotation.setName(TEST_NAME_2);
-		assertEquals(TEST_NAME_2, annotation.getName());
-		assertSourceContains("@XmlSchemaType(name = \"" + TEST_NAME_2 + "\")", cu);
-
-		annotation.setName(null);
-		assertEquals(null, annotation.getName());
-		assertSourceContains("@XmlSchemaType", cu);
-
-		annotation.setName(TEST_NAME);
-		assertEquals(TEST_NAME, annotation.getName());
-		assertSourceContains("@XmlSchemaType(name = \"" + TEST_NAME + "\")", cu);
-	}
-
-	public void testNamespace() throws Exception {
-		ICompilationUnit cu = createPackageInfoWithSchemaTypeAndNamespace();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu); 
-
-		XmlSchemaTypeAnnotation annotation = 
-				(XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertTrue(annotation != null);
-		assertEquals(TEST_NAMESPACE, annotation.getNamespace());
-		assertSourceContains("@XmlSchemaType(namespace = \"" + TEST_NAMESPACE + "\")", cu);
-
-		annotation.setNamespace(TEST_NAMESPACE_2);
-		assertEquals(TEST_NAMESPACE_2, annotation.getNamespace());
-		assertSourceContains("@XmlSchemaType(namespace = \"" + TEST_NAMESPACE_2 + "\")", cu);
-
-		annotation.setNamespace(null);
-		assertEquals(null, annotation.getNamespace());
-		assertSourceContains("@XmlSchemaType", cu);
-
-		annotation.setNamespace(TEST_NAMESPACE);
-		assertEquals(TEST_NAMESPACE, annotation.getNamespace());
-		assertSourceContains("@XmlSchemaType(namespace = \"" + TEST_NAMESPACE + "\")", cu);
-	}
-
-	public void testType() throws Exception {
-		ICompilationUnit cu = createPackageInfoWithSchemaTypeAndType();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu); 
-
-		XmlSchemaTypeAnnotation annotation = 
-				(XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		assertTrue(annotation != null);
-		assertEquals(TEST_CLASS, annotation.getType());
-		assertEquals(FQ_TEST_CLASS, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlSchemaType(type = " + TEST_CLASS + ".class)", cu);
-
-		annotation.setType(TEST_CLASS_2);
-		assertEquals(TEST_CLASS_2, annotation.getType());
-		assertEquals(FQ_TEST_CLASS_2, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlSchemaType(type = " + TEST_CLASS_2 + ".class)", cu);
-
-		annotation.setType(null);
-		assertEquals(null, annotation.getType());
-		assertEquals(null, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlSchemaType", cu);
-
-		annotation.setType(TEST_CLASS);
-		assertEquals(TEST_CLASS, annotation.getType());
-		assertEquals(FQ_TEST_CLASS, annotation.getFullyQualifiedType());
-		assertSourceContains("@XmlSchemaType(type = " + TEST_CLASS + ".class)", cu);
-	}
-
-	public void testContainedWithName()	throws Exception {
-		// test contained annotation value setting/updating
-
-		ICompilationUnit cu = createPackageInfoWithSchemaTypes();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu);
-
-		XmlSchemaTypeAnnotation containedAnnotation = 
-				(XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-
-		containedAnnotation.setName(TEST_NAME);
-		assertEquals(TEST_NAME, containedAnnotation.getName());
-		assertSourceContains(
-				"@XmlSchemaTypes({@XmlSchemaType(name = \"" + TEST_NAME + "\"),@XmlSchemaType})", cu);
-
-		containedAnnotation.setName(null);
-		assertNull(containedAnnotation.getName());
-		assertSourceContains(
-				"@XmlSchemaTypes({@XmlSchemaType,@XmlSchemaType})", cu);
-	}
-
-	public void testContainedWithNamespace() throws Exception {
-		// test contained annotation value setting/updating
-
-		ICompilationUnit cu = createPackageInfoWithSchemaTypes();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu);
-
-		XmlSchemaTypeAnnotation containedAnnotation = 
-			(XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-
-		containedAnnotation.setNamespace(TEST_NAMESPACE);
-		assertEquals(TEST_NAMESPACE, containedAnnotation.getNamespace());
-		assertSourceContains(
-				"@XmlSchemaTypes({@XmlSchemaType(namespace = \"" + TEST_NAMESPACE + "\"),@XmlSchemaType})", cu);
-
-		containedAnnotation.setNamespace(null);
-		assertNull(containedAnnotation.getNamespace());
-		assertSourceContains(
-				"@XmlSchemaTypes({@XmlSchemaType,@XmlSchemaType})", cu);
-	}
-
-	public void testContainedWithType()throws Exception {
-		// test contained annotation type setting/updating
-
-		ICompilationUnit cu = createPackageInfoWithSchemaTypes();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu);
-
-		XmlSchemaTypeAnnotation containedAnnotation = 
-			(XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(1, JAXB.XML_SCHEMA_TYPE);
-
-		containedAnnotation.setType(TEST_CLASS);
-		assertEquals(TEST_CLASS, containedAnnotation.getType());
-		assertEquals(FQ_TEST_CLASS, containedAnnotation.getFullyQualifiedType());
-		assertSourceContains(
-				"@XmlSchemaTypes({@XmlSchemaType,@XmlSchemaType(type = " + TEST_CLASS + ".class)})", cu);
-
-		containedAnnotation.setType(null);
-		assertNull(containedAnnotation.getType());
-		assertNull(FQ_TEST_CLASS, containedAnnotation.getFullyQualifiedType());
-		assertSourceContains(
-				"@XmlSchemaTypes({@XmlSchemaType,@XmlSchemaType})", cu);
-	}
-
-	public void testContained() throws Exception {
-		// test adding/removing/moving
-
-		ICompilationUnit cu = createPackageInfoWithSchemaType();
-		JavaResourcePackage resourcePackage = buildJavaResourcePackage(cu);
-
-		assertEquals(1, resourcePackage.getAnnotationsSize(JAXB.XML_SCHEMA_TYPE));
-
-		resourcePackage.addAnnotation(1, JAXB.XML_SCHEMA_TYPE);
-
-		assertEquals(2, resourcePackage.getAnnotationsSize(JAXB.XML_SCHEMA_TYPE));
-		assertSourceContains("@XmlSchemaTypes({ @XmlSchemaType, @XmlSchemaType })", cu);
-
-		XmlSchemaTypeAnnotation containedAnnotation1 = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(0, JAXB.XML_SCHEMA_TYPE);
-		containedAnnotation1.setName(TEST_NAME);
-		XmlSchemaTypeAnnotation containedAnnotation2 = (XmlSchemaTypeAnnotation) resourcePackage.getAnnotation(1, JAXB.XML_SCHEMA_TYPE);
-		containedAnnotation2.setName(TEST_NAME_2);
-		assertSourceContains(
-				"@XmlSchemaTypes({ @XmlSchemaType(name = \"" + TEST_NAME
-					+ "\"), @XmlSchemaType(name = \"" + TEST_NAME_2
-					+ "\") })", cu);
-
-		resourcePackage.moveAnnotation(0, 1, JAXB.XML_SCHEMA_TYPE);
-		assertSourceContains(
-				"@XmlSchemaTypes({ @XmlSchemaType(name = \"" + TEST_NAME_2
-					+ "\"), @XmlSchemaType(name = \"" + TEST_NAME
-					+ "\") })", cu);
-
-		resourcePackage.removeAnnotation(1, JAXB.XML_SCHEMA_TYPE);
-		assertEquals(1, resourcePackage.getAnnotationsSize(JAXB.XML_SCHEMA_TYPE));
-		assertSourceContains(
-				"@XmlSchemaType(name = \"" + TEST_NAME_2 + "\")", cu);
-		assertSourceDoesNotContain("@XmlSchemaTypes", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSeeAlsoAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSeeAlsoAnnotationTests.java
deleted file mode 100644
index a00b7b6718..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSeeAlsoAnnotationTests.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlSeeAlsoAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlSeeAlsoAnnotationTests
-		extends JaxbJavaResourceModelTestCase {
-
-	public XmlSeeAlsoAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlSeeAlso() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_SEE_ALSO);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlSeeAlso");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlSeeAlsoWithValue() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_SEE_ALSO);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlSeeAlso(value = {Foo.class, Bar.class})");
-			}
-		});
-	}
-
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlSeeAlso();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlSeeAlsoAnnotation xmlSeeAlsoAnnotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertTrue(xmlSeeAlsoAnnotation != null);
-		assertEquals(0, xmlSeeAlsoAnnotation.getClassesSize());
-	}
-
-	public void testGetClasses() throws Exception {
-		ICompilationUnit cu = this.createTestXmlSeeAlsoWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlSeeAlsoAnnotation xmlSeeAlsoAnnotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertTrue(xmlSeeAlsoAnnotation != null);
-		ListIterator<String> classes = xmlSeeAlsoAnnotation.getClasses().iterator();
-		assertEquals("Foo", classes.next());
-		assertEquals("Bar", classes.next());
-	}
-
-	public void testGetClassesSize() throws Exception {
-		ICompilationUnit cu = this.createTestXmlSeeAlsoWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlSeeAlsoAnnotation xmlSeeAlsoAnnotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertTrue(xmlSeeAlsoAnnotation != null);
-		assertEquals(2, xmlSeeAlsoAnnotation.getClassesSize());
-	}
-
-	public void testAddClass() throws Exception {
-		ICompilationUnit cu = this.createTestXmlSeeAlso();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlSeeAlsoAnnotation xmlSeeAlsoAnnotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertTrue(xmlSeeAlsoAnnotation != null);
-
-		xmlSeeAlsoAnnotation.addClass("Fooo");
-		xmlSeeAlsoAnnotation.addClass("Barrr");
-
-		assertSourceContains("@XmlSeeAlso({ Fooo.class, Barrr.class })", cu);
-	}
-
-	public void testAddClassIndex() throws Exception {
-		ICompilationUnit cu = this.createTestXmlSeeAlso();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlSeeAlsoAnnotation xmlSeeAlsoAnnotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertTrue(xmlSeeAlsoAnnotation != null);
-
-		xmlSeeAlsoAnnotation.addClass(0, "Fooo");
-		xmlSeeAlsoAnnotation.addClass(0, "Barr");
-		xmlSeeAlsoAnnotation.addClass(1, "Blah");
-
-		assertSourceContains("@XmlSeeAlso({ Barr.class, Blah.class, Fooo.class })", cu);
-	}
-	
-	public void testRemoveClass() throws Exception {
-		ICompilationUnit cu = this.createTestXmlSeeAlsoWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlSeeAlsoAnnotation xmlSeeAlsoAnnotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertTrue(xmlSeeAlsoAnnotation != null);
-
-		xmlSeeAlsoAnnotation.removeClass(0);
-		assertSourceContains("@XmlSeeAlso(value = Bar.class)", cu);
-
-		xmlSeeAlsoAnnotation.removeClass(0);
-		assertSourceContains("@XmlSeeAlso", cu);
-		assertSourceDoesNotContain("value", cu);
-	}
-
-	public void testMoveClass() throws Exception {
-		ICompilationUnit cu = this.createTestXmlSeeAlso();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlSeeAlsoAnnotation xmlSeeAlsoAnnotation = (XmlSeeAlsoAnnotation) resourceType.getAnnotation(JAXB.XML_SEE_ALSO);
-		assertTrue(xmlSeeAlsoAnnotation != null);
-
-		xmlSeeAlsoAnnotation.addClass("Fooo");
-		xmlSeeAlsoAnnotation.addClass("Barr");
-		xmlSeeAlsoAnnotation.addClass("Blah");
-		assertSourceContains("@XmlSeeAlso({ Fooo.class, Barr.class, Blah.class })", cu);
-
-		xmlSeeAlsoAnnotation.moveClass(0, 1);
-		assertSourceContains("@XmlSeeAlso({ Barr.class, Fooo.class, Blah.class })", cu);
-
-		xmlSeeAlsoAnnotation.moveClass(2, 1);
-		assertSourceContains("@XmlSeeAlso({ Barr.class, Blah.class, Fooo.class })", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientAttributeAnnotationTests.java
deleted file mode 100644
index 656a5947ed..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientAttributeAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlTransientAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlTransientAttributeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlTransientAttributeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlTransient() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TRANSIENT);
-			}
-			@Override
-			public void appendGetIdMethodAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlTransient");
-			}
-		});
-	}
-
-	public void testGetXmlTransient() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTransient();
-		JavaResourceType resourceType = this.buildJavaResourceType(cu); 
-		JavaResourceMethod resourceMethod = this.getMethod(resourceType, 0);
-
-		XmlTransientAnnotation xmlTransientAnnotation = (XmlTransientAnnotation) resourceMethod.getAnnotation(JAXB.XML_TRANSIENT);
-		assertTrue(xmlTransientAnnotation != null);
-
-		resourceMethod.removeAnnotation(JAXB.XML_TRANSIENT);
-		assertSourceDoesNotContain("@XmlTransient", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientTypeAnnotationTests.java
deleted file mode 100644
index 6a768654ed..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientTypeAnnotationTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlTransientAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlTransientTypeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlTransientTypeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlTransient() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TRANSIENT);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlTransient");
-			}
-		});
-	}
-
-	public void testGetXmlTransient() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTransient();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTransientAnnotation xmlTransientAnnotation = (XmlTransientAnnotation) resourceType.getAnnotation(JAXB.XML_TRANSIENT);
-		assertTrue(xmlTransientAnnotation != null);
-
-		resourceType.removeAnnotation(JAXB.XML_TRANSIENT);
-		assertSourceDoesNotContain("@XmlTransient", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java
deleted file mode 100644
index 6995ed4d5c..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlTypeAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlTypeAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	private static final String XML_TYPE_NAME = "XmlTypeName";
-	private static final String XML_TYPE_NAMESPACE = "XmlTypeNamespace";
-	private static final String XML_TYPE_FACTORY_METHOD = "myFactoryMethod";
-	private static final String XML_TYPE_FACTORY_CLASS = "MyFactoryClass";
-
-	public XmlTypeAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlType() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlTypeWithName() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType(name = \"" + XML_TYPE_NAME + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlTypeWithNamespace() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType(namespace = \"" + XML_TYPE_NAMESPACE + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlTypeWithFactoryMethod() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType(factoryMethod = \"" + XML_TYPE_FACTORY_METHOD + "\")");
-			}
-		});
-	}
-
-	private ICompilationUnit createTestXmlTypeWithFactoryClass() throws Exception {
-		this.createTestFactoryClass();
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType(factoryClass = " + XML_TYPE_FACTORY_CLASS  + ".class)");
-			}
-		});
-	}
-
-	private void createTestFactoryClass() throws Exception {
-		SourceWriter sourceWriter = new SourceWriter() {
-			public void appendSourceTo(StringBuilder sb) {
-				sb.append(CR);
-				sb.append("public class ").append(XML_TYPE_FACTORY_CLASS).append(" ");
-				sb.append("{}").append(CR);
-			}
-		};
-		this.javaProject.createCompilationUnit(PACKAGE_NAME, "MyFactoryClass.java", sourceWriter);
-	}
-
-	private ICompilationUnit createTestXmlTypeWithPropOrder() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType(propOrder = {\"foo\", \"bar\"})");
-			}
-		});
-	}
-
-	public void testGetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTypeWithName();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-		assertEquals(XML_TYPE_NAME, xmlTypeAnnotation.getName());
-	}
-
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = this.createTestXmlType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-		assertNull(xmlTypeAnnotation.getName());
-		assertNull(xmlTypeAnnotation.getNamespace());
-		assertNull(xmlTypeAnnotation.getFactoryClass());
-		assertNull(xmlTypeAnnotation.getFullyQualifiedFactoryClassName());
-		assertNull(xmlTypeAnnotation.getFactoryMethod());
-	}
-
-	public void testSetName() throws Exception {
-		ICompilationUnit cu = this.createTestXmlType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getName());
-		xmlTypeAnnotation.setName(XML_TYPE_NAME);
-		assertEquals(XML_TYPE_NAME, xmlTypeAnnotation.getName());
-
-		assertSourceContains("@XmlType(name = \"" + XML_TYPE_NAME + "\")", cu);
-
-		xmlTypeAnnotation.setName(null);
-		assertNull(xmlTypeAnnotation.getName());
-
-		assertSourceContains("@XmlType", cu);
-		assertSourceDoesNotContain("@XmlType(name = \"" + XML_TYPE_NAME + "\")", cu);
-	}
-
-	public void testGetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTypeWithNamespace();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-		assertEquals(XML_TYPE_NAMESPACE, xmlTypeAnnotation.getNamespace());
-	}
-
-	public void testSetNamespace() throws Exception {
-		ICompilationUnit cu = this.createTestXmlType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getNamespace());
-		xmlTypeAnnotation.setNamespace(XML_TYPE_NAMESPACE);
-		assertEquals(XML_TYPE_NAMESPACE, xmlTypeAnnotation.getNamespace());
-
-		assertSourceContains("@XmlType(namespace = \"" + XML_TYPE_NAMESPACE + "\")", cu);
-
-		xmlTypeAnnotation.setNamespace(null);
-		assertNull(xmlTypeAnnotation.getNamespace());
-
-		assertSourceContains("@XmlType", cu);
-		assertSourceDoesNotContain("@XmlType(namespace = \"" + XML_TYPE_NAMESPACE + "\")", cu);
-	}
-
-	public void testGetFactoryMethod() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTypeWithFactoryMethod();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-		assertEquals(XML_TYPE_FACTORY_METHOD, xmlTypeAnnotation.getFactoryMethod());
-	}
-
-	public void testSetFactoryMethod() throws Exception {
-		ICompilationUnit cu = this.createTestXmlType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getFactoryMethod());
-		xmlTypeAnnotation.setFactoryMethod(XML_TYPE_FACTORY_METHOD);
-		assertEquals(XML_TYPE_FACTORY_METHOD, xmlTypeAnnotation.getFactoryMethod());
-
-		assertSourceContains("@XmlType(factoryMethod = \"" + XML_TYPE_FACTORY_METHOD + "\")", cu);
-
-		xmlTypeAnnotation.setFactoryMethod(null);
-		assertNull(xmlTypeAnnotation.getFactoryMethod());
-
-		assertSourceContains("@XmlType", cu);
-		assertSourceDoesNotContain("@XmlType(factoryMethod = \"" + XML_TYPE_FACTORY_METHOD + "\")", cu);
-	}
-
-	public void testGetFactoryClass() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTypeWithFactoryClass();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-		assertEquals(XML_TYPE_FACTORY_CLASS, xmlTypeAnnotation.getFactoryClass());
-		assertEquals("test." + XML_TYPE_FACTORY_CLASS, xmlTypeAnnotation.getFullyQualifiedFactoryClassName());
-	}
-
-	public void testSetFactoryClass() throws Exception {
-		ICompilationUnit cu = this.createTestXmlType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertNull(xmlTypeAnnotation.getFactoryClass());
-		xmlTypeAnnotation.setFactoryClass(XML_TYPE_FACTORY_CLASS);
-		assertEquals(XML_TYPE_FACTORY_CLASS, xmlTypeAnnotation.getFactoryClass());
-
-		assertSourceContains("@XmlType(factoryClass = " + XML_TYPE_FACTORY_CLASS  + ".class", cu);
-
-		xmlTypeAnnotation.setFactoryClass(null);
-		assertNull(xmlTypeAnnotation.getFactoryClass());
-
-		assertSourceContains("@XmlType", cu);
-		assertSourceDoesNotContain("@XmlType(factoryClass = " + XML_TYPE_FACTORY_CLASS  + ".class", cu);
-	}
-
-	public void testGetPropOrder() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTypeWithPropOrder();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-		ListIterator<String> propOrder = xmlTypeAnnotation.getPropOrder().iterator();
-		assertEquals("foo", propOrder.next());
-		assertEquals("bar", propOrder.next());
-	}
-
-	public void testGetPropOrderSize() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTypeWithPropOrder();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-		assertEquals(2, xmlTypeAnnotation.getPropOrderSize());
-	}
-
-	public void testAddProp() throws Exception {
-		ICompilationUnit cu = this.createTestXmlType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-
-		xmlTypeAnnotation.addProp("fooo");
-		xmlTypeAnnotation.addProp("barr");
-
-		assertSourceContains("@XmlType(propOrder = { \"fooo\", \"barr\" })", cu);
-	}
-
-	public void testAddPropIndex() throws Exception {
-		ICompilationUnit cu = this.createTestXmlType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-
-		xmlTypeAnnotation.addProp(0, "fooo");
-		xmlTypeAnnotation.addProp(0, "barr");
-		xmlTypeAnnotation.addProp(1, "blah");
-
-		assertSourceContains("@XmlType(propOrder = { \"barr\", \"blah\", \"fooo\" })", cu);
-	}
-
-	public void testRemoveProp() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTypeWithPropOrder();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-
-		xmlTypeAnnotation.removeProp("foo");
-		assertSourceContains("@XmlType(propOrder = \"bar\")", cu);
-
-		xmlTypeAnnotation.removeProp("bar");
-		assertSourceContains("@XmlType", cu);
-		assertSourceDoesNotContain("propOrder", cu);
-	}
-
-	public void testRemovePropIndex() throws Exception {
-		ICompilationUnit cu = this.createTestXmlTypeWithPropOrder();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-
-		xmlTypeAnnotation.removeProp(0);
-		assertSourceContains("@XmlType(propOrder = \"bar\")", cu);
-
-		xmlTypeAnnotation.removeProp(0);
-		assertSourceContains("@XmlType", cu);
-		assertSourceDoesNotContain("propOrder", cu);
-	}
-
-	public void testMoveProp() throws Exception {
-		ICompilationUnit cu = this.createTestXmlType();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-
-		XmlTypeAnnotation xmlTypeAnnotation = (XmlTypeAnnotation) resourceType.getAnnotation(JAXB.XML_TYPE);
-		assertTrue(xmlTypeAnnotation != null);
-
-		xmlTypeAnnotation.addProp("fooo");
-		xmlTypeAnnotation.addProp("barr");
-		xmlTypeAnnotation.addProp("blah");
-		assertSourceContains("@XmlType(propOrder = { \"fooo\", \"barr\", \"blah\" })", cu);
-
-		xmlTypeAnnotation.moveProp(0, 1);
-		assertSourceContains("@XmlType(propOrder = { \"barr\", \"fooo\", \"blah\" })", cu);
-
-		xmlTypeAnnotation.moveProp(2, 1);
-		assertSourceContains("@XmlType(propOrder = { \"barr\", \"blah\", \"fooo\" })", cu);		
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlValueAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlValueAnnotationTests.java
deleted file mode 100644
index eb635a316f..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlValueAnnotationTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jaxb.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.core.resource.java.XmlValueAnnotation;
-
-@SuppressWarnings("nls")
-public class XmlValueAnnotationTests extends JaxbJavaResourceModelTestCase {
-
-	public XmlValueAnnotationTests(String name) {
-		super(name);
-	}
-
-	private ICompilationUnit createTestXmlValue() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_VALUE);
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlValue");
-			}
-		});
-	}
-
-	public void testGetXmlValue() throws Exception {
-		ICompilationUnit cu = this.createTestXmlValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-
-		XmlValueAnnotation xmlValueAnnotation = (XmlValueAnnotation) resourceAttribute.getAnnotation(JAXB.XML_VALUE);
-		assertTrue(xmlValueAnnotation != null);
-
-		resourceAttribute.removeAnnotation(JAXB.XML_VALUE);
-		assertSourceDoesNotContain("@XmlValue", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/test.xml b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/test.xml
deleted file mode 100644
index b86c694340..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/test.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
<!--
-  Copyright (c) 2010, 2011 Oracle. All rights reserved.
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0, which accompanies this distribution
  and is available at http://www.eclipse.org/legal/epl-v10.html.

  Contributors:
    Oracle - initial API and implementation
 -->
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<echo message="basedir ${basedir}" />
-	<echo message="eclipse place ${eclipse-home}" />
-	<!-- sets the properties plugin-name -->
-	<property name="plugin-name" value="org.eclipse.jpt.jaxb.core.tests"/>
    <echo level="debug" message="testRoot: ${testRoot}" />
-    <fail message="testRoot must be set" unless="testRoot" />
-
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp/>
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org*.xml"/>
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite1">
    	<property file="${testRoot}/testServer.properties"/>
	    <property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
	    <delete dir="${jpt-folder}" quiet="true"/>

		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
		    <property name="data-dir" value="${jpt-folder}"/>
			<property name="plugin-name" value="${plugin-name}"/>
			<property name="classname" value="org.eclipse.jpt.jaxb.core.tests.internal.resource.JaxbCoreResourceModelTests"/>
			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
			<property name="extraVMargs" value="-Dorg.eclipse.jpt.jaxb.jar=${testDir}/${jpt-javax-xml-bind-jar}"/>
		</ant>
	</target>
-	<target name="suite2">
    	<property file="${testRoot}/testServer.properties"/>
	    <property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
	    <delete dir="${jpt-folder}" quiet="true"/>

		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
		    <property name="data-dir" value="${jpt-folder}"/>
			<property name="plugin-name" value="${plugin-name}"/>
			<property name="classname" value="org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbCoreContextModelTests"/>
			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
			<property name="extraVMargs" value="-Dorg.eclipse.jpt.jaxb.jar=${testDir}/${jpt-javax-xml-bind-jar}"/>
		</ant>
	</target>

	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init, suite1, suite2, cleanup">
-	</target>
-</project>
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.classpath b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.classpath
deleted file mode 100644
index f8b7c93a43..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/common/core/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/core/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/jpt/jaxb/eclipselink/core/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.cvsignore b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.project b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.project
deleted file mode 100644
index 71513f6b6e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jpt.jaxb.eclipselink.core.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.settings/org.eclipse.jdt.core.prefs b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ee129ed60e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Thu May 05 17:25:11 EDT 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index cf2be3c589..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.jpt.jaxb.eclipselink.core.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Dali-Comment: jdk 1.6 has the javax.xml.bind annotations
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Activator: org.eclipse.jpt.jaxb.eclipselink.core.tests.JptJaxbEclipseLinkCoreTestsPlugin
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jpt.common.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jpt.common.core.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jpt.common.utility;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jpt.jaxb.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jpt.jaxb.core.tests;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jpt.jaxb.eclipselink.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)",
- org.junit;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.jpt.jaxb.eclipselink.core.tests,
- org.eclipse.jpt.jaxb.eclipselink.core.tests.internal;x-internal:=true,
- org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context;x-internal:=true,
- org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;x-internal:=true,
- org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource;x-internal:=true,
- org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;x-internal:=true
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/about.html b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/about.html
deleted file mode 100644
index be534ba44f..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 02, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties
deleted file mode 100644
index 9cd29bcb38..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2011 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               test.xml,\
-               plugin.properties
-source.. = src/
-output.. = bin/
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/plugin.properties b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/plugin.properties
deleted file mode 100644
index 8861cc4302..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/plugin.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-# Copyright (c) 2011 Oracle. All rights reserved.
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0, which accompanies this distribution
-# and is available at http://www.eclipse.org/legal/epl-v10.html.
-# 
-# Contributors:
-#     Oracle - initial API and implementation
-################################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName=Dali Java Persistence Tools - EclipseLink JAXB Core Tests
-providerName=Eclipse Web Tools Platform
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/JptJaxbEclipseLinkCoreTestsPlugin.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/JptJaxbEclipseLinkCoreTestsPlugin.java
deleted file mode 100644
index b4b6735882..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/JptJaxbEclipseLinkCoreTestsPlugin.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jpt.common.utility.internal.ReflectionTools;
-import org.eclipse.jpt.jaxb.core.JaxbProjectManager;
-import org.eclipse.jpt.jaxb.core.JptJaxbCorePlugin;
-import org.eclipse.jpt.jaxb.core.internal.prefs.JaxbPreferencesManager;
-import org.osgi.framework.BundleContext;
-
-/**
- * configure the core to handle events synchronously when we are
- * running tests
- */
-@SuppressWarnings("nls")
-public class JptJaxbEclipseLinkCoreTestsPlugin
-		extends Plugin {
-	
-	private static JptJaxbEclipseLinkCoreTestsPlugin INSTANCE;
-	
-	
-	public static JptJaxbEclipseLinkCoreTestsPlugin instance() {
-		return INSTANCE;
-	}
-	
-		
-	// ********** plug-in implementation **********
-	
-	public JptJaxbEclipseLinkCoreTestsPlugin() {
-		super();
-		if (INSTANCE != null) {
-			throw new IllegalStateException();
-		}
-		// this convention is *wack*...  ~bjv
-		INSTANCE = this;
-	}
-	
-	
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		JaxbProjectManager jaxbProjectManager = JptJaxbCorePlugin.getProjectManager();
-		ReflectionTools.executeMethod(jaxbProjectManager, "handleEventsSynchronously");
-		ReflectionTools.executeStaticMethod(JaxbPreferencesManager.class, "doNotFlushPreferences");
-	}
-	
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java
deleted file mode 100644
index 233d80ca4e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/ELJaxbCoreTests.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbCoreContextModelTests;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.ELJaxbCoreResourceModelTests;
-
-
-public class ELJaxbCoreTests {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite(ELJaxbCoreTests.class.getPackage().getName());
-		suite.addTest(ELJaxbCoreResourceModelTests.suite());
-		suite.addTest(ELJaxbCoreContextModelTests.suite());
-		return suite;
-	}
-	
-	public static boolean requiredJarsExists() {
-		return jaxbJarPropertyExists() 
-			&& jaxbJarFileExists()
-			&& eclipselinkJarPropertyExists() 
-			&& eclipselinkJarFileExists();
-	}
-	
-	public static boolean jaxbJarPropertyExists() {
-		return getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY) != null;
-	}
-	
-	public static boolean jaxbJarFileExists() {
-		return (new File(getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY))).exists();
-	}
-	
-	public static boolean eclipselinkJarPropertyExists() {
-		return getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY) != null;
-	}
-	
-	public static boolean eclipselinkJarFileExists() {
-		return (new File(getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY))).exists();
-	}
-	
-	public static String buildMissingJarErrorMessage() {
-		if( ! jaxbJarPropertyExists()) {
-			return errorMissingProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY);
-		}
-		else if( ! jaxbJarFileExists()) {
-			return errorJarFileDoesNotExist(getSystemProperty(TestJaxbProject.JAXB_JAR_NAME_SYSTEM_PROPERTY));
-		}
-		else if( ! eclipselinkJarPropertyExists()) {
-			return errorMissingProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY);
-		}
-		return errorJarFileDoesNotExist(getSystemProperty(TestJaxbProject.ECLIPSELINK_JAR_NAME_SYSTEM_PROPERTY));
-	}
-	
-	/*********** private **********/
-	private static String errorMissingProperty(String propertyName) {
-		return "missing Java system property: \"" + propertyName + "\"";
-	}
-	
-	private static String errorJarFileDoesNotExist(String propertyValue) {
-		return "JAR file doesn't exist: \"" + propertyValue + "\"";
-	}
-	
-	private static String getSystemProperty(String propertyName) {
-		return System.getProperty(propertyName);
-	}
-	
-	
-	private ELJaxbCoreTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextModelTestCase.java
deleted file mode 100644
index 4bb947c77f..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbContextModelTestCase.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context;
-
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.tests.internal.context.JaxbContextModelTestCase;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-
-
-public abstract class ELJaxbContextModelTestCase
-		extends JaxbContextModelTestCase {
-	
-	public ELJaxbContextModelTestCase(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.getDefaultPlatform(getProjectFacetVersion());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbCoreContextModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbCoreContextModelTests.java
deleted file mode 100644
index 1eacaf9eb8..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/ELJaxbCoreContextModelTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.ELJaxbCoreTests;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java.ELJaxbCoreJavaContextModelTests;
-
-
-public class ELJaxbCoreContextModelTests extends TestCase
-{
-	public static Test suite() {
-		TestSuite suite = new TestSuite(ELJaxbCoreContextModelTests.class.getName());
-		
-		if (ELJaxbCoreTests.requiredJarsExists()) {
-//			suite.addTestSuite(GenericContextRootTests.class);
-			suite.addTest(ELJaxbCoreJavaContextModelTests.suite());
-		}
-		else {
-			suite.addTest(TestSuite.warning(ELJaxbCoreTests.buildMissingJarErrorMessage()));
-		}
-		return suite;
-	}
-
-	private ELJaxbCoreContextModelTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaClassMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaClassMappingTests.java
deleted file mode 100644
index 071df8fcc5..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaClassMappingTests.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorNodeAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorValueAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaClassMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaClassMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.VERSION_2_2;
-	}
-	
-	public void testModifyXmlDiscriminatorNode() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		XmlDiscriminatorNodeAnnotation annotation = 
-				(XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-		assertNull(classMapping.getXmlDiscriminatorNode());
-		assertNull(annotation);
-		
-		classMapping.addXmlDiscriminatorNode();
-		annotation = (XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-		assertNotNull(classMapping.getXmlDiscriminatorNode());
-		assertNotNull(annotation);
-		
-		classMapping.removeXmlDiscriminatorNode();
-		annotation = (XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-		assertNull(classMapping.getXmlDiscriminatorNode());
-		assertNull(annotation);
-	}
-	
-	public void testUpdateXmlDiscriminatorNode() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		XmlDiscriminatorNodeAnnotation annotation = 
-				(XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-		assertNull(classMapping.getXmlDiscriminatorNode());
-		assertNull(annotation);
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						ELJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), ELJaxb.XML_DISCRIMINATOR_NODE);
-					}
-				});
-		annotation = (XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-		assertNotNull(classMapping.getXmlDiscriminatorNode());
-		assertNotNull(annotation);
-		
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(
-						ModifiedDeclaration declaration) {
-							ELJavaClassMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_DISCRIMINATOR_NODE);
-						}
-					});
-		annotation = (XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-		assertNull(classMapping.getXmlDiscriminatorNode());
-		assertNull(annotation);
-	}
-	
-	public void testModifyXmlDiscriminatorValue() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		XmlDiscriminatorValueAnnotation annotation = 
-				(XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-		assertNull(classMapping.getXmlDiscriminatorValue());
-		assertNull(annotation);
-		
-		classMapping.addXmlDiscriminatorValue();
-		annotation = (XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-		assertNotNull(classMapping.getXmlDiscriminatorValue());
-		assertNotNull(annotation);
-		
-		classMapping.removeXmlDiscriminatorValue();
-		annotation = (XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-		assertNull(classMapping.getXmlDiscriminatorValue());
-		assertNull(annotation);
-	}
-	
-	public void testUpdateXmlDiscriminatorValue() throws Exception {
-		createClassWithXmlType();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping();
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		
-		XmlDiscriminatorValueAnnotation annotation = 
-				(XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-		assertNull(classMapping.getXmlDiscriminatorValue());
-		assertNull(annotation);
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						ELJavaClassMappingTests.this.addMarkerAnnotation(declaration.getDeclaration(), ELJaxb.XML_DISCRIMINATOR_VALUE);
-					}
-				});
-		annotation = (XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-		assertNotNull(classMapping.getXmlDiscriminatorValue());
-		assertNotNull(annotation);
-		
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(
-						ModifiedDeclaration declaration) {
-							ELJavaClassMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_DISCRIMINATOR_VALUE);
-						}
-					});
-		annotation = (XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-		assertNull(classMapping.getXmlDiscriminatorValue());
-		assertNull(annotation);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java
deleted file mode 100644
index 3e98fb4ba6..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlAnyAttributeMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlAnyAttributeMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlAnyAttributeMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlAnyAttribute() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ANY_ATTRIBUTE);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAnyAttribute");
-			}
-		});
-	}
-	
-	
-	public void testModifyXmlPath() throws Exception {
-		createTypeWithXmlAnyAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlAnyAttributeMapping mapping = (ELJavaXmlAnyAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-		
-		mapping.addXmlPath();
-		
-		assertEquals(1, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNotNull(mapping.getXmlPath());
-		
-		mapping.removeXmlPath();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-	}
-	
-	public void testUpdateXmlPath() throws Exception {
-		createTypeWithXmlAnyAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlAnyAttributeMapping mapping = (ELJavaXmlAnyAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAnyAttributeMappingTests.this.addMarkerAnnotation(
-						declaration.getDeclaration(), ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertEquals(1, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNotNull(mapping.getXmlPath());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAnyAttributeMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java
deleted file mode 100644
index c1105b1d0b..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlAnyElementMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlAnyElementMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlAnyElementMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlAnyElement() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ANY_ELEMENT);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAnyElement");
-			}
-		});
-	}
-	
-	
-	public void testModifyXmlPath() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlAnyElementMapping mapping = (ELJavaXmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-		
-		mapping.addXmlPath();
-		
-		assertEquals(1, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNotNull(mapping.getXmlPath());
-		
-		mapping.removeXmlPath();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-	}
-	
-	public void testUpdateXmlPath() throws Exception {
-		createTypeWithXmlAnyElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlAnyElementMapping mapping = (ELJavaXmlAnyElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAnyElementMappingTests.this.addMarkerAnnotation(
-						declaration.getDeclaration(), ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertEquals(1, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNotNull(mapping.getXmlPath());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAnyElementMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java
deleted file mode 100644
index 5bd7097c79..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlAttributeMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlAttributeMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlAttributeMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.VERSION_2_2;
-	}
-	
-	private ICompilationUnit createTypeWithXmlAttribute() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlAttribute");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTypeWithXmlPath() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_PATH);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlPath");
-			}
-		});
-	}
-	
-	
-	public void testModifyXmlPath() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlAttributeMapping mapping = (ELJavaXmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-		
-		mapping.addXmlPath();
-		
-		assertEquals(1, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNotNull(mapping.getXmlPath());
-		
-		mapping.removeXmlPath();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-	}
-	
-	public void testUpdateXmlPath() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlAttributeMapping mapping = (ELJavaXmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAttributeMappingTests.this.addMarkerAnnotation(
-						declaration.getDeclaration(), ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertEquals(1, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNotNull(mapping.getXmlPath());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-	}
-	
-	public void testDefault() throws Exception {
-		createTypeWithXmlPath();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		JavaResourceAttribute resourceAttribute = persistentAttribute.getJavaResourceAttribute();
-		XmlPathAnnotation xmlPathAnnotation = (XmlPathAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_PATH);
-		
-		assertNotNull(xmlPathAnnotation);
-		assertFalse(persistentAttribute.getMapping().getKey() == MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAttributeMappingTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_PATH, "./element[@name=\"foo\"]/element[1]/text()");
-			}
-		});
-		
-		assertNotNull(xmlPathAnnotation.getValue());
-		assertFalse(persistentAttribute.getMapping().getKey() == MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAttributeMappingTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_PATH, "element/@attribute");
-			}
-		});
-		
-		assertNotNull(xmlPathAnnotation.getValue());
-		assertTrue(persistentAttribute.getMapping().getKey() == MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAttributeMappingTests.this.removeMemberValuePair(
-						declaration, ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertNull(xmlPathAnnotation.getValue());
-		assertFalse(persistentAttribute.getMapping().getKey() == MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY);
-	}
-	
-	public void testModifyXmlKey() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlAttributeMapping mapping = (ELJavaXmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNull(mapping.getXmlKey());
-		
-		mapping.addXmlKey();
-		
-		assertNotNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNotNull(mapping.getXmlKey());
-		
-		mapping.removeXmlKey();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNull(mapping.getXmlKey());
-	}
-	
-	public void testUpdateXmlKey() throws Exception {
-		createTypeWithXmlAttribute();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlAttributeMapping mapping = (ELJavaXmlAttributeMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNull(mapping.getXmlKey());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAttributeMappingTests.this.addMarkerAnnotation(
-						declaration.getDeclaration(), ELJaxb.XML_KEY);
-			}
-		});
-		
-		assertNotNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNotNull(mapping.getXmlKey());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlAttributeMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_KEY);
-			}
-		});
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNull(mapping.getXmlKey());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java
deleted file mode 100644
index a8c111f83a..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlDiscriminatorNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorNodeAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlDiscriminatorNodeTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlDiscriminatorNodeTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.VERSION_2_2;
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlDiscriminatorNode() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_DISCRIMINATOR_NODE);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType").append(CR);
-				sb.append("@XmlDiscriminatorNode").append(CR);
-			}
-		});
-	}
-	
-	
-	public void testModifyValue() throws Exception {
-		createTypeWithXmlDiscriminatorNode();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping();
-		ELXmlDiscriminatorNode discNode = classMapping.getXmlDiscriminatorNode();
-		XmlDiscriminatorNodeAnnotation annotation = 
-				(XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-		
-		assertNull(annotation.getValue());
-		assertNull(discNode.getValue());
-		
-		discNode.setValue("foo");
-		
-		assertEquals("foo", annotation.getValue());
-		assertEquals("foo", discNode.getValue());
-		
-		discNode.setValue("");
-		
-		assertEquals("", annotation.getValue());
-		assertEquals("", discNode.getValue());
-		
-		discNode.setValue(null);
-		
-		assertNull(annotation.getValue());
-		assertNull(discNode.getValue());
-	}
-
-	public void testUpdateValue() throws Exception {
-		createTypeWithXmlDiscriminatorNode();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping();
-		ELXmlDiscriminatorNode discNode = classMapping.getXmlDiscriminatorNode();
-		XmlDiscriminatorNodeAnnotation annotation = 
-				(XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-		
-		assertNull(annotation.getValue());
-		assertNull(discNode.getValue());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlDiscriminatorNodeTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_DISCRIMINATOR_NODE, "foo");
-			}
-		});
-		
-		assertEquals("foo", annotation.getValue());
-		assertEquals("foo", discNode.getValue());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlDiscriminatorNodeTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_DISCRIMINATOR_NODE, "");
-			}
-		});
-		
-		assertEquals("", annotation.getValue());
-		assertEquals("", discNode.getValue());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlDiscriminatorNodeTests.this.removeMemberValuePair(
-						declaration, ELJaxb.XML_DISCRIMINATOR_NODE);
-			}
-		});
-		
-		assertNull(annotation.getValue());
-		assertNull(discNode.getValue());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java
deleted file mode 100644
index efc79fa8e0..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlDiscriminatorValue;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorValueAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlDiscriminatorValueTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlDiscriminatorValueTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.VERSION_2_2;
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlDiscriminatorValue() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_DISCRIMINATOR_VALUE);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType").append(CR);
-				sb.append("@XmlDiscriminatorValue").append(CR);
-			}
-		});
-	}
-	
-	
-	public void testModifyValue() throws Exception {
-		createTypeWithXmlDiscriminatorValue();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping();
-		ELXmlDiscriminatorValue discValue = classMapping.getXmlDiscriminatorValue();
-		XmlDiscriminatorValueAnnotation annotation = 
-				(XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-		
-		assertNull(annotation.getValue());
-		assertNull(discValue.getValue());
-		
-		discValue.setValue("foo");
-		
-		assertEquals("foo", annotation.getValue());
-		assertEquals("foo", discValue.getValue());
-		
-		discValue.setValue("");
-		
-		assertEquals("", annotation.getValue());
-		assertEquals("", discValue.getValue());
-		
-		discValue.setValue(null);
-		
-		assertNull(annotation.getValue());
-		assertNull(discValue.getValue());
-	}
-
-	public void testUpdateValue() throws Exception {
-		createTypeWithXmlDiscriminatorValue();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JavaResourceType resourceType = jaxbClass.getJavaResourceType();
-		ELClassMapping classMapping = (ELClassMapping) jaxbClass.getMapping();
-		ELXmlDiscriminatorValue discValue = classMapping.getXmlDiscriminatorValue();
-		XmlDiscriminatorValueAnnotation annotation = 
-				(XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-		
-		assertNull(annotation.getValue());
-		assertNull(discValue.getValue());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceType);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlDiscriminatorValueTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_DISCRIMINATOR_VALUE, "foo");
-			}
-		});
-		
-		assertEquals("foo", annotation.getValue());
-		assertEquals("foo", discValue.getValue());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlDiscriminatorValueTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_DISCRIMINATOR_VALUE, "");
-			}
-		});
-		
-		assertEquals("", annotation.getValue());
-		assertEquals("", discValue.getValue());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlDiscriminatorValueTests.this.removeMemberValuePair(
-						declaration, ELJaxb.XML_DISCRIMINATOR_VALUE);
-			}
-		});
-		
-		assertNull(annotation.getValue());
-		assertNull(discValue.getValue());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java
deleted file mode 100644
index c44f46f873..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlElementMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlElementMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlElementMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.VERSION_2_2;
-	}
-	
-	private ICompilationUnit createTypeWithXmlElement() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElement");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTypeWithXmlPath() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_PATH);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlPath");
-			}
-		});
-	}
-	
-	
-	public void testModifyXmlPath() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-		
-		mapping.addXmlPath();
-		
-		assertEquals(1, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNotNull(mapping.getXmlPath());
-		
-		mapping.removeXmlPath();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-	}
-
-	public void testUpdateXmlPath() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.addMarkerAnnotation(
-						declaration.getDeclaration(), ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertEquals(1, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNotNull(mapping.getXmlPath());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertEquals(0, CollectionTools.size(resourceAttribute.getAnnotations(ELJaxb.XML_PATH)));
-		assertNull(mapping.getXmlPath());
-	}
-	
-	public void testDefault() throws Exception {
-		createTypeWithXmlPath();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		JavaResourceAttribute resourceAttribute = persistentAttribute.getJavaResourceAttribute();
-		XmlPathAnnotation xmlPathAnnotation = (XmlPathAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_PATH);
-		
-		assertNotNull(xmlPathAnnotation);
-		assertTrue(persistentAttribute.getMapping().getKey() == MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_PATH, "element/@attribute");
-			}
-		});
-		
-		assertNotNull(xmlPathAnnotation.getValue());
-		assertFalse(persistentAttribute.getMapping().getKey() == MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_PATH, "./element[@name=\"foo\"]/element[1]/text()");
-			}
-		});
-		
-		assertNotNull(xmlPathAnnotation.getValue());
-		assertTrue(persistentAttribute.getMapping().getKey() == MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.removeMemberValuePair(
-						declaration, ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertNull(xmlPathAnnotation.getValue());
-		assertTrue(persistentAttribute.getMapping().getKey() == MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY);
-	}
-	
-	public void testModifyXmlKey() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNull(mapping.getXmlKey());
-		
-		mapping.addXmlKey();
-		
-		assertNotNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNotNull(mapping.getXmlKey());
-		
-		mapping.removeXmlKey();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNull(mapping.getXmlKey());
-	}
-
-	public void testUpdateXmlKey() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNull(mapping.getXmlKey());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.addMarkerAnnotation(
-						declaration.getDeclaration(), ELJaxb.XML_KEY);
-			}
-		});
-		
-		assertNotNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNotNull(mapping.getXmlKey());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_KEY);
-			}
-		});
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_KEY));
-		assertNull(mapping.getXmlKey());
-	}
-	
-	public void testModifyXmlCDATA() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNull(mapping.getXmlCDATA());
-		
-		mapping.addXmlCDATA();
-		
-		assertNotNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNotNull(mapping.getXmlCDATA());
-		
-		mapping.removeXmlCDATA();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNull(mapping.getXmlCDATA());
-	}
-	
-	public void testUpdateXmlCDATA() throws Exception {
-		createTypeWithXmlElement();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNull(mapping.getXmlCDATA());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.addMarkerAnnotation(
-						declaration.getDeclaration(), ELJaxb.XML_CDATA);
-			}
-		});
-		
-		assertNotNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNotNull(mapping.getXmlCDATA());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlElementMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_CDATA);
-			}
-		});
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNull(mapping.getXmlCDATA());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java
deleted file mode 100644
index 8f81a35897..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlElementsMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlElementsMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlElementsMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlElements() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENTS);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlElements");
-			}
-		});
-	}
-	
-	protected NormalAnnotation newXmlPathAnnotation(AST ast, String value) {
-		NormalAnnotation annotation = newNormalAnnotation(ast, ELJaxb.XML_PATH);
-		addMemberValuePair(annotation, ELJaxb.XML_PATH__VALUE, value);
-		return annotation;
-	}
-	
-	protected void addXmlPath(ModifiedDeclaration declaration, int index, String value) {
-		NormalAnnotation annotation = newXmlPathAnnotation(declaration.getAst(), value);
-		addArrayElement(declaration, ELJaxb.XML_PATHS, index, "value", annotation);		
-	}
-	
-	protected void moveXmlPath(ModifiedDeclaration declaration, int targetIndex, int sourceIndex) {
-		moveArrayElement((NormalAnnotation) declaration.getAnnotationNamed(ELJaxb.XML_PATHS), "value", targetIndex, sourceIndex);
-	}
-	
-	protected void removeXmlPath(ModifiedDeclaration declaration, int index) {
-		removeArrayElement((NormalAnnotation) declaration.getAnnotationNamed(ELJaxb.XML_PATHS), "value", index);
-	}
-	
-	
-	public void testUpdateXmlElements() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		ELXmlElementsMapping mapping = (ELXmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		Iterable<ELXmlPath> xmlPaths = mapping.getXmlPaths();
-		assertTrue(CollectionTools.isEmpty(xmlPaths));
-		assertEquals(0, mapping.getXmlPathsSize());
-		
-		//add 2 XmlPath annotations
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						ELJavaXmlElementsMappingTests.this.addXmlPath(declaration, 0, "foo");
-						ELJavaXmlElementsMappingTests.this.addXmlPath(declaration, 1, "bar");
-					}
-				});
-		
-		xmlPaths = mapping.getXmlPaths();
-		
-		assertFalse(CollectionTools.isEmpty(xmlPaths));
-		assertEquals(2, mapping.getXmlPathsSize());
-		assertEquals("foo", CollectionTools.get(xmlPaths, 0).getValue());
-		assertEquals("bar", CollectionTools.get(xmlPaths, 1).getValue());
-		
-		// switch XmlPath annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						ELJavaXmlElementsMappingTests.this.moveXmlPath(declaration, 0, 1);
-					}
-				});
-		
-		xmlPaths = mapping.getXmlPaths();
-		
-		assertFalse(CollectionTools.isEmpty(xmlPaths));
-		assertEquals(2, mapping.getXmlPathsSize());
-		assertEquals("bar", CollectionTools.get(xmlPaths, 0).getValue());
-		assertEquals("foo", CollectionTools.get(xmlPaths, 1).getValue());
-		
-		// remove XmlPath annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						ELJavaXmlElementsMappingTests.this.removeXmlPath(declaration, 1);
-						ELJavaXmlElementsMappingTests.this.removeXmlPath(declaration, 0);
-					}
-				});
-		
-		xmlPaths = mapping.getXmlPaths();
-		
-		assertTrue(CollectionTools.isEmpty(xmlPaths));
-		assertEquals(0, mapping.getXmlPathsSize());
-	}
-
-	public void testModifyXmlPaths() throws Exception {
-		createTypeWithXmlElements();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		ELXmlElementsMapping mapping = (ELXmlElementsMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, resourceAttribute.getAnnotationsSize(ELJaxb.XML_PATH));
-		assertEquals(0, mapping.getXmlPathsSize());
-		
-		mapping.addXmlPath(0).setValue("foo");
-		mapping.addXmlPath(1).setValue("baz");
-		mapping.addXmlPath(1).setValue("bar");
-		
-		Iterable<XmlPathAnnotation> xmlPathAnnotations = 
-				new SubIterableWrapper(resourceAttribute.getAnnotations(ELJaxb.XML_PATH));
-		
-		assertEquals(3, CollectionTools.size(xmlPathAnnotations));
-		assertEquals(3, mapping.getXmlPathsSize());
-		assertEquals("foo", CollectionTools.get(xmlPathAnnotations, 0).getValue());
-		assertEquals("bar", CollectionTools.get(xmlPathAnnotations, 1).getValue());
-		assertEquals("baz", CollectionTools.get(xmlPathAnnotations, 2).getValue());
-		
-		mapping.moveXmlPath(1, 2);
-		
-		xmlPathAnnotations = 
-				new SubIterableWrapper(resourceAttribute.getAnnotations(ELJaxb.XML_PATH));
-		
-		assertEquals(3, CollectionTools.size(xmlPathAnnotations));
-		assertEquals(3, mapping.getXmlPathsSize());
-		assertEquals("foo", CollectionTools.get(xmlPathAnnotations, 0).getValue());
-		assertEquals("baz", CollectionTools.get(xmlPathAnnotations, 1).getValue());
-		assertEquals("bar", CollectionTools.get(xmlPathAnnotations, 2).getValue());
-		
-		mapping.removeXmlPath(2);
-		mapping.removeXmlPath(0);
-		mapping.removeXmlPath(0);
-		
-		xmlPathAnnotations = 
-				new SubIterableWrapper(resourceAttribute.getAnnotations(ELJaxb.XML_PATH));
-		
-		assertEquals(0, CollectionTools.size(xmlPathAnnotations));
-		assertEquals(0, mapping.getXmlPathsSize());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java
deleted file mode 100644
index ba7710b517..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlInverseReferenceMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlInverseReferenceAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlInverseReferenceMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlInverseReferenceMappingTests(String name) {
-		super(name);
-	}
-	
-	private ICompilationUnit createTypeWithXmlInverseReference() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_INVERSE_REFERENCE);
-			}
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlInverseReference");
-			}
-		});
-	}
-	
-	
-	public void testModifyMappedBy() throws Exception {
-		createTypeWithXmlInverseReference();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlInverseReferenceMapping mapping = (ELJavaXmlInverseReferenceMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		XmlInverseReferenceAnnotation annotation = (XmlInverseReferenceAnnotation) resourceAttribute.getAnnotation(ELJaxb.XML_INVERSE_REFERENCE);
-		
-		assertNull(annotation.getMappedBy());
-		assertNull(mapping.getMappedBy());
-		
-		mapping.setMappedBy("foo");
-		
-		assertEquals("foo", annotation.getMappedBy());
-		assertEquals("foo", mapping.getMappedBy());
-		
-		mapping.setMappedBy(null);
-		
-		assertNull(annotation.getMappedBy());
-		assertNull(mapping.getMappedBy());
-	}
-
-	public void testUpdateMappedBy() throws Exception {
-		createTypeWithXmlInverseReference();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlInverseReferenceMapping mapping = (ELJavaXmlInverseReferenceMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		XmlInverseReferenceAnnotation annotation = (XmlInverseReferenceAnnotation) resourceAttribute.getAnnotation(ELJaxb.XML_INVERSE_REFERENCE);
-		
-		assertNull(annotation.getMappedBy());
-		assertNull(mapping.getMappedBy());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlInverseReferenceMappingTests.this.addMemberValuePair(
-						(MarkerAnnotation) declaration.getAnnotationNamed(ELJaxb.XML_INVERSE_REFERENCE),
-						ELJaxb.XML_INVERSE_REFERENCE__MAPPED_BY, "foo");
-			}
-		});
-		
-		assertEquals("foo", annotation.getMappedBy());
-		assertEquals("foo", mapping.getMappedBy());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				NormalAnnotation annotation = (NormalAnnotation) declaration.getAnnotationNamed(ELJaxb.XML_INVERSE_REFERENCE);
-				ELJavaXmlInverseReferenceMappingTests.this.values(annotation).remove(0);
-			}
-		});
-		
-		assertNull(annotation.getMappedBy());
-		assertNull(mapping.getMappedBy());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java
deleted file mode 100644
index 0cbe7d3f3e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlJoinNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlJoinNodesMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlJoinNodesMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlJoinNodeTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlJoinNodeTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.VERSION_2_2;
-	}
-	
-	private ICompilationUnit createTypeWithXmlJoinNode() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_JOIN_NODE);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJoinNode");
-			}
-		});
-	}
-	
-	
-	public void testModifyXmlPath() throws Exception {
-		createTypeWithXmlJoinNode();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELXmlJoinNodesMapping mapping = (ELXmlJoinNodesMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		ELXmlJoinNode xmlJoinNode = CollectionTools.get(mapping.getXmlJoinNodes(), 0);
-		XmlJoinNodeAnnotation annotation = (XmlJoinNodeAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_JOIN_NODE);
-		
-		assertNull(annotation.getXmlPath());
-		assertNull(xmlJoinNode.getXmlPath());
-		
-		xmlJoinNode.setXmlPath("foo");
-		
-		assertEquals("foo", annotation.getXmlPath());
-		assertEquals("foo", xmlJoinNode.getXmlPath());
-		
-		xmlJoinNode.setXmlPath("");
-		
-		assertEquals("", annotation.getXmlPath());
-		assertEquals("", xmlJoinNode.getXmlPath());
-		
-		xmlJoinNode.setXmlPath(null);
-		
-		assertNull(annotation.getXmlPath());
-		assertNull(xmlJoinNode.getXmlPath());
-	}
-
-	public void testUpdateXmlPath() throws Exception {
-		createTypeWithXmlJoinNode();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlJoinNodesMapping mapping = (ELJavaXmlJoinNodesMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		ELXmlJoinNode xmlJoinNode = CollectionTools.get(mapping.getXmlJoinNodes(), 0);
-		XmlJoinNodeAnnotation annotation = (XmlJoinNodeAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_JOIN_NODE);
-		
-		assertNull(annotation.getXmlPath());
-		assertNull(xmlJoinNode.getXmlPath());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlJoinNodeTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_JOIN_NODE, ELJaxb.XML_JOIN_NODE__XML_PATH, "foo");
-			}
-		});
-		
-		assertEquals("foo", annotation.getXmlPath());
-		assertEquals("foo", xmlJoinNode.getXmlPath());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlJoinNodeTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_JOIN_NODE, ELJaxb.XML_JOIN_NODE__XML_PATH, "");
-			}
-		});
-		
-		assertEquals("", annotation.getXmlPath());
-		assertEquals("", xmlJoinNode.getXmlPath());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlJoinNodeTests.this.removeMemberValuePair(
-						declaration, ELJaxb.XML_JOIN_NODE, ELJaxb.XML_JOIN_NODE__XML_PATH);
-			}
-		});
-		
-		assertNull(annotation.getXmlPath());
-		assertNull(xmlJoinNode.getXmlPath());
-	}
-	
-	public void testModifyReferencedXmlPath() throws Exception {
-		createTypeWithXmlJoinNode();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELXmlJoinNodesMapping mapping = (ELXmlJoinNodesMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		ELXmlJoinNode xmlJoinNode = CollectionTools.get(mapping.getXmlJoinNodes(), 0);
-		XmlJoinNodeAnnotation annotation = (XmlJoinNodeAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_JOIN_NODE);
-		
-		assertNull(annotation.getReferencedXmlPath());
-		assertNull(xmlJoinNode.getReferencedXmlPath());
-		
-		xmlJoinNode.setReferencedXmlPath("foo");
-		
-		assertEquals("foo", annotation.getReferencedXmlPath());
-		assertEquals("foo", xmlJoinNode.getReferencedXmlPath());
-		
-		xmlJoinNode.setReferencedXmlPath("");
-		
-		assertEquals("", annotation.getReferencedXmlPath());
-		assertEquals("", xmlJoinNode.getReferencedXmlPath());
-		
-		xmlJoinNode.setReferencedXmlPath(null);
-		
-		assertNull(annotation.getReferencedXmlPath());
-		assertNull(xmlJoinNode.getReferencedXmlPath());
-	}
-
-	public void testUpdateReferencedXmlPath() throws Exception {
-		createTypeWithXmlJoinNode();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlJoinNodesMapping mapping = (ELJavaXmlJoinNodesMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		ELXmlJoinNode xmlJoinNode = CollectionTools.get(mapping.getXmlJoinNodes(), 0);
-		XmlJoinNodeAnnotation annotation = (XmlJoinNodeAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_JOIN_NODE);
-		
-		assertNull(annotation.getReferencedXmlPath());
-		assertNull(xmlJoinNode.getReferencedXmlPath());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlJoinNodeTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_JOIN_NODE, ELJaxb.XML_JOIN_NODE__REFERENCED_XML_PATH, "foo");
-			}
-		});
-		
-		assertEquals("foo", annotation.getReferencedXmlPath());
-		assertEquals("foo", xmlJoinNode.getReferencedXmlPath());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlJoinNodeTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_JOIN_NODE, ELJaxb.XML_JOIN_NODE__REFERENCED_XML_PATH, "");
-			}
-		});
-		
-		assertEquals("", annotation.getReferencedXmlPath());
-		assertEquals("", xmlJoinNode.getReferencedXmlPath());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlJoinNodeTests.this.removeMemberValuePair(
-						declaration, ELJaxb.XML_JOIN_NODE, ELJaxb.XML_JOIN_NODE__REFERENCED_XML_PATH);
-			}
-		});
-		
-		assertNull(annotation.getReferencedXmlPath());
-		assertNull(xmlJoinNode.getReferencedXmlPath());
-	}
-}
\ No newline at end of file
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java
deleted file mode 100644
index ce0559ae6a..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlJoinNode;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlJoinNodesMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlJoinNodesMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlJoinNodesMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.VERSION_2_2;
-	}
-	
-	private ICompilationUnit createTypeWithXmlJoinNodes() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_JOIN_NODES);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJoinNodes");
-			}
-		});
-	}
-	
-	protected NormalAnnotation newXmlJoinNodeAnnotation(AST ast, String xmlPath, String referencedXmlPath) {
-		NormalAnnotation annotation = newNormalAnnotation(ast, ELJaxb.XML_JOIN_NODE);
-		addMemberValuePair(annotation, ELJaxb.XML_JOIN_NODE__XML_PATH, xmlPath);
-		addMemberValuePair(annotation, ELJaxb.XML_JOIN_NODE__REFERENCED_XML_PATH, referencedXmlPath);
-		return annotation;
-	}
-	
-	protected void addXmlJoinNode(ModifiedDeclaration declaration, int index, String xmlPath, String referencedXmlPath) {
-		NormalAnnotation annotation = newXmlJoinNodeAnnotation(declaration.getAst(), xmlPath, referencedXmlPath);
-		addArrayElement(declaration, ELJaxb.XML_JOIN_NODES, index, "value", annotation);		
-	}
-	
-	protected void moveXmlJoinNode(ModifiedDeclaration declaration, int targetIndex, int sourceIndex) {
-		moveArrayElement((NormalAnnotation) declaration.getAnnotationNamed(ELJaxb.XML_JOIN_NODES), "value", targetIndex, sourceIndex);
-	}
-	
-	protected void removeXmlJoinNode(ModifiedDeclaration declaration, int index) {
-		removeArrayElement((NormalAnnotation) declaration.getAnnotationNamed(ELJaxb.XML_JOIN_NODES), "value", index);
-	}
-	
-	
-	public void testUpdateXmlJoinNodes() throws Exception {
-		createTypeWithXmlJoinNodes();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		ELXmlJoinNodesMapping mapping = (ELXmlJoinNodesMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		Iterable<ELXmlJoinNode> xmlJoinNodes = mapping.getXmlJoinNodes();
-		assertTrue(CollectionTools.isEmpty(xmlJoinNodes));
-		assertEquals(0, mapping.getXmlJoinNodesSize());
-		
-		//add 2 XmlJoinNode annotations
-		AnnotatedElement annotatedElement = annotatedElement(resourceAttribute);
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						ELJavaXmlJoinNodesMappingTests.this.addXmlJoinNode(declaration, 0, "foo", "@foo");
-						ELJavaXmlJoinNodesMappingTests.this.addXmlJoinNode(declaration, 1, "bar", "@bar");
-					}
-				});
-		
-		xmlJoinNodes = mapping.getXmlJoinNodes();
-		
-		assertFalse(CollectionTools.isEmpty(xmlJoinNodes));
-		assertEquals(2, mapping.getXmlJoinNodesSize());
-		assertEquals("foo", CollectionTools.get(xmlJoinNodes, 0).getXmlPath());
-		assertEquals("@foo", CollectionTools.get(xmlJoinNodes, 0).getReferencedXmlPath());
-		assertEquals("bar", CollectionTools.get(xmlJoinNodes, 1).getXmlPath());
-		assertEquals("@bar", CollectionTools.get(xmlJoinNodes, 1).getReferencedXmlPath());
-		
-		// switch XmlJoinNode annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						ELJavaXmlJoinNodesMappingTests.this.moveXmlJoinNode(declaration, 0, 1);
-					}
-				});
-		
-		xmlJoinNodes = mapping.getXmlJoinNodes();
-		
-		assertFalse(CollectionTools.isEmpty(xmlJoinNodes));
-		assertEquals(2, mapping.getXmlJoinNodesSize());
-		assertEquals("bar", CollectionTools.get(xmlJoinNodes, 0).getXmlPath());
-		assertEquals("@bar", CollectionTools.get(xmlJoinNodes, 0).getReferencedXmlPath());
-		assertEquals("foo", CollectionTools.get(xmlJoinNodes, 1).getXmlPath());
-		assertEquals("@foo", CollectionTools.get(xmlJoinNodes, 1).getReferencedXmlPath());
-		
-		// remove XmlJoinNode annotations
-		annotatedElement.edit(
-				new Member.Editor() {
-					public void edit(ModifiedDeclaration declaration) {
-						ELJavaXmlJoinNodesMappingTests.this.removeXmlJoinNode(declaration, 1);
-						ELJavaXmlJoinNodesMappingTests.this.removeXmlJoinNode(declaration, 0);
-					}
-				});
-		
-		xmlJoinNodes = mapping.getXmlJoinNodes();
-		
-		assertTrue(CollectionTools.isEmpty(xmlJoinNodes));
-		assertEquals(0, mapping.getXmlJoinNodesSize());
-	}
-
-	public void testModifyXmlJoinNodes() throws Exception {
-		createTypeWithXmlJoinNodes();
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		ELXmlJoinNodesMapping mapping = (ELXmlJoinNodesMapping) CollectionTools.get(classMapping.getAttributes(), 0).getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertEquals(0, resourceAttribute.getAnnotationsSize(ELJaxb.XML_JOIN_NODE));
-		assertEquals(0, mapping.getXmlJoinNodesSize());
-		
-		ELXmlJoinNode joinNode = mapping.addXmlJoinNode(0);
-		joinNode.setXmlPath("foo");
-		joinNode.setReferencedXmlPath("@foo");
-		joinNode = mapping.addXmlJoinNode(1);
-		joinNode.setXmlPath("baz");
-		joinNode.setReferencedXmlPath("@baz");
-		joinNode = mapping.addXmlJoinNode(1);
-		joinNode.setXmlPath("bar");
-		joinNode.setReferencedXmlPath("@bar");
-		
-		Iterable<XmlJoinNodeAnnotation> xmlJoinNodeAnnotations = 
-				new SubIterableWrapper(resourceAttribute.getAnnotations(ELJaxb.XML_JOIN_NODE));
-		
-		assertEquals(3, CollectionTools.size(xmlJoinNodeAnnotations));
-		assertEquals(3, mapping.getXmlJoinNodesSize());
-		assertEquals("foo", CollectionTools.get(xmlJoinNodeAnnotations, 0).getXmlPath());
-		assertEquals("@foo", CollectionTools.get(xmlJoinNodeAnnotations, 0).getReferencedXmlPath());
-		assertEquals("bar", CollectionTools.get(xmlJoinNodeAnnotations, 1).getXmlPath());
-		assertEquals("@bar", CollectionTools.get(xmlJoinNodeAnnotations, 1).getReferencedXmlPath());
-		assertEquals("baz", CollectionTools.get(xmlJoinNodeAnnotations, 2).getXmlPath());
-		assertEquals("@baz", CollectionTools.get(xmlJoinNodeAnnotations, 2).getReferencedXmlPath());
-		
-		mapping.moveXmlJoinNode(1, 2);
-		
-		xmlJoinNodeAnnotations = 
-				new SubIterableWrapper(resourceAttribute.getAnnotations(ELJaxb.XML_JOIN_NODE));
-		
-		assertEquals(3, CollectionTools.size(xmlJoinNodeAnnotations));
-		assertEquals(3, mapping.getXmlJoinNodesSize());
-		assertEquals("foo", CollectionTools.get(xmlJoinNodeAnnotations, 0).getXmlPath());
-		assertEquals("@foo", CollectionTools.get(xmlJoinNodeAnnotations, 0).getReferencedXmlPath());
-		assertEquals("baz", CollectionTools.get(xmlJoinNodeAnnotations, 1).getXmlPath());
-		assertEquals("@baz", CollectionTools.get(xmlJoinNodeAnnotations, 1).getReferencedXmlPath());
-		assertEquals("bar", CollectionTools.get(xmlJoinNodeAnnotations, 2).getXmlPath());
-		assertEquals("@bar", CollectionTools.get(xmlJoinNodeAnnotations, 2).getReferencedXmlPath());
-		
-		mapping.removeXmlJoinNode(2);
-		mapping.removeXmlJoinNode(0);
-		mapping.removeXmlJoinNode(0);
-		
-		xmlJoinNodeAnnotations = 
-				new SubIterableWrapper(resourceAttribute.getAnnotations(ELJaxb.XML_JOIN_NODE));
-		
-		assertEquals(0, CollectionTools.size(xmlJoinNodeAnnotations));
-		assertEquals(0, mapping.getXmlJoinNodesSize());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java
deleted file mode 100644
index 2f58cb937e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlElementMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELXmlPath;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlElementMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlPathTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlPathTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTypeWithXmlPath() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_PATH);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlPath");
-			}
-		});
-	}
-	
-	
-	public void testModifyValue() throws Exception {
-		createTypeWithXmlPath();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELXmlElementMapping mapping = (ELXmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		ELXmlPath xpath = mapping.getXmlPath();
-		XmlPathAnnotation annotation = (XmlPathAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_PATH);
-		
-		assertNull(annotation.getValue());
-		assertNull(xpath.getValue());
-		
-		xpath.setValue("foo");
-		
-		assertEquals("foo", annotation.getValue());
-		assertEquals("foo", xpath.getValue());
-		
-		xpath.setValue("");
-		
-		assertEquals("", annotation.getValue());
-		assertEquals("", xpath.getValue());
-		
-		xpath.setValue(null);
-		
-		assertNull(annotation.getValue());
-		assertNull(xpath.getValue());
-	}
-
-	public void testUpdateValue() throws Exception {
-		createTypeWithXmlPath();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlElementMapping mapping = (ELJavaXmlElementMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		ELXmlPath xpath = mapping.getXmlPath();
-		XmlPathAnnotation annotation = (XmlPathAnnotation) resourceAttribute.getAnnotation(0, ELJaxb.XML_PATH);
-		
-		assertNull(annotation.getValue());
-		assertNull(xpath.getValue());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlPathTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_PATH, "foo");
-			}
-		});
-		
-		assertEquals("foo", annotation.getValue());
-		assertEquals("foo", xpath.getValue());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlPathTests.this.setMemberValuePair(
-						declaration, ELJaxb.XML_PATH, "");
-			}
-		});
-		
-		assertEquals("", annotation.getValue());
-		assertEquals("", xpath.getValue());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlPathTests.this.removeMemberValuePair(
-						declaration, ELJaxb.XML_PATH);
-			}
-		});
-		
-		assertNull(annotation.getValue());
-		assertNull(xpath.getValue());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java
deleted file mode 100644
index b1e44a2b14..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.Member;
-import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.core.context.JaxbClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
-import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
-import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java.ELJavaXmlValueMapping;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbContextModelTestCase;
-
-
-public class ELJavaXmlValueMappingTests
-		extends ELJaxbContextModelTestCase {
-	
-	public ELJavaXmlValueMappingTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected JaxbPlatformDescription getPlatform() {
-		return ELJaxbPlatform.VERSION_2_2;
-	}
-	
-	private ICompilationUnit createTypeWithXmlValue() throws Exception {
-		return this.createTestType(new DefaultAnnotationWriter() {
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_VALUE);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlType");
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlValue");
-			}
-		});
-	}
-	
-	public void testModifyXmlCDATA() throws Exception {
-		createTypeWithXmlValue();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlValueMapping mapping = (ELJavaXmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNull(mapping.getXmlCDATA());
-		
-		mapping.addXmlCDATA();
-		
-		assertNotNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNotNull(mapping.getXmlCDATA());
-		
-		mapping.removeXmlCDATA();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNull(mapping.getXmlCDATA());
-	}
-	
-	public void testUpdateXmlCDATA() throws Exception {
-		createTypeWithXmlValue();
-		
-		JaxbClass jaxbClass = (JaxbClass) CollectionTools.get(getContextRoot().getTypes(), 0);
-		JaxbClassMapping classMapping = jaxbClass.getMapping();
-		JaxbPersistentAttribute persistentAttribute = CollectionTools.get(classMapping.getAttributes(), 0);
-		ELJavaXmlValueMapping mapping = (ELJavaXmlValueMapping) persistentAttribute.getMapping();
-		JavaResourceAttribute resourceAttribute = mapping.getPersistentAttribute().getJavaResourceAttribute();
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNull(mapping.getXmlCDATA());
-		
-		AnnotatedElement annotatedElement = this.annotatedElement(resourceAttribute);
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlValueMappingTests.this.addMarkerAnnotation(
-						declaration.getDeclaration(), ELJaxb.XML_CDATA);
-			}
-		});
-		
-		assertNotNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNotNull(mapping.getXmlCDATA());
-		
-		annotatedElement.edit(new Member.Editor() {
-			public void edit(ModifiedDeclaration declaration) {
-				ELJavaXmlValueMappingTests.this.removeAnnotation(declaration, ELJaxb.XML_CDATA);
-			}
-		});
-		
-		assertNull(resourceAttribute.getAnnotation(ELJaxb.XML_CDATA));
-		assertNull(mapping.getXmlCDATA());
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJaxbCoreJavaContextModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJaxbCoreJavaContextModelTests.java
deleted file mode 100644
index 29bc7f62f8..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJaxbCoreJavaContextModelTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011, 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-public class ELJaxbCoreJavaContextModelTests
-		extends TestCase {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite(ELJaxbCoreJavaContextModelTests.class.getName());
-		suite.addTestSuite(ELJavaClassMappingTests.class);
-		suite.addTestSuite(ELJavaXmlAnyAttributeMappingTests.class);
-		suite.addTestSuite(ELJavaXmlAnyElementMappingTests.class);
-		suite.addTestSuite(ELJavaXmlAttributeMappingTests.class);
-		suite.addTestSuite(ELJavaXmlDiscriminatorNodeTests.class);
-		suite.addTestSuite(ELJavaXmlDiscriminatorValueTests.class);
-		suite.addTestSuite(ELJavaXmlElementMappingTests.class);
-		suite.addTestSuite(ELJavaXmlElementsMappingTests.class);
-		suite.addTestSuite(ELJavaXmlInverseReferenceMappingTests.class);
-		suite.addTestSuite(ELJavaXmlJoinNodesMappingTests.class);
-		suite.addTestSuite(ELJavaXmlJoinNodeTests.class);
-		suite.addTestSuite(ELJavaXmlPathTests.class);
-		suite.addTestSuite(ELJavaXmlValueMappingTests.class);
-		return suite;
-	}
-	
-	
-	private ELJaxbCoreJavaContextModelTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/ELJaxbCoreResourceModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/ELJaxbCoreResourceModelTests.java
deleted file mode 100644
index 12a00c2ed6..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/ELJaxbCoreResourceModelTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.ELJaxbCoreTests;
-import org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java.ELJaxbJavaResourceModelTests;
-
-
-public class ELJaxbCoreResourceModelTests 
-		extends TestCase {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite(ELJaxbCoreResourceModelTests.class.getName());
-
-		if (ELJaxbCoreTests.requiredJarsExists()) {
-			suite.addTest(ELJaxbJavaResourceModelTests.suite());
-		}
-		else {
-			suite.addTest(TestSuite.warning(ELJaxbCoreTests.buildMissingJarErrorMessage()));
-		}
-		return suite;
-	}
-	
-	
-	private ELJaxbCoreResourceModelTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java
deleted file mode 100644
index 479010c881..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.core.tests.internal.resource.java.JavaResourceModelTestCase;
-import org.eclipse.jpt.jaxb.core.tests.internal.projects.TestJaxbProject;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1.ELJaxb_2_1_PlatformDefinition;
-
-
-public class ELJaxbJavaResourceModelTestCase 
-		extends JavaResourceModelTestCase {	
-	
-	public ELJaxbJavaResourceModelTestCase(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		this.javaProject.addJar(TestJaxbProject.eclipselinkJarName());
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		// nothing as of yet
-	}
-	
-	@Override
-	protected AnnotationDefinition[] annotationDefinitions() {
-		return ELJaxb_2_1_PlatformDefinition.instance().getAnnotationDefinitions();
-	}
-	
-	@Override
-	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {
-		return ELJaxb_2_1_PlatformDefinition.instance().getNestableAnnotationDefinitions();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTests.java
deleted file mode 100644
index 27c4a89886..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/ELJaxbJavaResourceModelTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-public class ELJaxbJavaResourceModelTests
-		extends TestCase {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite(ELJaxbJavaResourceModelTests.class.getName());
-		suite.addTestSuite(XmlCDATAAnnotationTests.class);
-		suite.addTestSuite(XmlDiscriminatorNodeAnnotationTests.class);
-		suite.addTestSuite(XmlDiscriminatorValueAnnotationTests.class);
-		suite.addTestSuite(XmlInverseReferenceAnnotationTests.class);
-		suite.addTestSuite(XmlJoinNodeAnnotationTests.class);
-		suite.addTestSuite(XmlKeyAnnotationTests.class);
-		suite.addTestSuite(XmlPathAnnotationTests.class);
-		suite.addTestSuite(XmlTransformationAnnotationTests.class);
-		
-		return suite;
-	}
-	
-	
-	private ELJaxbJavaResourceModelTests() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java
deleted file mode 100644
index 04882213f2..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlCDATAAnnotation;
-
-
-public class XmlCDATAAnnotationTests
-		extends ELJaxbJavaResourceModelTestCase {
-	
-	public XmlCDATAAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected AnnotationDefinition[] annotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getAnnotationDefinitions();
-	}
-	
-	@Override
-	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getNestableAnnotationDefinitions();
-	}
-	
-	
-	private ICompilationUnit createTestXmlCDATA() 
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_CDATA);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlCDATA");
-			}
-		});
-	}
-	
-	private XmlCDATAAnnotation getXmlCDATAAnnotation(JavaResourceAttribute resourceAttribute) {
-		return (XmlCDATAAnnotation) resourceAttribute.getAnnotation(ELJaxb.XML_CDATA);
-	}
-	
-	
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = createTestXmlCDATA();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlCDATAAnnotation annotation = getXmlCDATAAnnotation(resourceAttribute);
-		
-		assertTrue(annotation != null);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java
deleted file mode 100644
index cfd2f6e26e..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorNodeAnnotation;
-
-
-public class XmlDiscriminatorNodeAnnotationTests
-		extends ELJaxbJavaResourceModelTestCase {
-	
-	public XmlDiscriminatorNodeAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected AnnotationDefinition[] annotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getAnnotationDefinitions();
-	}
-	
-	@Override
-	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getNestableAnnotationDefinitions();
-	}
-	
-	
-	private ICompilationUnit createTestXmlDiscriminatorNodeWithValue()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_DISCRIMINATOR_NODE);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlDiscriminatorNode(\"foo\")");
-			}
-		});
-	}
-	
-	
-	private XmlDiscriminatorNodeAnnotation getXmlDiscriminatorNodeAnnotation(JavaResourceType resourceType) {
-		return (XmlDiscriminatorNodeAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_NODE);
-	}
-	
-	
-	public void testValue() throws Exception {
-		ICompilationUnit cu = createTestXmlDiscriminatorNodeWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu);
-		XmlDiscriminatorNodeAnnotation annotation = getXmlDiscriminatorNodeAnnotation(resourceType);
-		
-		assertEquals("foo", annotation.getValue());
-		assertSourceContains("@XmlDiscriminatorNode(\"foo\")", cu);
-		
-		annotation.setValue("bar");
-		
-		assertEquals("bar", annotation.getValue());
-		assertSourceContains("@XmlDiscriminatorNode(\"bar\")", cu);
-		
-		annotation.setValue("");
-		
-		assertEquals("", annotation.getValue());
-		assertSourceContains("@XmlDiscriminatorNode(\"\")", cu);
-		
-		annotation.setValue(null);
-		
-		assertNull(annotation.getValue());
-		assertSourceContains("@XmlDiscriminatorNode", cu);
-		assertSourceDoesNotContain("@XmlDiscriminatorNode(", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java
deleted file mode 100644
index f7743fd91d..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorValueAnnotation;
-
-
-public class XmlDiscriminatorValueAnnotationTests
-		extends ELJaxbJavaResourceModelTestCase {
-	
-	public XmlDiscriminatorValueAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected AnnotationDefinition[] annotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getAnnotationDefinitions();
-	}
-	
-	@Override
-	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getNestableAnnotationDefinitions();
-	}
-	
-	
-	private ICompilationUnit createTestXmlDiscriminatorValueWithValue()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_DISCRIMINATOR_VALUE);
-			}
-			
-			@Override
-			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlDiscriminatorValue(\"foo\")");
-			}
-		});
-	}
-	
-	
-	private XmlDiscriminatorValueAnnotation getXmlDiscriminatorValueAnnotation(JavaResourceType resourceType) {
-		return (XmlDiscriminatorValueAnnotation) resourceType.getAnnotation(ELJaxb.XML_DISCRIMINATOR_VALUE);
-	}
-	
-	
-	public void testValue() throws Exception {
-		ICompilationUnit cu = createTestXmlDiscriminatorValueWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu);
-		XmlDiscriminatorValueAnnotation annotation = getXmlDiscriminatorValueAnnotation(resourceType);
-		
-		assertEquals("foo", annotation.getValue());
-		assertSourceContains("@XmlDiscriminatorValue(\"foo\")", cu);
-		
-		annotation.setValue("bar");
-		
-		assertEquals("bar", annotation.getValue());
-		assertSourceContains("@XmlDiscriminatorValue(\"bar\")", cu);
-		
-		annotation.setValue("");
-		
-		assertEquals("", annotation.getValue());
-		assertSourceContains("@XmlDiscriminatorValue(\"\")", cu);
-		
-		annotation.setValue(null);
-		
-		assertNull(annotation.getValue());
-		assertSourceContains("@XmlDiscriminatorValue", cu);
-		assertSourceDoesNotContain("@XmlDiscriminatorValue(", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java
deleted file mode 100644
index 1a404f911c..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlInverseReferenceAnnotation;
-
-
-public class XmlInverseReferenceAnnotationTests
-		extends ELJaxbJavaResourceModelTestCase {
-	
-	public XmlInverseReferenceAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTestXmlInverseReference() 
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_INVERSE_REFERENCE);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlInverseReference");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlInverseReferenceWithMappedBy()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_INVERSE_REFERENCE);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlInverseReference(mappedBy = \"foo\")");
-			}
-		});
-	}
-	
-	private XmlInverseReferenceAnnotation getXmlInverseReferenceAnnotation(JavaResourceAttribute resourceAttribute) {
-		return (XmlInverseReferenceAnnotation) resourceAttribute.getAnnotation(ELJaxb.XML_INVERSE_REFERENCE);
-	}
-	
-	
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = createTestXmlInverseReference();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlInverseReferenceAnnotation annotation = getXmlInverseReferenceAnnotation(resourceAttribute);
-		
-		assertTrue(annotation != null);
-		assertNull(annotation.getMappedBy());
-	}
-	
-	public void testGetMappedBy() throws Exception {
-		ICompilationUnit cu = createTestXmlInverseReferenceWithMappedBy();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlInverseReferenceAnnotation annotation = getXmlInverseReferenceAnnotation(resourceAttribute);
-		
-		assertEquals("foo", annotation.getMappedBy());
-	}
-	
-	public void testSetMappedBy() throws Exception {
-		ICompilationUnit cu = createTestXmlInverseReference();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlInverseReferenceAnnotation annotation = getXmlInverseReferenceAnnotation(resourceAttribute);
-		
-		assertNull(annotation.getMappedBy());
-		
-		annotation.setMappedBy("bar");
-		
-		assertEquals("bar", annotation.getMappedBy());
-		assertSourceContains("@XmlInverseReference(mappedBy = \"bar\")", cu);
-		
-		annotation.setMappedBy("");
-		
-		assertEquals("", annotation.getMappedBy());
-		assertSourceContains("@XmlInverseReference(mappedBy = \"\")", cu);
-		
-		annotation.setMappedBy(null);
-		
-		assertNull(annotation.getMappedBy());
-		assertSourceContains("@XmlInverseReference", cu);
-		assertSourceDoesNotContain("mappedBy", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java
deleted file mode 100644
index b4b815ef8d..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation;
-
-
-public class XmlJoinNodeAnnotationTests
-		extends ELJaxbJavaResourceModelTestCase {
-	
-	public XmlJoinNodeAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected AnnotationDefinition[] annotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getAnnotationDefinitions();
-	}
-	
-	@Override
-	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getNestableAnnotationDefinitions();
-	}
-	
-	
-	private ICompilationUnit createTestXmlJoinNode()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_JOIN_NODE);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJoinNode");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlJoinNodeWithXmlPath()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_JOIN_NODE);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJoinNode(xmlPath=\"foo\")");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlJoinNodeWithReferencedXmlPath()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_JOIN_NODE);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJoinNode(referencedXmlPath=\"foo\")");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlJoinNodes()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_JOIN_NODES, ELJaxb.XML_JOIN_NODE);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlJoinNodes({@XmlJoinNode,@XmlJoinNode})");
-			}
-		});
-	}
-	
-	private XmlJoinNodeAnnotation getXmlJoinNodeAnnotation(JavaResourceAttribute resourceAttribute) {
-		return getXmlJoinNodeAnnotation(resourceAttribute, 0);
-	}
-	
-	private XmlJoinNodeAnnotation getXmlJoinNodeAnnotation(JavaResourceAttribute resourceAttribute, int index) {
-		return (XmlJoinNodeAnnotation) resourceAttribute.getAnnotation(index, ELJaxb.XML_JOIN_NODE);
-	}
-	
-	
-	public void testXmlPath() throws Exception {
-		ICompilationUnit cu = createTestXmlJoinNodeWithXmlPath();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlJoinNodeAnnotation annotation = getXmlJoinNodeAnnotation(resourceAttribute);
-		
-		assertEquals("foo", annotation.getXmlPath());
-		assertSourceContains("@XmlJoinNode(xmlPath=\"foo\")", cu);
-		
-		annotation.setXmlPath("bar");
-		
-		assertEquals("bar", annotation.getXmlPath());
-		assertSourceContains("@XmlJoinNode(xmlPath=\"bar\")", cu);
-		
-		annotation.setXmlPath("");
-		
-		assertEquals("", annotation.getXmlPath());
-		assertSourceContains("@XmlJoinNode(xmlPath=\"\")", cu);
-		
-		annotation.setXmlPath(null);
-		
-		assertNull(annotation.getXmlPath());
-		assertSourceContains("@XmlJoinNode", cu);
-		assertSourceDoesNotContain("@XmlJoinNode(", cu);
-	}
-	
-	public void testReferencedXmlPath() throws Exception {
-		ICompilationUnit cu = createTestXmlJoinNodeWithReferencedXmlPath();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlJoinNodeAnnotation annotation = getXmlJoinNodeAnnotation(resourceAttribute);
-		
-		assertEquals("foo", annotation.getReferencedXmlPath());
-		assertSourceContains("@XmlJoinNode(referencedXmlPath=\"foo\")", cu);
-		
-		annotation.setReferencedXmlPath("bar");
-		
-		assertEquals("bar", annotation.getReferencedXmlPath());
-		assertSourceContains("@XmlJoinNode(referencedXmlPath=\"bar\")", cu);
-		
-		annotation.setReferencedXmlPath("");
-		
-		assertEquals("", annotation.getReferencedXmlPath());
-		assertSourceContains("@XmlJoinNode(referencedXmlPath=\"\")", cu);
-		
-		annotation.setReferencedXmlPath(null);
-		
-		assertNull(annotation.getReferencedXmlPath());
-		assertSourceContains("@XmlJoinNode", cu);
-		assertSourceDoesNotContain("@XmlJoinNode(", cu);
-	}
-	
-	public void testContainedXmlPath() throws Exception {
-		// test contained annotation xmlPath setting/updating
-		
-		ICompilationUnit cu = createTestXmlJoinNodes();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlJoinNodeAnnotation annotation = getXmlJoinNodeAnnotation(resourceAttribute);
-		
-		assertNull(annotation.getXmlPath());
-		assertSourceContains(
-				"@XmlJoinNodes({@XmlJoinNode,@XmlJoinNode})", cu);
-		
-		annotation.setXmlPath("foo");
-		assertEquals("foo", annotation.getXmlPath());
-		assertSourceContains(
-				"@XmlJoinNodes({@XmlJoinNode(xmlPath = \"foo\"),@XmlJoinNode})", cu);
-		
-		annotation.setXmlPath(null);
-		assertNull(annotation.getXmlPath());
-		assertSourceContains(
-				"@XmlJoinNodes({@XmlJoinNode,@XmlJoinNode})", cu);
-	}
-	
-	public void testContainedReferencedXmlPath() throws Exception {
-		// test contained annotation referencedXmlPath setting/updating
-		
-		ICompilationUnit cu = createTestXmlJoinNodes();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlJoinNodeAnnotation annotation = getXmlJoinNodeAnnotation(resourceAttribute);
-		
-		assertNull(annotation.getReferencedXmlPath());
-		assertSourceContains(
-				"@XmlJoinNodes({@XmlJoinNode,@XmlJoinNode})", cu);
-		
-		annotation.setReferencedXmlPath("foo");
-		assertEquals("foo", annotation.getReferencedXmlPath());
-		assertSourceContains(
-				"@XmlJoinNodes({@XmlJoinNode(referencedXmlPath = \"foo\"),@XmlJoinNode})", cu);
-		
-		annotation.setReferencedXmlPath(null);
-		assertNull(annotation.getReferencedXmlPath());
-		assertSourceContains(
-				"@XmlJoinNodes({@XmlJoinNode,@XmlJoinNode})", cu);
-	}
-	
-	public void testContained()
-			throws Exception {
-		// test adding/removing/moving
-		
-		ICompilationUnit cu = createTestXmlJoinNode();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		
-		assertEquals(1, resourceAttribute.getAnnotationsSize(ELJaxb.XML_JOIN_NODE));
-		
-		resourceAttribute.addAnnotation(1, ELJaxb.XML_JOIN_NODE);
-		
-		assertEquals(2, resourceAttribute.getAnnotationsSize(ELJaxb.XML_JOIN_NODE));
-		assertSourceContains("@XmlJoinNodes({ @XmlJoinNode, @XmlJoinNode })", cu);
-		
-		XmlJoinNodeAnnotation annotation1 = getXmlJoinNodeAnnotation(resourceAttribute, 0);
-		annotation1.setXmlPath("foo");
-		XmlJoinNodeAnnotation annotation2 = getXmlJoinNodeAnnotation(resourceAttribute, 1);
-		annotation2.setXmlPath("bar");
-		assertSourceContains(
-				"@XmlJoinNodes({ @XmlJoinNode(xmlPath = \"foo\"), @XmlJoinNode(xmlPath = \"bar\") })", cu);
-		
-		resourceAttribute.moveAnnotation(0, 1, ELJaxb.XML_JOIN_NODE);
-		assertSourceContains(
-				"@XmlJoinNodes({ @XmlJoinNode(xmlPath = \"bar\"), @XmlJoinNode(xmlPath = \"foo\") })", cu);
-		
-		resourceAttribute.removeAnnotation(0, ELJaxb.XML_JOIN_NODE);
-		assertEquals(1, resourceAttribute.getAnnotationsSize(ELJaxb.XML_JOIN_NODE));
-		assertSourceContains(
-				"@XmlJoinNode(xmlPath = \"foo\")", cu);
-		assertSourceDoesNotContain("@XmlJoinNodes", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java
deleted file mode 100644
index bbd0a16f4d..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2012  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlKeyAnnotation;
-
-
-public class XmlKeyAnnotationTests
-		extends ELJaxbJavaResourceModelTestCase {
-	
-	public XmlKeyAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected AnnotationDefinition[] annotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getAnnotationDefinitions();
-	}
-	
-	@Override
-	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getNestableAnnotationDefinitions();
-	}
-	
-	
-	private ICompilationUnit createTestXmlKey() 
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_KEY);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlKey");
-			}
-		});
-	}
-	
-	private XmlKeyAnnotation getXmlKeyAnnotation(JavaResourceAttribute resourceAttribute) {
-		return (XmlKeyAnnotation) resourceAttribute.getAnnotation(ELJaxb.XML_KEY);
-	}
-	
-	
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = createTestXmlKey();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlKeyAnnotation annotation = getXmlKeyAnnotation(resourceAttribute);
-		
-		assertTrue(annotation != null);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java
deleted file mode 100644
index f427394ab1..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation;
-
-
-public class XmlPathAnnotationTests
-		extends ELJaxbJavaResourceModelTestCase {
-	
-	public XmlPathAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	private ICompilationUnit createTestXmlPath()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_PATH);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlPath");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlPathWithValue()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_PATH);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlPath(\"foo\")");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlPaths()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_PATHS, ELJaxb.XML_PATH);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlPaths({@XmlPath,@XmlPath})");
-			}
-		});
-	}
-	
-	private XmlPathAnnotation getXmlPathAnnotation(JavaResourceAttribute resourceAttribute) {
-		return getXmlPathAnnotation(resourceAttribute, 0);
-	}
-	
-	private XmlPathAnnotation getXmlPathAnnotation(JavaResourceAttribute resourceAttribute, int index) {
-		return (XmlPathAnnotation) resourceAttribute.getAnnotation(index, ELJaxb.XML_PATH);
-	}
-	
-	
-	public void testValue() throws Exception {
-		ICompilationUnit cu = createTestXmlPathWithValue();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlPathAnnotation annotation = getXmlPathAnnotation(resourceAttribute);
-		
-		assertEquals("foo", annotation.getValue());
-		assertSourceContains("@XmlPath(\"foo\")", cu);
-		
-		annotation.setValue("bar");
-		
-		assertEquals("bar", annotation.getValue());
-		assertSourceContains("@XmlPath(\"bar\")", cu);
-		
-		annotation.setValue("");
-		
-		assertEquals("", annotation.getValue());
-		assertSourceContains("@XmlPath(\"\")", cu);
-		
-		annotation.setValue(null);
-		
-		assertNull(annotation.getValue());
-		assertSourceContains("@XmlPath", cu);
-		assertSourceDoesNotContain("@XmlPath(", cu);
-	}
-	
-	public void testContainedValue() throws Exception {
-		// test contained annotation value setting/updating
-		
-		ICompilationUnit cu = createTestXmlPaths();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlPathAnnotation annotation = getXmlPathAnnotation(resourceAttribute);
-		
-		assertNull(annotation.getValue());
-		assertSourceContains(
-				"@XmlPaths({@XmlPath,@XmlPath})", cu);
-		
-		annotation.setValue("foo");
-		assertEquals("foo", annotation.getValue());
-		assertSourceContains(
-				"@XmlPaths({@XmlPath(\"foo\"),@XmlPath})", cu);
-		
-		annotation.setValue(null);
-		assertNull(annotation.getValue());
-		assertSourceContains(
-				"@XmlPaths({@XmlPath,@XmlPath})", cu);
-	}
-	
-	public void testContained()
-			throws Exception {
-		// test adding/removing/moving
-		
-		ICompilationUnit cu = createTestXmlPath();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		
-		assertEquals(1, resourceAttribute.getAnnotationsSize(ELJaxb.XML_PATH));
-		
-		resourceAttribute.addAnnotation(1, ELJaxb.XML_PATH);
-		
-		assertEquals(2, resourceAttribute.getAnnotationsSize(ELJaxb.XML_PATH));
-		assertSourceContains("@XmlPaths({ @XmlPath, @XmlPath })", cu);
-		
-		XmlPathAnnotation annotation1 = getXmlPathAnnotation(resourceAttribute, 0);
-		annotation1.setValue("foo");
-		XmlPathAnnotation annotation2 = getXmlPathAnnotation(resourceAttribute, 1);
-		annotation2.setValue("bar");
-		assertSourceContains(
-				"@XmlPaths({ @XmlPath(\"foo\"), @XmlPath(\"bar\") })", cu);
-		
-		resourceAttribute.moveAnnotation(0, 1, ELJaxb.XML_PATH);
-		assertSourceContains(
-				"@XmlPaths({ @XmlPath(\"bar\"), @XmlPath(\"foo\") })", cu);
-		
-		resourceAttribute.removeAnnotation(0, ELJaxb.XML_PATH);
-		assertEquals(1, resourceAttribute.getAnnotationsSize(ELJaxb.XML_PATH));
-		assertSourceContains(
-				"@XmlPath(\"foo\")", cu);
-		assertSourceDoesNotContain("@XmlPaths", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java
deleted file mode 100644
index 2fd4039364..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java;
-
-import java.util.Iterator;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb;
-import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlTransformationAnnotation;
-
-
-public class XmlTransformationAnnotationTests
-		extends ELJaxbJavaResourceModelTestCase {
-	
-	public XmlTransformationAnnotationTests(String name) {
-		super(name);
-	}
-	
-	
-	@Override
-	protected AnnotationDefinition[] annotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getAnnotationDefinitions();
-	}
-	
-	@Override
-	protected NestableAnnotationDefinition[] nestableAnnotationDefinitions() {
-		return ELJaxb_2_2_PlatformDefinition.instance().getNestableAnnotationDefinitions();
-	}
-	
-	
-	private ICompilationUnit createTestXmlTransformation() 
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_TRANSFORMATION);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlTransformation");
-			}
-		});
-	}
-	
-	private ICompilationUnit createTestXmlTransformationWithOptional()
-			throws Exception {
-		
-		return this.createTestType(new DefaultAnnotationWriter() {
-			
-			@Override
-			public Iterator<String> imports() {
-				return new ArrayIterator<String>(ELJaxb.XML_TRANSFORMATION);
-			}
-			
-			@Override
-			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@XmlTransformation(optional = true)");
-			}
-		});
-	}
-	
-	private XmlTransformationAnnotation getXmlTransformationAnnotation(JavaResourceAttribute resourceAttribute) {
-		return (XmlTransformationAnnotation) resourceAttribute.getAnnotation(ELJaxb.XML_TRANSFORMATION);
-	}
-	
-	
-	public void testGetNull() throws Exception {
-		ICompilationUnit cu = createTestXmlTransformation();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlTransformationAnnotation annotation = getXmlTransformationAnnotation(resourceAttribute);
-		
-		assertTrue(annotation != null);
-		assertNull(annotation.getOptional());
-	}
-	
-	public void testGetOptional() throws Exception {
-		ICompilationUnit cu = createTestXmlTransformationWithOptional();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlTransformationAnnotation annotation = getXmlTransformationAnnotation(resourceAttribute);
-		
-		assertEquals(Boolean.TRUE, annotation.getOptional());
-	}
-	
-	public void testSetOptional() throws Exception {
-		ICompilationUnit cu = createTestXmlTransformation();
-		JavaResourceType resourceType = buildJavaResourceType(cu); 
-		JavaResourceField resourceAttribute = getField(resourceType, 0);
-		XmlTransformationAnnotation annotation = getXmlTransformationAnnotation(resourceAttribute);
-		
-		assertNull(annotation.getOptional());
-		
-		annotation.setOptional(Boolean.FALSE);
-		
-		assertEquals(Boolean.FALSE, annotation.getOptional());
-		assertSourceContains("@XmlTransformation(optional = false)", cu);
-		
-		annotation.setOptional(null);
-		
-		assertNull(annotation.getOptional());
-		assertSourceContains("@XmlTransformation", cu);
-		assertSourceDoesNotContain("optional", cu);
-	}
-}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/test.xml b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/test.xml
deleted file mode 100644
index 09430226e2..0000000000
--- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/test.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Copyright (c) 2011 Oracle. All rights reserved.
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License v1.0, which accompanies this distribution
-  and is available at http://www.eclipse.org/legal/epl-v10.html.
-
-  Contributors:
-    Oracle - initial API and implementation
- -->
-
-<project name="testsuite" default="run" basedir=".">
-	<!-- The property ${eclipse-home} should be passed into this script -->
-	<!-- Set a meaningful default value for when it is not. -->
-	<echo message="basedir ${basedir}" />
-	<echo message="eclipse place ${eclipse-home}" />
-	<!-- sets the properties plugin-name -->
-	<property name="plugin-name" value="org.eclipse.jpt.jaxb.eclipselink.core.tests"/>
-    <echo level="debug" message="testRoot: ${testRoot}" />
-    <fail message="testRoot must be set" unless="testRoot" />
-
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-	<target name="init">
-		<tstamp/>
-		<delete>
-			<fileset dir="${eclipse-home}" includes="org*.xml"/>
-		</delete>
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite1">
-    	<property file="${testRoot}/testServer.properties"/>
-	    <property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
-	    <delete dir="${jpt-folder}" quiet="true"/>
-
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-		    <property name="data-dir" value="${jpt-folder}"/>
-			<property name="plugin-name" value="${plugin-name}"/>
-			<property name="classname" value="org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.ELJaxbCoreResourceModelTests"/>
-			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-			<property name="extraVMargs" value="-Dorg.eclipse.jpt.jaxb.jar=${testDir}/${jpt-javax-xml-bind-jar} -Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink-jar}"/>
-		</ant>
-	</target>
-	<target name="suite2">
-    	<property file="${testRoot}/testServer.properties"/>
-	    <property name="jpt-folder" value="${eclipse-home}/jpt_folder"/>
-	    <delete dir="${jpt-folder}" quiet="true"/>
-
-		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-		    <property name="data-dir" value="${jpt-folder}"/>
-			<property name="plugin-name" value="${plugin-name}"/>
-			<property name="classname" value="org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbCoreContextModelTests"/>
-			<property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-			<property name="extraVMargs" value="-Dorg.eclipse.jpt.jaxb.jar=${testDir}/${jpt-javax-xml-bind-jar} -Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink-jar}"/>
-		</ant>
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target name="run" depends="init, suite1, suite2, cleanup">
-	</target>
-</project>
\ No newline at end of file