GEOS-8897: promoting sldService community module to extension

geoserver · Aug 21, 2018 · 741d3b1 · 741d3b1
1 parent 8e76aa4
commit 741d3b1
Show file tree

Hide file tree

Showing 37 changed files with 19 additions and 18 deletions.
diff --git a/doc/en/user/source/community/index.rst b/doc/en/user/source/community/index.rst
@@ -30,7 +30,6 @@ officially part of the GeoServer releases. They are however built along with the
    wps-download/index
    jms-cluster/index
    solr/index
-   sldservice/index
    rest-upload/index
    geomesa/index
    gwc-distributed/index

diff --git a/doc/en/user/source/extensions/index.rst b/doc/en/user/source/extensions/index.rst
@@ -29,3 +29,4 @@ This section describes most of the extensions available for GeoServer. Other dat
    xslt/index
    wcs20eo/index
    mongodb/index
+   sldservice/index
diff --git a/...ser/source/community/sldservice/index.rst → ...er/source/extensions/sldservice/index.rst b/...ser/source/community/sldservice/index.rst → ...er/source/extensions/sldservice/index.rst
@@ -1,4 +1,4 @@
-.. _community_sldservice:
+.. _extensions_sldservice:
 
 SLD REST Service
 ================

diff --git a/src/community/pom.xml b/src/community/pom.xml
@@ -57,7 +57,6 @@
           <descriptor>release/ext-activeMQ.xml</descriptor>	
           <descriptor>release/ext-solr.xml</descriptor>		  
           <descriptor>release/ext-geofence.xml</descriptor>
-          <descriptor>release/ext-sldservice.xml</descriptor>
           <!-- <descriptor>release/ext-rest-upload.xml</descriptor> -->
           <descriptor>release/ext-gwc-distributed.xml</descriptor>  
           <descriptor>release/ext-geofence-server.xml</descriptor>
@@ -140,12 +139,6 @@
         <module>rest</module>
       </modules>
     </profile>
-    <profile>
-      <id>sldService</id>
-      <modules> 
-        <module>sldService</module>
-      </modules>
-    </profile>
     <profile>
       <id>dds</id>
       <modules>
@@ -225,7 +218,6 @@
         <!-- <module>rest-upload</module> -->
         <module>geofence</module>
         <module>geofence-server</module>
-        <module>sldService</module>
         <module>params-extractor</module>
         <module>wps-remote</module>
         <module>wps-jdbc</module>

diff --git a/src/community/release/pom.xml b/src/community/release/pom.xml
@@ -128,11 +128,6 @@
      <artifactId>gs-geofence-server</artifactId>
      <version>${project.version}</version>
    </dependency>   
-   <dependency>
-     <groupId>org.geoserver.community</groupId>
-     <artifactId>gs-sldservice</artifactId>
-     <version>${project.version}</version>
-   </dependency>
    <dependency>
      <groupId>org.geoserver.community</groupId>
      <artifactId>gs-web-solr</artifactId>

diff --git a/src/extension/pom.xml b/src/extension/pom.xml
@@ -331,6 +331,12 @@
         <module>mongodb</module>
       </modules>
     </profile>
+    <profile>
+      <id>sldService</id>
+      <modules> 
+        <module>sldService</module>
+      </modules>
+    </profile>
 
     <!-- allExtensions profile, includes all modules -->
     <profile>
@@ -372,6 +378,7 @@
         <module>vectortiles</module>
         <module>ysld</module>
         <module>mongodb</module>
+        <module>sldService</module>
       </modules>
     </profile>
 
@@ -415,6 +422,7 @@
         <module>vectortiles</module>
         <module>ysld</module>
         <module>mongodb</module>
+        <module>sldService</module>
       </modules>
     </profile>
   </profiles>

diff --git a/src/community/sldService/pom.xml → src/extension/sldService/pom.xml b/src/community/sldService/pom.xml → src/extension/sldService/pom.xml
@@ -10,11 +10,11 @@
 
  <parent>
    <groupId>org.geoserver</groupId>
