You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/12/09 15:49:59 UTC
svn commit: r1212453 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main:
resources/org/apache/archiva/redback-security.properties
webapp/WEB-INF/applicationContext.xml
Author: olamy
Date: Fri Dec 9 14:49:58 2011
New Revision: 1212453
URL: http://svn.apache.org/viewvc?rev=1212453&view=rev
Log:
fix url path in emails
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties (with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties?rev=1212453&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties Fri Dec 9 14:49:58 2011
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# --------------------------------------------------------------------
+# Email Settings
+
+# The subject line for the email message.
+email.validation.subject=Welcome to Archiva
+
+# Feedback page
+email.feedback.path=http://archiva.apache.org/mail-lists.html
+
+email.url.path=index.html
\ No newline at end of file
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml?rev=1212453&r1=1212452&r2=1212453&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml Fri Dec 9 14:49:58 2011
@@ -186,7 +186,7 @@
<xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
<properties fileName="${appserver.home}/conf/security.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>
- <properties fileName="org/apache/archiva/security.properties" config-at="org.codehaus.plexus.redback"/>
+ <properties fileName="org/apache/archiva/redback-security.properties" config-at="org.codehaus.plexus.redback"/>
</configuration>
]]>
</value>