moved eclipselink schemas to *.common.eclipselink.core plugin

23 files changed, 115 insertions, 14 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
index 4530770e8c..ad6a4b325c 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jpt.common.utility;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)"
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.200,2.0.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.600,2.0.0)"
 Export-Package: org.eclipse.jpt.common.eclipselink.core,
  org.eclipse.jpt.common.eclipselink.core.internal;
   x-friends:="org.eclipse.jpt.jpa.eclipselink.core,
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties b/common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties
index 494a3fbdf0..d5ecbb9699 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/build.properties
@@ -14,4 +14,6 @@ bin.includes = .,\
                META-INF/,\
                about.html,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               schemas/
+src.includes = schemas/
diff --git a/common/plugins/org.eclipse.jpt.common.eclipselink.core/plugin.xml b/common/plugins/org.eclipse.jpt.common.eclipselink.core/plugin.xml
index ccffee1ecb..d444a5bf06 100644
--- a/common/plugins/org.eclipse.jpt.common.eclipselink.core/plugin.xml
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/plugin.xml
@@ -40,4 +40,112 @@
 		
 	</extension>
 	
+	
+	<!--
+	******************************************
+	* EclipseLink schemas                    *
+	******************************************
+	-->
+	
+	<extension 
+		point="org.eclipse.wst.xml.core.catalogContributions">
+		
+		<catalogContribution id="default">
+			
+			<public
+				publicId="http://www.eclipse.org/eclipselink/xsds/persistence/orm"
+				uri="schemas/eclipselink_orm_2_3.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_0.xsd"
+				uri="schemas/eclipselink_orm_1_0.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_1.xsd"
+				uri="schemas/eclipselink_orm_1_1.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_2.xsd"
+				uri="schemas/eclipselink_orm_1_2.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_0.xsd"
+				uri="schemas/eclipselink_orm_2_0.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_1.xsd"
+				uri="schemas/eclipselink_orm_2_1.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_2.xsd"
+				uri="schemas/eclipselink_orm_2_2.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_3.xsd"
+				uri="schemas/eclipselink_orm_2_3.xsd"/>
+			
+			<public
+				publicId="http://www.eclipse.org/eclipselink/xsds/persistence/oxm"
+				uri="schemas/eclipselink_oxm_2_3.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_0.xsd"
+				uri="schemas/eclipselink_oxm_2_0.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_1.xsd"
+				uri="schemas/eclipselink_oxm_2_1.xsd"/>
+   			
+   			<uri
+         		name="http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_2.xsd"
+         		uri="schemas/eclipselink_oxm_2_2.xsd"/>
+			
+			<uri
+         		name="http://www.eclipse.org/eclipselink/xsds/eclipselink_oxm_2_3.xsd"
+         		uri="schemas/eclipselink_oxm_2_3.xsd"/>
+			
+			<public
+				publicId="http://www.eclipse.org/eclipselink/xsds/persistence"
+				uri="schemas/eclipselink_persistence_map_2.3.xsd"/>				
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_persistence_map_1.0.xsd"
+				uri="schemas/eclipselink_persistence_map_1.0.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_persistence_map_1.1.xsd"
+				uri="schemas/eclipselink_persistence_map_1.1.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_persistence_map_1.2.xsd"
+				uri="schemas/eclipselink_persistence_map_1.2.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_persistence_map_2.0.xsd"
+				uri="schemas/eclipselink_persistence_map_2.0.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_persistence_map_2.3.xsd"
+				uri="schemas/eclipselink_persistence_map_2.3.xsd"/>
+			
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_sessions_1.0.xsd"
+				uri="schemas/eclipselink_sessions_1.0.xsd"/>
+				
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_sessions_1.1.xsd"
+				uri="schemas/eclipselink_sessions_1.1.xsd"/>	
+						
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_sessions_1.2.xsd"
+				uri="schemas/eclipselink_sessions_1.2.xsd"/>
+				
+			<uri
+				name="http://www.eclipse.org/eclipselink/xsds/eclipselink_sessions_2.0.xsd"
+				uri="schemas/eclipselink_sessions_2.0.xsd"/>	
+			
+		</catalogContribution>
+		
+    </extension>
+	
 </plugin>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_1_0.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_1_0.xsd
index af1d1dadad..af1d1dadad 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_1_0.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_1_0.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_1_1.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_1_1.xsd
index 0d3ff1747c..0d3ff1747c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_1_1.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_1_1.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_1_2.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_1_2.xsd
index f7c2b26770..f7c2b26770 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_1_2.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_1_2.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_2_0.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_0.xsd
index 2aa23acf3e..2aa23acf3e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_2_0.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_0.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_2_1.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_1.xsd
index 5e3ce57249..5e3ce57249 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_2_1.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_1.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_2_2.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_2.xsd
index 223029e12a..223029e12a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_orm_2_2.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_orm_2_2.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_oxm_2_0.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_0.xsd
index bb10ce4894..bb10ce4894 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_oxm_2_0.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_0.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
index d4ea8426bb..d4ea8426bb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_1.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd
index 61e37c7daf..61e37c7daf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_oxm_2_2.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_persistence_map_1.0.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_1.0.xsd
index 02c6c61c6c..02c6c61c6c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_persistence_map_1.0.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_1.0.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_persistence_map_1.1.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_1.1.xsd
index 3746ead644..3746ead644 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_persistence_map_1.1.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_1.1.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_persistence_map_1.2.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_1.2.xsd
index 22a56967a2..22a56967a2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_persistence_map_1.2.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_1.2.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_persistence_map_2.0.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_2.0.xsd
index a93b9ea08e..a93b9ea08e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_persistence_map_2.0.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_persistence_map_2.0.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_1.0.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_1.0.xsd
index 9831af0a26..9831af0a26 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_1.0.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_1.0.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_1.1.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_1.1.xsd
index d872a1640e..d872a1640e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_1.1.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_1.1.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_1.2.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_1.2.xsd
index b58242768c..b58242768c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_1.2.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_1.2.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_2.0.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_2.0.xsd
index c84821e948..c84821e948 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_2.0.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_2.0.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_2.1.xsd b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_2.1.xsd
index 61697113d8..61697113d8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/schemas/eclipselink_sessions_2.1.xsd
+++ b/common/plugins/org.eclipse.jpt.common.eclipselink.core/schemas/eclipselink_sessions_2.1.xsd
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/.settings/org.eclipse.core.resources.prefs b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 81f3caabd8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Mar 02 16:26:09 EST 2011
-eclipse.preferences.version=1
-encoding//schemas/eclipselink_orm_1_0.xsd=UTF8
-encoding//schemas/eclipselink_orm_1_1.xsd=UTF8
-encoding//schemas/eclipselink_orm_1_2.xsd=UTF8
-encoding//schemas/eclipselink_orm_2_0.xsd=UTF8
-encoding//schemas/eclipselink_orm_2_1.xsd=UTF8
-encoding//schemas/eclipselink_sessions_2.1.xsd=UTF8
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties
index 65d56a27d9..ee4c0e5e61 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/build.properties
@@ -14,9 +14,7 @@ bin.includes = .,\
                META-INF/,\
                about.html,\
                plugin.xml,\
-               plugin.properties,\
-               schemas/
+               plugin.properties
 jars.compile.order = .
 src.includes = model/
-src.includes = model/,\
-               schemas/
+src.includes = model/