-   <artifactId>community</artifactId>
+   <artifactId>extension</artifactId>
    <version>2.14-SNAPSHOT</version>
  </parent>
 
- <groupId>org.geoserver.community</groupId>
+ <groupId>org.geoserver.extension</groupId>
  <artifactId>gs-sldservice</artifactId>
  <name>REST SLD service</name>
 

diff --git a/...vice/src/main/java/applicationContext.xml → ...vice/src/main/java/applicationContext.xml b/...vice/src/main/java/applicationContext.xml → ...vice/src/main/java/applicationContext.xml
diff --git a/...ervice/rest/BaseSLDServiceController.java → ...ervice/rest/BaseSLDServiceController.java b/...ervice/rest/BaseSLDServiceController.java → ...ervice/rest/BaseSLDServiceController.java
diff --git a/...sldservice/rest/ClassifierController.java → ...sldservice/rest/ClassifierController.java b/...sldservice/rest/ClassifierController.java → ...sldservice/rest/ClassifierController.java
diff --git a/...ervice/rest/ListAttributesController.java → ...ervice/rest/ListAttributesController.java b/...ervice/rest/ListAttributesController.java → ...ervice/rest/ListAttributesController.java
diff --git a/...sldservice/rest/RasterizerController.java → ...sldservice/rest/RasterizerController.java b/...sldservice/rest/RasterizerController.java → ...sldservice/rest/RasterizerController.java
diff --git a/...tl-templates/ListAttributesController.ftl → ...tl-templates/ListAttributesController.ftl b/...tl-templates/ListAttributesController.ftl → ...tl-templates/ListAttributesController.ftl
diff --git a/.../sldservice/rest/ftl-templates/Object.ftl → .../sldservice/rest/ftl-templates/Object.ftl b/.../sldservice/rest/ftl-templates/Object.ftl → .../sldservice/rest/ftl-templates/Object.ftl
diff --git a/...dservice/rest/ftl-templates/RulesList.ftl → ...dservice/rest/ftl-templates/RulesList.ftl b/...dservice/rest/ftl-templates/RulesList.ftl → ...dservice/rest/ftl-templates/RulesList.ftl
diff --git a/...er/sldservice/rest/ftl-templates/head.ftl → ...er/sldservice/rest/ftl-templates/head.ftl b/...er/sldservice/rest/ftl-templates/head.ftl → ...er/sldservice/rest/ftl-templates/head.ftl
diff --git a/...er/sldservice/rest/ftl-templates/tail.ftl → ...er/sldservice/rest/ftl-templates/tail.ftl b/...er/sldservice/rest/ftl-templates/tail.ftl → ...er/sldservice/rest/ftl-templates/tail.ftl
diff --git a/...ldservice/utils/classifier/ColorRamp.java → ...ldservice/utils/classifier/ColorRamp.java b/...ldservice/utils/classifier/ColorRamp.java → ...ldservice/utils/classifier/ColorRamp.java
diff --git a/...ervice/utils/classifier/RulesBuilder.java → ...ervice/utils/classifier/RulesBuilder.java b/...ervice/utils/classifier/RulesBuilder.java → ...ervice/utils/classifier/RulesBuilder.java
diff --git a/.../utils/classifier/impl/BlueColorRamp.java → .../utils/classifier/impl/BlueColorRamp.java b/.../utils/classifier/impl/BlueColorRamp.java → .../utils/classifier/impl/BlueColorRamp.java
diff --git a/...tils/classifier/impl/CustomColorRamp.java → ...tils/classifier/impl/CustomColorRamp.java b/...tils/classifier/impl/CustomColorRamp.java → ...tils/classifier/impl/CustomColorRamp.java
diff --git a/.../utils/classifier/impl/GrayColorRamp.java → .../utils/classifier/impl/GrayColorRamp.java b/.../utils/classifier/impl/GrayColorRamp.java → .../utils/classifier/impl/GrayColorRamp.java
diff --git a/...e/utils/classifier/impl/JetColorRamp.java → ...e/utils/classifier/impl/JetColorRamp.java b/...e/utils/classifier/impl/JetColorRamp.java → ...e/utils/classifier/impl/JetColorRamp.java
diff --git a/...tils/classifier/impl/RandomColorRamp.java → ...tils/classifier/impl/RandomColorRamp.java b/...tils/classifier/impl/RandomColorRamp.java → ...tils/classifier/impl/RandomColorRamp.java
diff --git a/...e/utils/classifier/impl/RedColorRamp.java → ...e/utils/classifier/impl/RedColorRamp.java b/...e/utils/classifier/impl/RedColorRamp.java → ...e/utils/classifier/impl/RedColorRamp.java
diff --git a/...ldservice/rest/ClassifierTestSupport.java → ...ldservice/rest/ClassifierTestSupport.java b/...ldservice/rest/ClassifierTestSupport.java → ...ldservice/rest/ClassifierTestSupport.java
diff --git a/...server/sldservice/rest/ColorRampTest.java → ...server/sldservice/rest/ColorRampTest.java b/...server/sldservice/rest/ColorRampTest.java → ...server/sldservice/rest/ColorRampTest.java
diff --git a/.../sldservice/rest/LayerAttributesTest.java → .../sldservice/rest/LayerAttributesTest.java b/.../sldservice/rest/LayerAttributesTest.java → .../sldservice/rest/LayerAttributesTest.java
diff --git a/...erver/sldservice/rest/RasterizerTest.java → ...erver/sldservice/rest/RasterizerTest.java b/...erver/sldservice/rest/RasterizerTest.java → ...erver/sldservice/rest/RasterizerTest.java
diff --git a/...ver/sldservice/rest/RulesBuilderTest.java → ...ver/sldservice/rest/RulesBuilderTest.java b/...ver/sldservice/rest/RulesBuilderTest.java → ...ver/sldservice/rest/RulesBuilderTest.java
diff --git a/...r/sldservice/rest/SLDServiceBaseTest.java → ...r/sldservice/rest/SLDServiceBaseTest.java b/...r/sldservice/rest/SLDServiceBaseTest.java → ...r/sldservice/rest/SLDServiceBaseTest.java
diff --git a/...st/java/sldservice-applicationContext.xml → ...st/java/sldservice-applicationContext.xml b/...st/java/sldservice-applicationContext.xml → ...st/java/sldservice-applicationContext.xml
diff --git a/...vice/rest/ClassificationPoints.properties → ...vice/rest/ClassificationPoints.properties b/...vice/rest/ClassificationPoints.properties → ...vice/rest/ClassificationPoints.properties
diff --git a/src/pom.xml b/src/pom.xml
@@ -1533,6 +1533,7 @@
       <descriptor>release/ext-netcdf-out.xml</descriptor>
       <descriptor>release/ext-vectortiles.xml</descriptor>
       <descriptor>release/ext-ysld.xml</descriptor>
+      <descriptor>release/ext-sldservice.xml</descriptor>
      </descriptors>
      <finalName>geoserver-2.14-SNAPSHOT</finalName>
      <outputDirectory>${project.build.directory}/release</outputDirectory>

diff --git a/src/community/release/ext-sldservice.xml → src/release/ext-sldservice.xml b/src/community/release/ext-sldservice.xml → src/release/ext-sldservice.xml
diff --git a/src/release/pom.xml b/src/release/pom.xml
@@ -348,6 +348,11 @@
      <artifactId>gs-mongodb</artifactId>
      <version>${project.version}</version>
    </dependency>
+   <dependency>
+     <groupId>org.geoserver.extension</groupId>
+     <artifactId>gs-sldservice</artifactId>
+     <version>${project.version}</version>
+   </dependency>
  </dependencies>
  <build>
   <plugins>

diff --git a/src/web/app/pom.xml b/src/web/app/pom.xml
@@ -1195,7 +1195,7 @@
       <id>sldService</id>
       <dependencies>
         <dependency>
-          <groupId>org.geoserver.community</groupId>
+          <groupId>org.geoserver.extension</groupId>
           <artifactId>gs-sldservice</artifactId>
           <version>${project.version}</version>
         </dependency>