Shorten properties file name so table name inside Oracle 30 character…

… limit [GEOS-7062, GEOT-5469]
geoserver · Aug 3, 2016 · cb07d63 · cb07d63
1 parent cbcaee1
commit cb07d63
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...tension/app-schema/app-schema-test/src/test/java/org/geoserver/test/FeatureGML32Test.java b/...tension/app-schema/app-schema-test/src/test/java/org/geoserver/test/FeatureGML32Test.java
@@ -117,7 +117,7 @@ public void testStoredQuery() throws Exception {
      * Test encoding of a multivalued mapping with an xlink:href ClientProperty.
      */
     @Test
-    public void testMultivaluedXlinkHrefClientProperty() {
+    public void testMultivaluedXlinkHref() {
         Document doc = getAsDOM(
                 "wfs?service=WFS&version=2.0.0&request=GetFeature&typenames=gsml:GeologicUnit");
         LOGGER.info("WFS GetFeature, typename=gsml:GeologicUnit response:\n" + prettyString(doc));

diff --git a/...aluedXlinkHrefClientPropertyMockData.java → ...er/test/MultivaluedXlinkHrefMockData.java b/...aluedXlinkHrefClientPropertyMockData.java → ...er/test/MultivaluedXlinkHrefMockData.java
@@ -10,16 +10,16 @@
  * 
  * @author Ben Caradoc-Davies (Transient Software Limited)
  */
-public class MultivaluedXlinkHrefClientPropertyMockData extends AbstractAppSchemaMockData {
+public class MultivaluedXlinkHrefMockData extends AbstractAppSchemaMockData {
 
-    public MultivaluedXlinkHrefClientPropertyMockData() {
+    public MultivaluedXlinkHrefMockData() {
         super(GML32_NAMESPACES);
     }
 
     @Override
     public void addContent() {
-        addFeatureType(GSML_PREFIX, "GeologicUnit", "MultivaluedXlinkHrefClientProperty.xml",
+        addFeatureType(GSML_PREFIX, "GeologicUnit", "MultivaluedXlinkHref.xml",
-                "MultivaluedXlinkHrefClientProperty.properties");
+                "MultivaluedXlinkHref.properties");
     }
 
 }
diff --git a/...ltivaluedXlinkHrefClientPropertyTest.java → ...server/test/MultivaluedXlinkHrefTest.java b/...ltivaluedXlinkHrefClientPropertyTest.java → ...server/test/MultivaluedXlinkHrefTest.java
@@ -13,11 +13,11 @@
  * 
  * @author Ben Caradoc-Davies (Transient Software Limited)
  */
-public class MultivaluedXlinkHrefClientPropertyTest extends AbstractAppSchemaTestSupport {
+public class MultivaluedXlinkHrefTest extends AbstractAppSchemaTestSupport {
 
     @Override
-    protected MultivaluedXlinkHrefClientPropertyMockData createTestData() {
+    protected MultivaluedXlinkHrefMockData createTestData() {
-        return new MultivaluedXlinkHrefClientPropertyMockData();
+        return new MultivaluedXlinkHrefMockData();
     }
 
     /**

diff --git a/...ivaluedXlinkHrefClientProperty.properties → ...test-data/MultivaluedXlinkHref.properties b/...ivaluedXlinkHrefClientProperty.properties → ...test-data/MultivaluedXlinkHref.properties
diff --git a/...ta/MultivaluedXlinkHrefClientProperty.xml → ...ources/test-data/MultivaluedXlinkHref.xml b/...ta/MultivaluedXlinkHrefClientProperty.xml → ...ources/test-data/MultivaluedXlinkHref.xml
@@ -31,7 +31,7 @@
     <typeMappings>
         <FeatureTypeMapping>
             <sourceDataStore>datastore</sourceDataStore>
-            <sourceType>MultivaluedXlinkHrefClientProperty</sourceType>
+            <sourceType>MultivaluedXlinkHref</sourceType>
             <targetElement>gsml:GeologicUnit</targetElement>
             <attributeMappings>
                 <AttributeMapping>