- Physically move geofence and geofence-server plugins to extensions

fix test cases

doc/en/user/source/community/index.rst

@@ -33,8 +33,6 @@ officially part of the GeoServer releases. They are however built along with the
    rest-upload/index
    geomesa/index
    gwc-distributed/index
-   geofence/index
-   geofence-server/index
    gdal/index
    gwc-s3/index
    gwc-sqlite/index

doc/en/user/source/extensions/index.rst

@@ -30,3 +30,6 @@ This section describes most of the extensions available for GeoServer. Other dat
    wcs20eo/index
    mongodb/index
    sldservice/index
+   geofence/index
+   geofence-server/index
+

src/community/pom.xml

@@ -54,12 +54,10 @@
           <descriptor>release/ext-wps-download.xml</descriptor>
           <descriptor>release/ext-jms-cluster.xml</descriptor>
           <descriptor>release/ext-hz-cluster.xml</descriptor>
-          <descriptor>release/ext-activeMQ.xml</descriptor>	
-          <descriptor>release/ext-solr.xml</descriptor>		  
-          <descriptor>release/ext-geofence.xml</descriptor>
+          <descriptor>release/ext-activeMQ.xml</descriptor>
+          <descriptor>release/ext-solr.xml</descriptor>
           <!-- <descriptor>release/ext-rest-upload.xml</descriptor> -->
-          <descriptor>release/ext-gwc-distributed.xml</descriptor>  
-          <descriptor>release/ext-geofence-server.xml</descriptor>
+          <descriptor>release/ext-gwc-distributed.xml</descriptor>
           <descriptor>release/ext-gwc-s3.xml</descriptor>
           <descriptor>release/ext-gdal-wcs.xml</descriptor>
           <descriptor>release/ext-gdal-wps.xml</descriptor>
@@ -223,8 +221,6 @@
         <module>hz-cluster</module>
         <module>solr</module>
         <!-- <module>rest-upload</module> -->
-        <module>geofence</module>
-        <module>geofence-server</module>
         <module>params-extractor</module>
         <module>wps-remote</module>
         <module>wps-jdbc</module>
@@ -389,25 +385,6 @@
         <module>jms-cluster</module>
       </modules>
     </profile>
-    <profile>
-      <id>geofence</id>
-        <activation>
-          <property><name>geofence</name></property>
-        </activation>
-        <modules>
-          <module>geofence</module>
-        </modules>
-    </profile>
-    <profile>
-      <id>geofence-server</id>
-        <activation>
-          <property><name>geofence</name></property>
-        </activation>
-        <modules>
-          <module>geofence</module>
-	  <module>geofence-server</module>
-        </modules>
-    </profile>
     <profile>
       <id>hz-cluster</id>
         <modules>

src/community/release/pom.xml

@@ -119,17 +119,7 @@
       <groupId>org.geoserver.community</groupId>
       <artifactId>gs-hz-cluster</artifactId>
       <version>${project.version}</version>
-   </dependency>  
-   <!-- <dependency>
-     <groupId>org.geoserver.community</groupId>
-     <artifactId>gs-geofence</artifactId>
-     <version>${project.version}</version>
-   </dependency> -->
-   <dependency>
-     <groupId>org.geoserver.community</groupId>
-     <artifactId>gs-geofence-server</artifactId>
-     <version>${project.version}</version>
-   </dependency>   
+   </dependency>
    <dependency>
      <groupId>org.geoserver.community</groupId>
      <artifactId>gs-web-solr</artifactId>

src/community/geofence-server/pom.xml → src/extension/geofence-server/pom.xml

@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-    <!-- set parent pom to community pom -->
+    <!-- set parent pom to extension pom -->
     <parent>
         <groupId>org.geoserver</groupId>
-        <artifactId>community</artifactId>
+        <artifactId>extension</artifactId>
         <version>2.15-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.geoserver.community</groupId>
+    <groupId>org.geoserver.extension</groupId>
     <artifactId>gs-geofence-server</artifactId>
     <packaging>jar</packaging>
     <version>2.15-SNAPSHOT</version>
@@ -113,7 +113,7 @@
         </dependency>
 
         <dependency>
-          <groupId>org.geoserver.community</groupId>
+          <groupId>org.geoserver.extension</groupId>
           <artifactId>gs-geofence</artifactId>
           <version>${project.version}</version>
           <exclusions>
@@ -175,7 +175,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.geoserver.community</groupId>
+            <groupId>org.geoserver.extension</groupId>
             <artifactId>gs-geofence</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>

src/community/geofence-server/src/test/java/org/geoserver/geofence/internal/InternalUserResolverTest.java → src/extension/geofence-server/src/test/java/org/geoserver/geofence/internal/InternalUserResolverTest.java

@@ -10,6 +10,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
 import org.geoserver.data.test.SystemTestData;
 import org.geoserver.security.AbstractSecurityServiceTest;
 import org.geoserver.security.GeoServerRoleService;
@@ -96,6 +97,24 @@ public void setDefaultUserService() throws Exception {
         System.setProperty(InternalUserResolver.DEFAULT_USER_GROUP_SERVICE_KEY, "test");
     }
 
