From 0a2c72f57cae90cf611f99a5049d59c2a39121e4 Mon Sep 17 00:00:00 2001
From: Dave Hladky <david_j_hladky@raytheon.com>
Date: Wed, 4 Sep 2013 11:57:26 -0500
Subject: [PATCH] Issue #2323 Update xmlschema packages to correct naming
 convention

Former-commit-id: 074f08c4cbaee05e10f28700be05afc5b5bbbfa3 [formerly 074f08c4cbaee05e10f28700be05afc5b5bbbfa3 [formerly 884684895e7f7f671e5efe4ea62222bfa3192900]]
Former-commit-id: ccff3e3a54109056abe8df098a1faebfbe671096
Former-commit-id: 6a71524ce4135ffe2027ba20a537a717fe094b9b
---
 .../.classpath                                      |   0
 .../{org.w3.XMLSchema => org.w3.xmlschema}/.project |   2 +-
 .../.settings/org.eclipse.jdt.core.prefs            |   0
 .../META-INF/MANIFEST.MF                            |   4 ++--
 .../build.properties                                |   1 +
 .../org.w3.XMLSchema.jar                            | Bin
 edexOsgi/build.edex/esb/conf/modes.xml              |   1 +
 .../feature.xml                                     |   2 +-
 .../com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF   |   2 +-
 9 files changed, 7 insertions(+), 5 deletions(-)
 rename cots/{org.w3.XMLSchema => org.w3.xmlschema}/.classpath (100%)
 rename cots/{org.w3.XMLSchema => org.w3.xmlschema}/.project (95%)
 rename cots/{org.w3.XMLSchema => org.w3.xmlschema}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename cots/{org.w3.XMLSchema => org.w3.xmlschema}/META-INF/MANIFEST.MF (70%)
 rename cots/{org.w3.XMLSchema => org.w3.xmlschema}/build.properties (66%)
 rename cots/{org.w3.XMLSchema => org.w3.xmlschema}/org.w3.XMLSchema.jar (100%)

diff --git a/cots/org.w3.XMLSchema/.classpath b/cots/org.w3.xmlschema/.classpath
similarity index 100%
rename from cots/org.w3.XMLSchema/.classpath
rename to cots/org.w3.xmlschema/.classpath
diff --git a/cots/org.w3.XMLSchema/.project b/cots/org.w3.xmlschema/.project
similarity index 95%
rename from cots/org.w3.XMLSchema/.project
rename to cots/org.w3.xmlschema/.project
index 7b7e2e2679..a622ed094c 100644
--- a/cots/org.w3.XMLSchema/.project
+++ b/cots/org.w3.xmlschema/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.w3.XMLSchema</name>
+	<name>org.w3.xmlschema</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/cots/org.w3.XMLSchema/.settings/org.eclipse.jdt.core.prefs b/cots/org.w3.xmlschema/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cots/org.w3.XMLSchema/.settings/org.eclipse.jdt.core.prefs
rename to cots/org.w3.xmlschema/.settings/org.eclipse.jdt.core.prefs
diff --git a/cots/org.w3.XMLSchema/META-INF/MANIFEST.MF b/cots/org.w3.xmlschema/META-INF/MANIFEST.MF
similarity index 70%
rename from cots/org.w3.XMLSchema/META-INF/MANIFEST.MF
rename to cots/org.w3.xmlschema/META-INF/MANIFEST.MF
index e8ad70a202..e281e21120 100644
--- a/cots/org.w3.XMLSchema/META-INF/MANIFEST.MF
+++ b/cots/org.w3.xmlschema/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XMLSchema
-Bundle-SymbolicName: org.w3.XMLSchema
+Bundle-SymbolicName: org.w3.xmlschema
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath: org.w3.XMLSchema.jar
 Export-Package: org.w3.xmlschema
+
diff --git a/cots/org.w3.XMLSchema/build.properties b/cots/org.w3.xmlschema/build.properties
similarity index 66%
rename from cots/org.w3.XMLSchema/build.properties
rename to cots/org.w3.xmlschema/build.properties
index 05a87bde68..789eb1e3ed 100644
--- a/cots/org.w3.XMLSchema/build.properties
+++ b/cots/org.w3.xmlschema/build.properties
@@ -1,3 +1,4 @@
 bin.includes = META-INF/,\
                .,\
                org.w3.XMLSchema.jar
+jars.compile.order = org.w3.XMLSchema.jar
diff --git a/cots/org.w3.XMLSchema/org.w3.XMLSchema.jar b/cots/org.w3.xmlschema/org.w3.XMLSchema.jar
similarity index 100%
rename from cots/org.w3.XMLSchema/org.w3.XMLSchema.jar
rename to cots/org.w3.xmlschema/org.w3.XMLSchema.jar
diff --git a/edexOsgi/build.edex/esb/conf/modes.xml b/edexOsgi/build.edex/esb/conf/modes.xml
index ac23d2cb29..e2bc7a3134 100644
--- a/edexOsgi/build.edex/esb/conf/modes.xml
+++ b/edexOsgi/build.edex/esb/conf/modes.xml
@@ -248,6 +248,7 @@
         <!-- exclude OGC services -->
         <exclude>.*ogc.*</exclude>
         <exclude>grid-metadata.xml</exclude>
+        <exclude>wxsrv-dataset-urn.xml</exclude>
     </mode>
 
 	<!-- modes listed below are not supported in a production setting, they 
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml
index c7b28ec825..0440cbd2b9 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.core.feature/feature.xml
@@ -81,7 +81,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.w3.XMLSchema"
+         id="org.w3.xmlschema"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF
index 0a92b39f84..c449a18d2e 100644
--- a/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.wfs/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.geotools;bundle-version="2.6.4",
  javax.measure;bundle-version="1.0.0",
  com.sun.xml.bind;bundle-version="1.0.0",
  com.raytheon.uf.common.spatial;bundle-version="1.0.0",
- org.w3.XMLSchema;bundle-version="1.0.0",
+ org.w3.xmlschema;bundle-version="1.0.0",
  com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
  com.raytheon.uf.edex.plugin.dataset.urn;bundle-version="1.0.0",
  org.apache.commons.collections;bundle-version="3.2.0",