support for versionless xml files

11 files changed, 50 insertions, 50 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
index 3aad51d827..952fb6c93d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
@@ -259,7 +259,7 @@ public abstract class AbstractEntityMappings
 	}
 
 	public String getVersion() {
-		return this.xmlEntityMappings.getVersion();
+		return this.xmlEntityMappings.getDocumentVersion();
 	}
 
 	public void changeMapping(OrmPersistentType ormPersistentType, OrmTypeMapping oldMapping, OrmTypeMapping newMapping) {
@@ -1089,7 +1089,7 @@ public abstract class AbstractEntityMappings
 	}
 
 	protected void validateVersion(List<IMessage> messages) {
-		if (! this.getLatestDocumentVersion().equals(this.xmlEntityMappings.getVersion())) {
+		if (! this.getLatestDocumentVersion().equals(this.xmlEntityMappings.getDocumentVersion())) {
 			messages.add(
 				DefaultJpaValidationMessages.buildMessage(
 					IMessage.LOW_SEVERITY,
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
index 2b1a38b8a8..bf298df7f1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
@@ -272,7 +272,7 @@ public class GenericPersistence
 	}
 
 	protected void validateVersion(List<IMessage> messages) {
-		if (! this.getLatestDocumentVersion().equals(this.xmlPersistence.getVersion())) {
+		if (! this.getLatestDocumentVersion().equals(this.xmlPersistence.getDocumentVersion())) {
 			messages.add(
 					DefaultJpaValidationMessages.buildMessage(
 						IMessage.LOW_SEVERITY,
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/orm/OrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/orm/OrmXmlResourceProvider.java
index 8474e9dfe5..e708504f2d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/orm/OrmXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/orm/OrmXmlResourceProvider.java
@@ -65,7 +65,7 @@ public class OrmXmlResourceProvider
 	protected void populateRoot(Object config) {
 		IDataModel dataModel = (IDataModel) config;
 		XmlEntityMappings entityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
-		entityMappings.setVersion(dataModel.getStringProperty(VERSION));
+		entityMappings.setDocumentVersion(dataModel.getStringProperty(VERSION));
 		getResourceContents().add(entityMappings);
 		
 		String defaultAccess = (String) dataModel.getProperty(DEFAULT_ACCESS); 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/persistence/PersistenceXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
index b9a9892c2e..6b8039fca2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/persistence/PersistenceXmlResourceProvider.java
@@ -65,7 +65,7 @@ public class PersistenceXmlResourceProvider
 	protected void populateRoot(Object config) {
 		IDataModel dataModel = (IDataModel) config;
 		XmlPersistence persistence = PersistenceFactory.eINSTANCE.createXmlPersistence();
-		persistence.setVersion(dataModel.getStringProperty(VERSION));
+		persistence.setDocumentVersion(dataModel.getStringProperty(VERSION));
 		XmlPersistenceUnit persistenceUnit = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit();
 		persistenceUnit.setName(getProject().getName());
 		persistence.getPersistenceUnits().add(persistenceUnit);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
index df751b99e5..3ebcb0e982 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java
@@ -1032,27 +1032,27 @@ public class XmlEntityMappings extends ERootObjectImpl implements XmlQueryContai
 
 
 	// ********** version -> schema location mapping **********
-
-	@Override
-	protected String getNamespace() {
-		return JPA.SCHEMA_NAMESPACE;
-	}
-
-	@Override
-	protected String getSchemaLocationForVersion(String schemaVersion) {
-		return SCHEMA_LOCATIONS.get(schemaVersion);
-	}
-
+	
 	private static final HashMap<String, String> SCHEMA_LOCATIONS = buildSchemaLocations();
-
+	
 	private static HashMap<String, String> buildSchemaLocations() {
 		HashMap<String, String> map = new HashMap<String, String>();
 		map.put(JPA.SCHEMA_VERSION, JPA.SCHEMA_LOCATION);
 		map.put(JPA2_0.SCHEMA_VERSION, JPA2_0.SCHEMA_LOCATION);
 		return map;
 	}
-
-
+	
+	@Override
+	protected String getNamespace() {
+		return JPA.SCHEMA_NAMESPACE;
+	}
+	
+	@Override
+	protected HashMap<String, String> schemaLocations() {
+		return SCHEMA_LOCATIONS;
+	}
+	
+	
 	// ********** content type **********
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistence.java
index bbc27da442..91d6b5a009 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistence.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistence.java
@@ -202,27 +202,27 @@ public class XmlPersistence extends ERootObjectImpl
 
 
 	// ********** version -> schema location mapping **********
-
-	@Override
-	protected String getNamespace() {
-		return JPA.SCHEMA_NAMESPACE;
-	}
-
-	@Override
-	protected String getSchemaLocationForVersion(String schemaVersion) {
-		return SCHEMA_LOCATIONS.get(schemaVersion);
-	}
-
+	
 	private static final HashMap<String, String> SCHEMA_LOCATIONS = buildSchemaLocations();
-
+	
 	private static HashMap<String, String> buildSchemaLocations() {
 		HashMap<String, String> map = new HashMap<String, String>();
 		map.put(JPA.SCHEMA_VERSION, JPA.SCHEMA_LOCATION);
 		map.put(JPA2_0.SCHEMA_VERSION, JPA2_0.SCHEMA_LOCATION);
 		return map;
 	}
-
-
+	
+	@Override
+	protected String getNamespace() {
+		return JPA.SCHEMA_NAMESPACE;
+	}
+	
+	@Override
+	protected HashMap<String, String> schemaLocations() {
+		return SCHEMA_LOCATIONS;
+	}
+	
+	
 	// ********** content/resource type **********
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
index 10e19b307e..a0a4e2060d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
@@ -66,7 +66,7 @@ public class EclipseLinkOrmXmlResourceProvider
 	protected void populateRoot(Object config) {
 		IDataModel dataModel = (IDataModel) config;
 		XmlEntityMappings entityMappings = EclipseLinkOrmFactory.eINSTANCE.createXmlEntityMappings();
-		entityMappings.setVersion(dataModel.getStringProperty(VERSION));
+		entityMappings.setDocumentVersion(dataModel.getStringProperty(VERSION));
 		getResourceContents().add(entityMappings);
 		
 		String defaultAccess = (String) dataModel.getProperty(DEFAULT_ACCESS); 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
index 1c9b4c77f5..a78dc7f638 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
@@ -1342,19 +1342,9 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
 
 
 	// ********** version -> schema location mapping **********
-
-	@Override
-	protected String getNamespace() {
-		return EclipseLink.SCHEMA_NAMESPACE;
-	}
-
-	@Override
-	protected String getSchemaLocationForVersion(String schemaVersion) {
-		return SCHEMA_LOCATIONS.get(schemaVersion);
-	}
-
+	
 	private static HashMap<String, String> SCHEMA_LOCATIONS = buildSchemaLocations();
-
+	
 	private static HashMap<String, String> buildSchemaLocations() {
 		HashMap<String, String> map = new HashMap<String, String>();
 		map.put(EclipseLink.SCHEMA_VERSION, EclipseLink.SCHEMA_LOCATION);
@@ -1368,7 +1358,17 @@ public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.Xml
 		return map;
 	}
 	
-
+	@Override
+	protected String getNamespace() {
+		return EclipseLink.SCHEMA_NAMESPACE;
+	}
+	
+	@Override
+	protected HashMap<String, String> schemaLocations() {
+		return SCHEMA_LOCATIONS;
+	}
+	
+	
 	// ********** content/resource type **********
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/commands/UpgradeXmlFileVersionHandler.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/commands/UpgradeXmlFileVersionHandler.java
index 214eca6483..f649513b0a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/commands/UpgradeXmlFileVersionHandler.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/commands/UpgradeXmlFileVersionHandler.java
@@ -54,7 +54,7 @@ public class UpgradeXmlFileVersionHandler
 		IContentType contentType = xmlResource.getContentType();
 		JpaProject jpaProject = this.getJpaProject(xmlResource.getFile().getProject());
 		String newVersion = jpaProject.getJpaPlatform().getMostRecentSupportedResourceType(contentType).getVersion();
-		root.setVersion(newVersion);
+		root.setDocumentVersion(newVersion);
 		xmlResource.save();
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
index bc4db503c9..ab2738ed66 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java
@@ -49,7 +49,7 @@ public class OrmXmlTests extends ContextModelTestCase
 		assertEquals(1, getJpaProject().getJpaFilesSize()); //should only be the persistence.xml file
 		
 		XmlEntityMappings xmlEntityMappings = OrmFactory.eINSTANCE.createXmlEntityMappings();
-		xmlEntityMappings.setVersion("1.0");
+		xmlEntityMappings.setDocumentVersion("1.0");
 		ormResource.getContents().add(xmlEntityMappings);
 		ormResource.save(null);
 		
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
index 246c9cc374..b924e24bb5 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java
@@ -37,7 +37,7 @@ public class PersistenceXmlTests extends ContextModelTestCase
 		assertEquals(1, getJpaProject().getJpaFilesSize()); //should only be the orm.xml file
 		
 		XmlPersistence xmlPersistence = PersistenceFactory.eINSTANCE.createXmlPersistence();
-		xmlPersistence.setVersion("1.0");
+		xmlPersistence.setDocumentVersion("1.0");
 		prm.getContents().add(xmlPersistence);
 		prm.save(null);