[MRM-918] Switch for disabling user registration.

implements backend part.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384695 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index 8692e7c500ee78cfd38016e256eaa0d5432545a4..bcc007dd0cfb3ae72a2cf92145dd6a7294471ab1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -1324,6 +1324,12 @@
           <version>1.4.0+</version>
           <type>String</type>
         </field>
+        <field>
+          <name>disableRegistration</name>
+          <version>1.4.0+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+        </field>
       </fields>
     </class>
 

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/UiConfiguration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/UiConfiguration.java
index a2c00e49fdc8c854bd03bb0fd5b3c405e73c71e2..aa3d13fda359c78649b45185cc02e2bc893a7db7 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/UiConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/UiConfiguration.java
@@ -47,6 +47,11 @@ public class UiConfiguration
      */
     private String applicationUrl;
 
+    /**
+     * @since 1.4-M3
+     */
+    private boolean disableRegistration = false;
+
     public UiConfiguration()
     {
         // noop
@@ -92,6 +97,16 @@ public class UiConfiguration
         this.applicationUrl = applicationUrl;
     }
 
+    public boolean isDisableRegistration()
+    {
+        return disableRegistration;
+    }
+
+    public void setDisableRegistration( boolean disableRegistration )
+    {
+        this.disableRegistration = disableRegistration;
+    }
+
     @Override
     public String toString()
     {
@@ -101,6 +116,7 @@ public class UiConfiguration
         sb.append( ", appletFindEnabled=" ).append( appletFindEnabled );
         sb.append( ", disableEasterEggs=" ).append( disableEasterEggs );
         sb.append( ", applicationUrl='" ).append( applicationUrl ).append( '\'' );
+        sb.append( ", disableRegistration=" ).append( disableRegistration );
         sb.append( '}' );
         return sb.toString();
     }

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
index f971c792e7a6f5aeaf1d59683051f49cbc32dd24..5abd7a6fa42a220fc5bbcfdbff4cd6fc7912c2e5 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
@@ -226,11 +226,13 @@ public class ArchivaAdministrationTest
         assertFalse( oldUi.isDisableEasterEggs() );
         assertTrue( oldUi.isAppletFindEnabled() );
         assertTrue( oldUi.isShowFindArtifacts() );
+        assertFalse( oldUi.isDisableRegistration() );
 
         UiConfiguration ui = archivaAdministration.getUiConfiguration();
         ui.setAppletFindEnabled( false );
         ui.setShowFindArtifacts( false );
         ui.setDisableEasterEggs( true );
+        ui.setDisableRegistration( true );
 
         archivaAdministration.updateUiConfiguration( ui );
 
@@ -239,7 +241,8 @@ public class ArchivaAdministrationTest
         assertTrue( ui.isDisableEasterEggs() );
         assertFalse( ui.isAppletFindEnabled() );
         assertFalse( ui.isShowFindArtifacts() );
-        
+        assertTrue( ui.isDisableRegistration() );
+
         archivaAdministration.updateUiConfiguration( oldUi );
     }
 

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
index ddf1fac03d33af03a3eb7d1dcda2748f7ccd77f1..9c9e18653291fa6151c727c1aefec14602ad9cd5 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
@@ -117,6 +117,7 @@ public class ArchivaAdministrationServiceTest
         assertNotNull( ui );
         // assert default values
         assertFalse( ui.isDisableEasterEggs() );
+        assertFalse( ui.isDisableRegistration() );
         assertTrue( ui.isAppletFindEnabled() );
         assertTrue( ui.isShowFindArtifacts() );
         assertNull( ui.getApplicationUrl() );
@@ -124,6 +125,7 @@ public class ArchivaAdministrationServiceTest
         ui.setAppletFindEnabled( false );
         ui.setShowFindArtifacts( false );
         ui.setDisableEasterEggs( true );
+        ui.setDisableRegistration( true );
         String url = "http://foo.fr/bar";
         ui.setApplicationUrl( url );
 
@@ -132,6 +134,7 @@ public class ArchivaAdministrationServiceTest
         ui = getArchivaAdministrationService().getUiConfiguration();
 
         assertTrue( ui.isDisableEasterEggs() );
+        assertTrue( ui.isDisableRegistration() );
         assertFalse( ui.isAppletFindEnabled() );
         assertFalse( ui.isShowFindArtifacts() );
         assertEquals( url, ui.getApplicationUrl() );

diff --git a/pom.xml b/pom.xml
index bfb2f3758cbf8a1f8ffcf96c8be590b81e7e3df3..0e5e5c2faf404b16278d6b35d19e82d7a23bd709 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1828,6 +1828,7 @@
               <exclude>.idea/**</exclude>
               <exclude>.repository/**</exclude>
               <exclude>*.patch</exclude>
+              <exclude>**/target/**</exclude>
             </excludes>
           </configuration>
         </plugin>