From: Olivier Lamy <olamy@apache.org>
Date: Thu, 2 Feb 2012 21:10:38 +0000 (+0000)
Subject: add a snippet to file for configuration file places
X-Git-Tag: archiva-1.4-M3~1387
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f13660cfc10c5494577117d024e162101749822e;p=archiva.git

add a snippet to file for configuration file places

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

diff --git a/archiva-docs/src/site/apt/adminguide/customising-security.apt b/archiva-docs/src/site/apt/adminguide/customising-security.apt
index 1ee0987c6..1b9a6d715 100644
--- a/archiva-docs/src/site/apt/adminguide/customising-security.apt
+++ b/archiva-docs/src/site/apt/adminguide/customising-security.apt
@@ -20,7 +20,10 @@
 ~~ "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.                                                              
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
 
 Archiva Security Configuration
 
@@ -65,7 +68,13 @@ security.policy.password.rule.reuse.enabled=true
 security.policy.password.rule.nowhitespace.enabled=true
 +-----+
  
- <<Note:>> If installed standalone, Archiva's list of configuration files is <itself> configurable, and
- can be found in:
- <<<apps/archiva/WEB-INF/applicationContext.xml>>>
+  <<Note:>> If installed standalone, Archiva's list of configuration files is <itself> configurable, and
+  can be found in:
+  <<<apps/archiva/WEB-INF/applicationContext.xml>>>
+
+  Values from sources
+
+  %{snippet|id=configuration-files-list|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml}
+
+
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index b1136327e..7dc1918c3 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -73,6 +73,7 @@
     <property name="session" ref="mailSession"/>
   </bean>
 
+  <!-- START SNIPPET: configuration-files-list -->
   <bean name="commons-configuration" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>
@@ -111,7 +112,8 @@
       </value>
     </property>    
   </bean>
-  
+  <!-- END SNIPPET: configuration-files-list -->
+
   <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DataSourceConfigurableJdoFactory">
     <property name="connectionFactoryName" value="java:comp/env/jdbc/users"/>
     <property name="shutdownConnectionFactoryName" value="java:comp/env/jdbc/usersShutdown"/>