Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2009-07-10 14:40:35 +0000
committerkmoore2009-07-10 14:40:35 +0000
commit41e4f018895d6c923eb6e9af90b42b294413ada9 (patch)
tree85cd3868785318d76e92ac872b9271764464dc91
parent0f6e9b98692ddee99c496e9eb07bb3f57593a4cf (diff)
downloadwebtools.dali-41e4f018895d6c923eb6e9af90b42b294413ada9.tar.gz
webtools.dali-41e4f018895d6c923eb6e9af90b42b294413ada9.tar.xz
webtools.dali-41e4f018895d6c923eb6e9af90b42b294413ada9.zip
even more changes to figure out our test failures in the build
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF1
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/plugin.xml88
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/xml/XMLRootElementVersionContentDescriber.java (renamed from jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootElementContentDescriber2.java)8
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/xml/XMLRootHandler.java (renamed from jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootHandler.java)2
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml4
7 files changed, 80 insertions, 27 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
index c6633e5c38..51cf8220f7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
@@ -49,6 +49,7 @@ Export-Package: org.eclipse.jpt.core,
org.eclipse.jpt.core.internal.resource.java.source;x-friends:="org.eclipse.jpt.ui",
org.eclipse.jpt.core.internal.resource.orm;x-friends:="org.eclipse.jpt.ui",
org.eclipse.jpt.core.internal.resource.persistence;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.resource.xml;x-friends:="org.eclipse.jpt.ui",
org.eclipse.jpt.core.internal.resource.xml.translators;x-friends:="org.eclipse.jpt.ui",
org.eclipse.jpt.core.internal.synch;x-friends:="org.eclipse.jpt.ui",
org.eclipse.jpt.core.internal.utility;x-friends:="org.eclipse.jpt.ui",
diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
index 3c9657172a..0894b9dba2 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.contenttype.contentTypes">
+ point="org.eclipse.core.runtime.contentTypes">
<!-- "abstract" content type to be extended by all JPA XML file content types -->
<content-type
@@ -25,40 +25,76 @@
describer="org.eclipse.jpt.core.internal.resource.IndeterminateContentDescriber">
</content-type>
- <!-- "abstract" mapping file content type -->
+ <!-- "abstract" persistence file content type -->
<content-type
- id="org.eclipse.jpt.core.content.mappingFile"
- name="%MAPPING_FILE_CONTENT"
+ id="org.eclipse.jpt.core.content.persistenceFile"
+ name="%PERSISTENCE_FILE_CONTENT"
base-type="org.eclipse.jpt.core.content.baseJpaContent">
</content-type>
- <!-- orm.xml content type -->
- <content-type
- base-type="org.eclipse.jpt.core.content.mappingFile"
- id="org.eclipse.jpt.core.content.orm"
- name="%ORM_XML_CONTENT">
+ <!-- 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"
+ file-names="persistence.xml">
<describer
- class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
+ class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
<parameter
name="element"
- value="{http://java.sun.com/xml/ns/persistence/orm}entity-mappings"/>
+ value="{http://java.sun.com/xml/ns/persistence}persistence:1.0"/>
</describer>
</content-type>
-
- <!-- persistence.xml content type -->
+
+ <!-- persistence.xml version 2.0 content type -->
<content-type
- id="org.eclipse.jpt.core.content.persistence"
- name="%PERSISTENCE_XML_CONTENT"
- base-type="org.eclipse.jpt.core.content.baseJpaContent"
+ id="org.eclipse.jpt.core.content.persistence2_0"
+ name="%PERSISTENCE2_0_XML_CONTENT"
+ base-type="org.eclipse.jpt.core.content.persistenceFile"
file-names="persistence.xml">
<describer
- class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber2">
+ class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
+ <parameter
+ name="element"
+ value="{http://java.sun.com/xml/ns/persistence}persistence:2.0">
+ </parameter>
+ </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">
+ <describer
+ class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
<parameter
name="element"
- value="{http://java.sun.com/xml/ns/persistence}persistence"/>
+ value="{http://java.sun.com/xml/ns/persistence/orm}entity-mappings:1.0"/>
</describer>
</content-type>
+ <!-- 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">
+ <describer
+ class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
+ <parameter
+ name="element"
+ value="{http://java.sun.com/xml/ns/persistence/orm}entity-mappings:2.0">
+ </parameter>
+ </describer>
+ </content-type>
+
<!-- JAR content type -->
<content-type
id="org.eclipse.jpt.core.content.jar"
@@ -275,6 +311,22 @@
</contentTypeBinding>
</resourceFactory>
+ <resourceFactory
+ class="org.eclipse.jpt2_0.core.resource.orm.Orm2_0XmlResourceFactory"
+ isDefault="true">
+ <contentTypeBinding
+ contentTypeId="org.eclipse.jpt.core.content.orm2_0">
+ </contentTypeBinding>
+ </resourceFactory>
+
+ <resourceFactory
+ class="org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0XmlResourceFactory"
+ isDefault="true">
+ <contentTypeBinding
+ contentTypeId="org.eclipse.jpt.core.content.persistence2_0">
+ </contentTypeBinding>
+ </resourceFactory>
+
</extension>
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 93c5e84583..35dcddf7d7 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
@@ -118,7 +118,7 @@ public class JptCorePlugin extends Plugin {
/**
* The base content type for all persistence.xml files.
*/
-// public static final IContentType PERSISTENCE_FILE_CONTENT_TYPE = getJpaContentType("persistenceFile"); //$NON-NLS-1$
+ 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.
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 ffbd2f0732..66dc03cb4a 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 abstract class AbstractJpaProject
public JpaXmlResource getPersistenceXmlResource() {
return (JpaXmlResource) this.getResourceModel(
JptCorePlugin.DEFAULT_PERSISTENCE_XML_FILE_PATH,
- JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE
+ JptCorePlugin.PERSISTENCE_FILE_CONTENT_TYPE
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootElementContentDescriber2.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/xml/XMLRootElementVersionContentDescriber.java
index 02b128dd7a..d82ca97b23 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootElementContentDescriber2.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/xml/XMLRootElementVersionContentDescriber.java
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
* Jesper Steen Moeller - added namespace support
*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm;
+package org.eclipse.jpt.core.internal.resource.xml;
import java.io.IOException;
import java.io.InputStream;
@@ -62,7 +62,7 @@ import org.xml.sax.SAXException;
* will be detected.
* </p>
* <p>
- * This class should be used instead of {@link XMLRootElementContentDescriber2}
+ * This class should be used instead of {@link XMLRootElementVersionContentDescriber}
* which doesn't detect namespaces and doesn't allow to specify
* more than one set of dtds, root element names and namespaces which
* should be detected.
@@ -76,7 +76,7 @@ import org.xml.sax.SAXException;
*
* @since org.eclipse.core.contenttype 3.3
*/
-public final class XMLRootElementContentDescriber2 extends XMLContentDescriber implements IExecutableExtension {
+public final class XMLRootElementVersionContentDescriber extends XMLContentDescriber implements IExecutableExtension {
private static final String ELEMENT_TO_FIND = "element"; //$NON-NLS-1$
/* (Intentionally not included in javadoc)
@@ -253,7 +253,7 @@ public final class XMLRootElementContentDescriber2 extends XMLContentDescriber i
}
if (elementsToFind.length == 0) {
- String message = NLS.bind(ContentMessages.content_badInitializationData, XMLRootElementContentDescriber2.class.getName());
+ String message = NLS.bind(ContentMessages.content_badInitializationData, XMLRootElementVersionContentDescriber.class.getName());
throw new CoreException(new Status(IStatus.ERROR, ContentMessages.OWNER_NAME, 0, message, null));
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootHandler.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/xml/XMLRootHandler.java
index 8dc970953b..7347da8f85 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/XMLRootHandler.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/xml/XMLRootHandler.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.eclipselink.core.internal.resource.orm;
+package org.eclipse.jpt.core.internal.resource.xml;
import java.io.IOException;
import java.io.StringReader;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
index ce1c20dabe..d31a2849f0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
@@ -10,7 +10,7 @@
name="%ECLIPSELINK1_0_x_ORM_XML_CONTENT"
base-type="org.eclipse.jpt.core.content.mappingFile">
<describer
- class="org.eclipse.jpt.eclipselink.core.internal.resource.orm.XMLRootElementContentDescriber2">
+ class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
<parameter
name="element"
value="{http://www.eclipse.org/eclipselink/xsds/persistence/orm}entity-mappings:1.0"/>
@@ -22,7 +22,7 @@
name="%ECLIPSELINK1_1_x_ORM_XML_CONTENT"
base-type="org.eclipse.jpt.eclipselink.core.content.orm">
<describer
- class="org.eclipse.jpt.eclipselink.core.internal.resource.orm.XMLRootElementContentDescriber2">
+ class="org.eclipse.jpt.core.internal.resource.xml.XMLRootElementVersionContentDescriber">
<parameter
name="element"
value="{http://www.eclipse.org/eclipselink/xsds/persistence/orm}entity-mappings:1.1">

Back to the top