+    @Override
+    protected void onTearDown(SystemTestData testData) throws Exception {
+        /** Dispose Services */
+        this.service = null;
+        this.testData = new SystemTestData();
+
+        try {
+            if (System.getProperty("IS_GEOFENCE_AVAILABLE") != null) {
+                System.clearProperty("IS_GEOFENCE_AVAILABLE");
+            }
+        } catch (Exception e) {
+            LOGGER.log(
+                    Level.WARNING,
+                    "Could not remove System ENV variable {IS_GEOFENCE_AVAILABLE}",
+                    e);
+        }
+    }
+
     protected void addTestUser(
             String username,
             List<String> roles,

src/community/geofence-server/src/test/java/org/geoserver/geofence/web/GeofenceRulesModelTest.java → src/extension/geofence-server/src/test/java/org/geoserver/geofence/web/GeofenceRulesModelTest.java

@@ -9,6 +9,8 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
+import java.util.logging.Level;
+import org.geoserver.data.test.SystemTestData;
 import org.geoserver.geofence.services.dto.ShortRule;
 import org.geoserver.web.GeoServerWicketTestSupport;
 import org.junit.Test;
@@ -20,6 +22,23 @@
  */
 public class GeofenceRulesModelTest extends GeoServerWicketTestSupport {
 
+    @Override
+    protected void onTearDown(SystemTestData testData) throws Exception {
+        /** Dispose Services */
+        this.testData = new SystemTestData();
+
+        try {
+            if (System.getProperty("IS_GEOFENCE_AVAILABLE") != null) {
+                System.clearProperty("IS_GEOFENCE_AVAILABLE");
+            }
+        } catch (Exception e) {
+            LOGGER.log(
+                    Level.WARNING,
+                    "Could not remove System ENV variable {IS_GEOFENCE_AVAILABLE}",
+                    e);
+        }
+    }
+
     @Test
     public void testRulesModel() {
         GeofenceRulesModel model = new GeofenceRulesModel();

src/community/geofence-server/src/test/java/org/geoserver/geofence/web/GeofenceServerAdminPageTest.java → src/extension/geofence-server/src/test/java/org/geoserver/geofence/web/GeofenceServerAdminPageTest.java

@@ -6,6 +6,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.logging.Level;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.util.tester.FormTester;
 import org.geoserver.data.test.SystemTestData;
@@ -31,6 +32,23 @@ public void before() {
         tester.startPage(GeofenceServerAdminPage.class);
     }
 
+    @Override
+    protected void onTearDown(SystemTestData testData) throws Exception {
+        /** Dispose Services */
+        this.testData = new SystemTestData();
+
+        try {
+            if (System.getProperty("IS_GEOFENCE_AVAILABLE") != null) {
+                System.clearProperty("IS_GEOFENCE_AVAILABLE");
+            }
+        } catch (Exception e) {
+            LOGGER.log(
+                    Level.WARNING,
+                    "Could not remove System ENV variable {IS_GEOFENCE_AVAILABLE}",
+                    e);
+        }
+    }
+
     @Test
     public void testAddNewRuleLink() {
         tester.assertRenderedPage(GeofenceServerAdminPage.class);

src/community/geofence-server/src/test/java/org/geoserver/geofence/web/GeofenceServerPageTest.java → src/extension/geofence-server/src/test/java/org/geoserver/geofence/web/GeofenceServerPageTest.java

@@ -6,6 +6,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.logging.Level;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.util.tester.FormTester;
 import org.geoserver.data.test.SystemTestData;
@@ -31,6 +32,23 @@ public void before() {
         tester.startPage(GeofenceServerPage.class);
     }
 
+    @Override
+    protected void onTearDown(SystemTestData testData) throws Exception {
+        /** Dispose Services */
+        this.testData = new SystemTestData();
+
+        try {
+            if (System.getProperty("IS_GEOFENCE_AVAILABLE") != null) {
+                System.clearProperty("IS_GEOFENCE_AVAILABLE");
+            }
+        } catch (Exception e) {
+            LOGGER.log(
+                    Level.WARNING,
+                    "Could not remove System ENV variable {IS_GEOFENCE_AVAILABLE}",
+                    e);
+        }
+    }
+
     @Test
     public void testAddNewRuleLink() {
         tester.assertRenderedPage(GeofenceServerPage.class);

src/community/geofence/pom.xml → src/extension/geofence/pom.xml

@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-    <!-- set parent pom to community pom -->
+    <!-- set parent pom to extension pom -->
     <parent>
         <groupId>org.geoserver</groupId>
-        <artifactId>community</artifactId>
+        <artifactId>extension</artifactId>
         <version>2.15-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.geoserver.community</groupId>
+    <groupId>org.geoserver.extension</groupId>
     <artifactId>gs-geofence</artifactId>
     <packaging>jar</packaging>
     <version>2.15-SNAPSHOT</version>

src/community/geofence/src/test/java/org/geoserver/geofence/GeofenceBaseTest.java → src/extension/geofence/src/test/java/org/geoserver/geofence/GeofenceBaseTest.java

@@ -107,7 +107,11 @@ public void after() {
 
     @Override
     protected void onTearDown(SystemTestData testData) throws Exception {
-        super.onTearDown(testData);
+        /** Dispose Services */
+        this.accessManager = null;
+        this.configManager = null;
+        this.geofenceService = null;
+        this.testData = new SystemTestData();
 
         try {
             if (System.getProperty("IS_GEOFENCE_AVAILABLE") != null) {