fix security defaults

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

diff --git a/archiva-webapp/src/jetty-env.xml b/archiva-webapp/src/jetty-env.xml
index bc5d864d24b1fdce139be550c7ff22e99c72f42c..7e260ebfe71bb628e3d8dd22b0c81a9c7371f458 100644 (file)
--- a/archiva-webapp/src/jetty-env.xml
+++ b/archiva-webapp/src/jetty-env.xml
@@ -21,6 +21,22 @@
 <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
 <Configure class="org.mortbay.jetty.webapp.WebAppContext">
 
+<New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+  <Arg>mail/Session</Arg>
+  <Arg>
+    <New class="org.mortbay.naming.factories.MailSessionReference">
+      <Set name="user"></Set>
+      <Set name="password"></Set>
+      <Set name="properties">
+        <New class="java.util.Properties">
+          <Put name="mail.smtp.host">localhost</Put>
+          <Put name="mail.smtp.port">25</Put> <!-- TODO: shouldn't this default? -->
+        </New>
+      </Set>
+    </New>
+  </Arg>
+</New>
+
   <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
     <Arg>jdbc/users</Arg>
     <Arg>

diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index 57d03f2187ee82bdda0076ce8c4c389080715e1d..6be24dde943b5059392525fa8dcab6ee89295516 100644 (file)
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -48,6 +48,7 @@
           <xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
           <properties fileName="${appserver.home}/security.properties" config-optional="true"
                       config-at="org.codehaus.plexus.security"/>
+          <properties fileName="org/apache/maven/archiva/security.properties" config-at="org.codehaus.plexus.security"/>
         </properties>
       </configuration>
     </component>

diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties b/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
index 752d0551bf01b94a61e539bdc76cf691aa85d847..737a943500cc47d3a9b3f487166f797e2c9faddf 100644 (file)
--- a/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
+++ b/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
@@ -17,21 +17,9 @@
 # under the License.
 #
 
-# --------------------------------------------------------------------
-# Application Configuration
-
-application.name=Maven Archiva
-# NOTE: do not include trailing slash on application.url 
-application.url=http://localhost
-application.timestamp=EEE d MMM yyyy HH:mm:ss Z
-
 # --------------------------------------------------------------------
 # Email Settings
 
-# All emails sent by the system will be from the following user name (used in conjunction with address)
-email.from.address=archiva@localhost
-email.from.name=Archiva Administrator
-
 # The subject line for the email message.
 email.validation.subject=Welcome to Maven Archiva