Migrating from ogc to ogcapi module

geoserver · Jun 19, 2019 · e30bdff · e30bdff
1 parent ffb7f4f
commit e30bdff
Show file tree

Hide file tree

Showing 45 changed files with 20 additions and 1 deletion.
diff --git a/src/community/api/pom.xml → src/community/ogcapi/pom.xml b/src/community/api/pom.xml → src/community/ogcapi/pom.xml
diff --git a/...geoserver/api/APIBodyMethodProcessor.java → ...geoserver/api/APIBodyMethodProcessor.java b/...geoserver/api/APIBodyMethodProcessor.java → ...geoserver/api/APIBodyMethodProcessor.java
diff --git a/...ver/api/APIContentNegotiationManager.java → ...ver/api/APIContentNegotiationManager.java b/...ver/api/APIContentNegotiationManager.java → ...ver/api/APIContentNegotiationManager.java
diff --git a/...java/org/geoserver/api/APIDispatcher.java → ...java/org/geoserver/api/APIDispatcher.java b/...java/org/geoserver/api/APIDispatcher.java → ...java/org/geoserver/api/APIDispatcher.java
diff --git a/.../java/org/geoserver/api/APIException.java → .../java/org/geoserver/api/APIException.java b/.../java/org/geoserver/api/APIException.java → .../java/org/geoserver/api/APIException.java
diff --git a/...in/java/org/geoserver/api/APIService.java → ...in/java/org/geoserver/api/APIService.java b/...in/java/org/geoserver/api/APIService.java → ...in/java/org/geoserver/api/APIService.java
diff --git a/...ver/api/AbstractHTMLMessageConverter.java → ...ver/api/AbstractHTMLMessageConverter.java b/...ver/api/AbstractHTMLMessageConverter.java → ...ver/api/AbstractHTMLMessageConverter.java
diff --git a/.../main/java/org/geoserver/api/BaseURL.java → .../main/java/org/geoserver/api/BaseURL.java b/.../main/java/org/geoserver/api/BaseURL.java → .../main/java/org/geoserver/api/BaseURL.java
diff --git a/...eoserver/api/BaseURLArgumentResolver.java → ...eoserver/api/BaseURLArgumentResolver.java b/...eoserver/api/BaseURLArgumentResolver.java → ...eoserver/api/BaseURLArgumentResolver.java
diff --git a/...server/api/FreemarkerTemplateSupport.java → ...server/api/FreemarkerTemplateSupport.java b/...server/api/FreemarkerTemplateSupport.java → ...server/api/FreemarkerTemplateSupport.java
diff --git a/...a/org/geoserver/api/HTMLResponseBody.java → ...a/org/geoserver/api/HTMLResponseBody.java b/...a/org/geoserver/api/HTMLResponseBody.java → ...a/org/geoserver/api/HTMLResponseBody.java
diff --git a/.../MappingJackson2YAMLMessageConverter.java → .../MappingJackson2YAMLMessageConverter.java b/.../MappingJackson2YAMLMessageConverter.java → .../MappingJackson2YAMLMessageConverter.java
diff --git a/.../geoserver/api/NegotiatedContentType.java → .../geoserver/api/NegotiatedContentType.java b/.../geoserver/api/NegotiatedContentType.java → .../geoserver/api/NegotiatedContentType.java
diff --git a/...egotiatedContentTypeArgumentResolver.java → ...egotiatedContentTypeArgumentResolver.java b/...egotiatedContentTypeArgumentResolver.java → ...egotiatedContentTypeArgumentResolver.java
diff --git a/...n/java/org/geoserver/api/RequestInfo.java → ...n/java/org/geoserver/api/RequestInfo.java b/...n/java/org/geoserver/api/RequestInfo.java → ...n/java/org/geoserver/api/RequestInfo.java
diff --git a/...erver/api/ReturnValueMethodParameter.java → ...erver/api/ReturnValueMethodParameter.java b/...erver/api/ReturnValueMethodParameter.java → ...erver/api/ReturnValueMethodParameter.java
diff --git a/...erver/api/SimpleHTTPMessageConverter.java → ...erver/api/SimpleHTTPMessageConverter.java b/...erver/api/SimpleHTTPMessageConverter.java → ...erver/api/SimpleHTTPMessageConverter.java
diff --git a/...server/api/features/AbstractDocument.java → ...server/api/features/AbstractDocument.java b/...server/api/features/AbstractDocument.java → ...server/api/features/AbstractDocument.java
diff --git a/...rver/api/features/CollectionDocument.java → ...rver/api/features/CollectionDocument.java b/...rver/api/features/CollectionDocument.java → ...rver/api/features/CollectionDocument.java
diff --git a/...ver/api/features/CollectionsDocument.java → ...ver/api/features/CollectionsDocument.java b/...ver/api/features/CollectionsDocument.java → ...ver/api/features/CollectionsDocument.java
diff --git a/...ver/api/features/ConformanceDocument.java → ...ver/api/features/ConformanceDocument.java b/...ver/api/features/ConformanceDocument.java → ...ver/api/features/ConformanceDocument.java
diff --git a/...eoserver/api/features/FeatureService.java → ...eoserver/api/features/FeatureService.java b/...eoserver/api/features/FeatureService.java → ...eoserver/api/features/FeatureService.java
diff --git a/...api/features/HttpHeaderLinksAppender.java → ...api/features/HttpHeaderLinksAppender.java b/...api/features/HttpHeaderLinksAppender.java → ...api/features/HttpHeaderLinksAppender.java
diff --git a/...ver/api/features/LandingPageDocument.java → ...ver/api/features/LandingPageDocument.java b/...ver/api/features/LandingPageDocument.java → ...ver/api/features/LandingPageDocument.java
diff --git a/...java/org/geoserver/api/features/Link.java → ...java/org/geoserver/api/features/Link.java b/...java/org/geoserver/api/features/Link.java → ...java/org/geoserver/api/features/Link.java
diff --git a/...ver/api/features/NCNameResourceCodec.java → ...ver/api/features/NCNameResourceCodec.java b/...ver/api/features/NCNameResourceCodec.java → ...ver/api/features/NCNameResourceCodec.java
diff --git a/...rg/geoserver/api/features/WFSExtents.java → ...rg/geoserver/api/features/WFSExtents.java b/...rg/geoserver/api/features/WFSExtents.java → ...rg/geoserver/api/features/WFSExtents.java
diff --git a/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml b/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml
diff --git a/...ources/org/geoserver/api/features/api.ftl → ...ources/org/geoserver/api/features/api.ftl b/...ources/org/geoserver/api/features/api.ftl → ...ources/org/geoserver/api/features/api.ftl
diff --git a/...org/geoserver/api/features/collection.ftl → ...org/geoserver/api/features/collection.ftl b/...org/geoserver/api/features/collection.ftl → ...org/geoserver/api/features/collection.ftl
diff --git a/...erver/api/features/collection_include.ftl → ...erver/api/features/collection_include.ftl b/...erver/api/features/collection_include.ftl → ...erver/api/features/collection_include.ftl
diff --git a/...rg/geoserver/api/features/collections.ftl → ...rg/geoserver/api/features/collections.ftl b/...rg/geoserver/api/features/collections.ftl → ...rg/geoserver/api/features/collections.ftl
diff --git a/.../geoserver/api/features/common-footer.ftl → .../geoserver/api/features/common-footer.ftl b/.../geoserver/api/features/common-footer.ftl → .../geoserver/api/features/common-footer.ftl
diff --git a/.../geoserver/api/features/common-header.ftl → .../geoserver/api/features/common-header.ftl b/.../geoserver/api/features/common-header.ftl → .../geoserver/api/features/common-header.ftl
diff --git a/...i/features/getfeature-complex-content.ftl → ...i/features/getfeature-complex-content.ftl b/...i/features/getfeature-complex-content.ftl → ...i/features/getfeature-complex-content.ftl
diff --git a/...erver/api/features/getfeature-content.ftl → ...erver/api/features/getfeature-content.ftl b/...erver/api/features/getfeature-content.ftl → ...erver/api/features/getfeature-content.ftl
diff --git a/...server/api/features/getfeature-footer.ftl → ...server/api/features/getfeature-footer.ftl b/...server/api/features/getfeature-footer.ftl → ...server/api/features/getfeature-footer.ftl
diff --git a/...server/api/features/getfeature-header.ftl → ...server/api/features/getfeature-header.ftl b/...server/api/features/getfeature-header.ftl → ...server/api/features/getfeature-header.ftl
diff --git a/...rg/geoserver/api/features/landingPage.ftl → ...rg/geoserver/api/features/landingPage.ftl b/...rg/geoserver/api/features/landingPage.ftl → ...rg/geoserver/api/features/landingPage.ftl
diff --git a/...eoserver/api/features/CollectionTest.java → ...eoserver/api/features/CollectionTest.java b/...eoserver/api/features/CollectionTest.java → ...eoserver/api/features/CollectionTest.java
diff --git a/...oserver/api/features/CollectionsTest.java → ...oserver/api/features/CollectionsTest.java b/...oserver/api/features/CollectionsTest.java → ...oserver/api/features/CollectionsTest.java
diff --git a/...ver/api/features/FeaturesTestSupport.java → ...ver/api/features/FeaturesTestSupport.java b/...ver/api/features/FeaturesTestSupport.java → ...ver/api/features/FeaturesTestSupport.java
diff --git a/...oserver/api/features/LandingPageTest.java → ...oserver/api/features/LandingPageTest.java b/...oserver/api/features/LandingPageTest.java → ...oserver/api/features/LandingPageTest.java
diff --git a/src/community/pom.xml b/src/community/pom.xml
@@ -101,6 +101,7 @@
           <descriptor>release/ext-s3-geotiff.xml</descriptor>
           <descriptor>release/ext-wmts-styles.xml</descriptor>
           <descriptor>release/ext-ogr-datastore.xml</descriptor>
+          <descriptor>release/ext-ogcapi.xml</descriptor>
         </descriptors>
       </configuration>
      </plugin>
@@ -271,6 +272,7 @@
         <module>qos</module>
         <module>mapml</module>
         <module>web-ogr</module>
+        <module>ogcapi</module>
       </modules>
     </profile>
     <profile>
@@ -626,5 +628,11 @@
         <module>web-ogr</module>
       </modules>
     </profile>
+    <profile>
+      <id>ogcapi</id>
+      <modules>
+        <module>ogcapi</module>
+      </modules>
+    </profile>
   </profiles>  
 </project>
diff --git a/src/web/app/pom.xml b/src/web/app/pom.xml
@@ -1680,5 +1680,16 @@
         </dependency>
       </dependencies>
     </profile>
- </profiles>
+    <profile>
+      <id>ogcapi</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.geoserver.community</groupId>
+          <artifactId>gs-ogcapi</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+  </profiles>
 </project>