diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-12-09 14:49:58 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-12-09 14:49:58 +0000 |
| commit | 9df8caaadd8ad80fed996cce0d98fd6d5dc80712 (patch) | |
| tree | 1b36f5cca5539f25e4099d4bd4926a8f33b61ab7 /archiva-modules/archiva-web | |
| parent | 0a82d1fe67c2225a4634f972e3ca43352c246e52 (diff) | |
| download | archiva-9df8caaadd8ad80fed996cce0d98fd6d5dc80712.tar.gz archiva-9df8caaadd8ad80fed996cce0d98fd6d5dc80712.zip | |
fix url path in emails
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1212453 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
2 files changed, 30 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties new file mode 100644 index 000000000..bb883b18a --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties @@ -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 diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml index 3c04c0140..8437805a0 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml @@ -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> |