[bug 223416] persistenceUnit.mappingFileRefs() does not return default orm.xml for web projects

5 files changed, 21 insertions, 9 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java
index 0545575c54..343893013c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java
@@ -188,19 +188,29 @@ public class JptCorePlugin extends Plugin {
 	}
 
 	/**
-	 * Return the persistence.xml deployment URI for the specified project.
+	 * Return the persistence.xml (specified as "META-INF/persistence.xml")
+	 * deployment URI for the specified project.
 	 */
 	public static String getPersistenceXmlDeploymentURI(IProject project) {
 		return getDeploymentURI(project, DEFAULT_PERSISTENCE_XML_FILE_PATH);
 	}
 
 	/**
-	 * Return the orm.xml deployment URI for the specified project.
+	 * Return the default mapping file (specified as "META-INF/orm.xml")
+	 * deployment URI for the specified project.
 	 */
-	public static String getOrmXmlDeploymentURI(IProject project) {
+	public static String getDefaultOrmXmlDeploymentURI(IProject project) {
 		return getDeploymentURI(project, DEFAULT_ORM_XML_FILE_PATH);
 	}
-
+	
+	/**
+	 * Return the mapping file (specified as "META-INF/<mappingFileName>")
+	 * deployment URI for the specified project.
+	 */
+	public static String getOrmXmlDeploymentURI(IProject project, String mappingFileName) {
+		return getDeploymentURI(project, mappingFileName);
+	}
+	
 	/**
 	 * Tweak the specified deployment URI if the specified project
 	 * has a web facet.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java
index 06fd2f70e7..452640bb7a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java
@@ -263,7 +263,7 @@ public class GenericJpaModel
 
 	private void createOrmXml(IProject project) {
 		OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForWrite(project);
-		OrmResource resource = oae.getResource(JptCorePlugin.getOrmXmlDeploymentURI(project));
+		OrmResource resource = oae.getResource(JptCorePlugin.getDefaultOrmXmlDeploymentURI(project));
 
 		// 202811 - do not add content if it is already present
 		if (resource.getEntityMappings() == null) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java
index 1d91dbc0ec..23116c158a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java
@@ -11,6 +11,7 @@
 package org.eclipse.jpt.core.internal.context.persistence;
 
 import java.util.List;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
@@ -127,8 +128,9 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode
 	
 	protected void updateOrmXml() {
 		if (fileName != null) {
-			OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(getJpaProject().getProject());
-			OrmResource ormResource = oae.getResource(fileName);
+			IProject project = getJpaProject().getProject();
+			OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(project);
+			OrmResource ormResource = oae.getResource(JptCorePlugin.getOrmXmlDeploymentURI(project, fileName));
 			if (ormResource != null && ormResource.exists()) {
 				if (ormXml != null) {
 					ormXml.update(ormResource);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java
index 1a7162db1f..ddcdc117b0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java
@@ -860,7 +860,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode
 	
 	protected boolean impliedMappingFileExists() {
 		OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(getJpaProject().getProject());
-		OrmResource or = oae.getResource(JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH);
+		OrmResource or = oae.getResource(JptCorePlugin.getDefaultOrmXmlDeploymentURI(getJpaProject().getProject()));
 		boolean exists =  or != null && or.exists();
 		oae.dispose();
 		return exists;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
index 1194ef0212..2c840ed676 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
@@ -329,7 +329,7 @@
 		<navigatorContent
 			id="org.eclipse.jpt.ui.jpaNavigatorContent"
 			name="%jpaNavigatorContent" 
-			priority="higher"
+			priority="highest"
 			icon="icons/full/obj16/jpa-content.gif"
 			activeByDefault="true"
 			contentProvider="org.eclipse.jpt.ui.internal.navigator.JpaNavigatorContentProvider"