[MRM-351] revisiting, added another configuration option for turning off the applet...

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

diff --git a/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
index 5e168af446b10fd6b52d826e071ad80d498a3976..50380ca1067ba95fe1645fca82c2336df8770e24 100644 (file)
--- a/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
+++ b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -714,7 +714,14 @@
           <description>true if find artifacts should be enabled</description>\r
           <version>1.0.0+</version>       \r
           <type>boolean</type>  \r
-          <defaultValue>false</defaultValue>\r
+          <defaultValue>true</defaultValue>\r
+        </field>\r
+        <field>\r
+          <name>appletFindEnabled</name>\r
+          <description>true if applet behavior for find artifacts should be enabled</description>\r
+          <version>1.0.0+</version>       \r
+          <type>boolean</type>  \r
+          <defaultValue>true</defaultValue>\r
         </field>\r
       </fields>\r
     </class>\r

diff --git a/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml b/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
index b2ddcddea333a1c6b63a09724dadf071f76a17a5..3d21ac66eb4e73fb1f442cb236ff116496681f02 100644 (file)
--- a/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
+++ b/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
@@ -169,7 +169,8 @@
 
   <webapp>
     <ui>
-      <showFindArtifacts>false</showFindArtifacts>
+      <showFindArtifacts>true</showFindArtifacts>
+      <appletFindEnabled>true</appletFindEnabled>
     </ui>
   </webapp>
 

diff --git a/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml b/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
index a0ffdf7c6912e150b98dac863a1059bf22771f10..5cb654aec2d96834c24f48fbbc0c713018659f30 100644 (file)
--- a/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
+++ b/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
@@ -181,7 +181,8 @@
 
   <webapp>
     <ui>
-      <showFindArtifacts>false</showFindArtifacts>
+      <showFindArtifacts>true</showFindArtifacts>
+      <appletFindEnabled>true</appletFindEnabled>
     </ui>
   </webapp>
 

diff --git a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
index 87852e9d82880c36ea37679285eb723cbf5dc1dc..96816674584370ea391bfc69689c86d0272c4342 100644 (file)
--- a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
@@ -87,7 +87,8 @@ public class ArchivaConfigurationTest extends PlexusTestCase
         
         UserInterfaceOptions ui = (UserInterfaceOptions) webapp.getUi();
         assertNotNull( "check webapp ui", ui  );
-        assertFalse( "check showFindArtifacts", ui.isShowFindArtifacts() );
+        assertTrue( "check showFindArtifacts", ui.isShowFindArtifacts() );
+        assertTrue( "check appletFindEnabled", ui.isAppletFindEnabled() );
     }
 
     public void testGetConfigurationSystemOverride() throws Exception

diff --git a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
index 081407ff9faca55d07198769d696eef966f7b69c..70f956100c4af8f39cdb00e1724ef0eef8ab09b7 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
+++ b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
@@ -56,16 +56,19 @@
 
     <ww:form method="POST" action="checksumSearch" namespace="/"
              onsubmit="this.md5.value = generateMd5(this.file.value,this.md5.value); this.file.disabled = true">
+      <ww:if test="${sessionScope.uiOptions.appletFindEnabled}">     
       <tr>
         <td class="tdLabel"><label for="checksumSearch_file" class="label">Search for:</label></td>
         <td>
           <input type="file" name="file" size="50" value="" id="checksumSearch_file"/>
         </td>
       </tr>
+      </ww:if>
       <ww:textfield label="Checksum" size="50" name="md5"/>
       <ww:submit value="Go!"/>
     </ww:form>
 
+    <ww:if test="${sessionScope.uiOptions.appletFindEnabled}">
     <p>
       Select the file you would like to locate in the remote repository.
       The entire file will
@@ -81,7 +84,7 @@
               width="400" height="20" name="ChecksumApplet">
       </applet>
     </p>
-
+    </ww:if>
   </div>
 </div>