[jbosstools-commits] JBoss Tools SVN: r39078 - in trunk/maven/plugins/org.jboss.tools.maven.jpa: src/org/jboss/tools/maven/jpa/configurators and 1 other directory.
Author: fbricon
Date: 2012-02-23 16:52:20 -0500 (Thu, 23 Feb 2012)
New Revision: 39078
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jpa/plugin.xml
trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/JpaProjectConfigurator.java
Log:
JBIDE-10976 : do not register the Maven resource locator to Dali, but call it directly in
the JPA configurator to access persistence.xml
Modified: trunk/maven/plugins/org.jboss.tools.maven.jpa/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jpa/plugin.xml 2012-02-23 21:47:34 UTC (rev
39077)
+++ trunk/maven/plugins/org.jboss.tools.maven.jpa/plugin.xml 2012-02-23 21:52:20 UTC (rev
39078)
@@ -21,22 +21,4 @@
secondaryTo="org.maven.ide.eclipse.configuration.wtp.configurator"/>
</extension>
- <extension
- point="org.eclipse.jpt.common.core.resourceLocators">
- <resourceLocator
-
class="org.jboss.tools.maven.jpa.configurators.MavenResourceLocator"
- id="mavenResourceLocator"
- priority="lowest"
- >
- <enablement>
- <with variable="project">
- <and>
- <test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.jdt.core.javanature"
forcePluginActivation="true"/>
- <test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.m2e.core.maven2Nature"
forcePluginActivation="true"/>
- </and>
- </with>
- </enablement>
- </resourceLocator>
- </extension>
-
</plugin>
Modified:
trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/JpaProjectConfigurator.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/JpaProjectConfigurator.java 2012-02-23
21:47:34 UTC (rev 39077)
+++
trunk/maven/plugins/org.jboss.tools.maven.jpa/src/org/jboss/tools/maven/jpa/configurators/JpaProjectConfigurator.java 2012-02-23
21:52:20 UTC (rev 39078)
@@ -16,10 +16,14 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jpt.common.core.resource.ResourceLocator;
import org.eclipse.jpt.jpa.core.JpaFacet;
import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
import org.eclipse.jpt.jpa.core.internal.facet.JpaFacetDataModelProperties;
@@ -69,7 +73,7 @@
return;
}
- IFile persistenceXml = JptUtils.getPersistenceXml(project);
+ IFile persistenceXml = getPersistenceXml(project);
if (persistenceXml == null || !persistenceXml.exists()) {
//No persistence.xml => not a JPA project
return;
@@ -84,6 +88,16 @@
}
}
+ private IFile getPersistenceXml(IProject project) {
+ ResourceLocator resourceLocator = new MavenResourceLocator();
+ IPath path = resourceLocator.getResourcePath(project, new
Path("META-INF/persistence.xml"));
+ IFile persistenceXml = null;
+ if (path != null) {
+ persistenceXml = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ }
+ return persistenceXml;
+ }
+
private void configureFacets(IProgressMonitor monitor, IProject project,
IFacetedProject facetedProject, IFile persistenceXml)
throws CoreException {