Author: brett
Date: Tue Feb 13 22:38:34 2007
New Revision: 507414
URL: http://svn.apache.org/viewvc?view=rev&rev=507414
Log:
fix security defaults
Modified:
maven/archiva/trunk/archiva-webapp/src/jetty-env.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
Modified: maven/archiva/trunk/archiva-webapp/src/jetty-env.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/jetty-env.xml?view=diff&rev=507414&r1=507413&r2=507414
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/jetty-env.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/jetty-env.xml Tue Feb 13 22:38:34
2007
@@ -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>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=507414&r1=507413&r2=507414
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Tue Feb 13 22:38:34 2007
@@ -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>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties?view=diff&rev=507414&r1=507413&r2=507414
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
Tue Feb 13 22:38:34 2007
@@ -18,19 +18,7 @@
#
# --------------------------------------------------------------------
-# 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 PROTECTED]
-email.from.name=Archiva Administrator
# The subject line for the email message.
email.validation.subject=Welcome to Maven Archiva
