yet another expiriment in gettings tests to pass in the build
diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
index 0894b9d..2b4dfba 100644
--- a/jpa/plugins/org.eclipse.jpt.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
@@ -15,7 +15,7 @@
<!-- ***** Eclipse core extensions ***** -->
<extension
- point="org.eclipse.core.runtime.contentTypes">
+ point="org.eclipse.core.contenttype.contentTypes">
<!-- "abstract" content type to be extended by all JPA XML file content types -->
<content-type
@@ -25,18 +25,11 @@
describer="org.eclipse.jpt.core.internal.resource.IndeterminateContentDescriber">
</content-type>
- <!-- "abstract" persistence file content type -->
- <content-type
- id="org.eclipse.jpt.core.content.persistenceFile"
- name="%PERSISTENCE_FILE_CONTENT"
- base-type="org.eclipse.jpt.core.content.baseJpaContent">
- </content-type>
-
<!-- persistence.xml version 1.0 content type -->
<content-type
id="org.eclipse.jpt.core.content.persistence"
name="%PERSISTENCE_XML_CONTENT"
- base-type="org.eclipse.jpt.core.content.persistenceFile"
+ base-type="org.eclipse.jpt.core.content.baseJpaContent"
file-names="persistence.xml">
<describer
class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
@@ -50,7 +43,7 @@
<content-type
id="org.eclipse.jpt.core.content.persistence2_0"
name="%PERSISTENCE2_0_XML_CONTENT"
- base-type="org.eclipse.jpt.core.content.persistenceFile"
+ base-type="org.eclipse.jpt.core.content.persistence"
file-names="persistence.xml">
<describer
class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
@@ -61,18 +54,11 @@
</describer>
</content-type>
- <!-- "abstract" mapping file content type -->
- <content-type
- id="org.eclipse.jpt.core.content.mappingFile"
- name="%MAPPING_FILE_CONTENT"
- base-type="org.eclipse.jpt.core.content.baseJpaContent">
- </content-type>
-
<!-- orm.xml version 1.0 content type -->
<content-type
id="org.eclipse.jpt.core.content.orm"
name="%ORM_XML_CONTENT"
- base-type="org.eclipse.jpt.core.content.mappingFile">
+ base-type="org.eclipse.jpt.core.content.baseJpaContent">
<describer
class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
<parameter
@@ -83,9 +69,9 @@
<!-- orm.xml version 2.0 content type -->
<content-type
- base-type="org.eclipse.jpt.core.content.mappingFile"
id="org.eclipse.jpt.core.content.orm2_0"
- name="%ORM2_0_XML_CONTENT">
+ name="%ORM2_0_XML_CONTENT"
+ base-type="org.eclipse.jpt.core.content.orm">
<describer
class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
<parameter
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 35dcddf..fd1a9fd 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
@@ -114,11 +114,6 @@
* The content type for Java source code files.
*/
public static final IContentType JAVA_SOURCE_CONTENT_TYPE = getContentType(JavaCore.JAVA_SOURCE_CONTENT_TYPE);
-
- /**
- * The base content type for all persistence.xml files.
- */
- public static final IContentType PERSISTENCE_FILE_CONTENT_TYPE = getJpaContentType("persistenceFile"); //$NON-NLS-1$
/**
* The content type for persistence.xml 1.0 (based on the persistence 1.0 schema) files.
@@ -129,12 +124,7 @@
* The content type for persistence.xml 2.0 (based on the persistence 2.0 schema) files.
*/
public static final IContentType PERSISTENCE2_0_XML_CONTENT_TYPE = getJpaContentType("persistence2_0"); //$NON-NLS-1$
-
- /**
- * The base content type for all mapping files.
- */
- public static final IContentType MAPPING_FILE_CONTENT_TYPE = getJpaContentType("mappingFile"); //$NON-NLS-1$
-
+
/**
* The content type for orm.xml 1.0 (based on the orm 1.0 schema) mapping files.
*/
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java
index 66dc03c..08e4a79 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java
@@ -656,7 +656,7 @@
public JpaXmlResource getPersistenceXmlResource() {
return (JpaXmlResource) this.getResourceModel(
JptCorePlugin.DEFAULT_PERSISTENCE_XML_FILE_PATH,
- JptCorePlugin.PERSISTENCE_FILE_CONTENT_TYPE
+ JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE
);
}
@@ -665,7 +665,7 @@
}
public JpaXmlResource getMappingFileXmlResource(String fileName) {
- return (JpaXmlResource) this.getResourceModel(fileName, JptCorePlugin.MAPPING_FILE_CONTENT_TYPE);
+ return (JpaXmlResource) this.getResourceModel(fileName, JptCorePlugin.ORM_XML_CONTENT_TYPE);
}
/**
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXml.java
index 475d3d4..79fccfa 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXml.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXml.java
@@ -39,7 +39,7 @@
public AbstractOrmXml(MappingFileRef parent, JpaXmlResource resource) {
super(parent);
- if (!resource.getContentType().isKindOf(JptCorePlugin.MAPPING_FILE_CONTENT_TYPE)) {
+ if (!resource.getContentType().isKindOf(JptCorePlugin.ORM_XML_CONTENT_TYPE)) {
throw new IllegalArgumentException(resource + " does not have mapping file content type"); //$NON-NLS-1$
}
this.xmlResource = resource;
@@ -139,7 +139,7 @@
// ********** updating **********
public void update(JpaXmlResource resource) {
- if (!resource.getContentType().isKindOf(JptCorePlugin.MAPPING_FILE_CONTENT_TYPE)) {
+ if (!resource.getContentType().isKindOf(JptCorePlugin.ORM_XML_CONTENT_TYPE)) {
throw new IllegalArgumentException(resource + " does not have mapping file content type"); //$NON-NLS-1$
}
this.xmlResource = resource;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
index d31a284..cae218d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
@@ -8,7 +8,7 @@
<content-type
id="org.eclipse.jpt.eclipselink.core.content.orm"
name="%ECLIPSELINK1_0_x_ORM_XML_CONTENT"
- base-type="org.eclipse.jpt.core.content.mappingFile">
+ base-type="org.eclipse.jpt.core.content.orm">
<describer
class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
<parameter
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/XmlMappingFileViewerFilter.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/XmlMappingFileViewerFilter.java
index 9edf44a..5474d64 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/XmlMappingFileViewerFilter.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/XmlMappingFileViewerFilter.java
@@ -48,7 +48,7 @@
*/
private boolean isMappingFile(IFile file) {
JpaFile jpaFile = this.jpaProject.getJpaFile(file);
- return jpaFile != null ? jpaFile.getContentType().isKindOf(JptCorePlugin.MAPPING_FILE_CONTENT_TYPE): false;
+ return jpaFile != null ? jpaFile.getContentType().isKindOf(JptCorePlugin.ORM_XML_CONTENT_TYPE): false;
}
@Override