From 2de1c21318fae73ad1a8be14851c2456b0bdc837 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 9 Dec 2011 09:40:06 +0000 Subject: [PATCH] common webapp resources in the common webapp module git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1212306 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/security.properties | 0 .../org/apache/archiva/security_en.properties | 0 .../org/apache/archiva/security.properties | 27 ------------------- .../org/apache/archiva/security_en.properties | 20 -------------- 4 files changed, 47 deletions(-) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp-common}/src/main/resources/org/apache/archiva/security.properties (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp-common}/src/main/resources/org/apache/archiva/security_en.properties (100%) delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/security.properties delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/security_en.properties diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/security.properties b/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/org/apache/archiva/security.properties similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/security.properties rename to archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/org/apache/archiva/security.properties diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/security_en.properties b/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/org/apache/archiva/security_en.properties similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/security_en.properties rename to archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/org/apache/archiva/security_en.properties diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/security.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/security.properties deleted file mode 100644 index 2074ef020..000000000 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/security.properties +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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 diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/security_en.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/security_en.properties deleted file mode 100644 index 661b0cba7..000000000 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/security_en.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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. -# - - -- 2.39.5