Author: olamy
Date: Tue Oct 9 08:19:05 2012
New Revision: 1395905
URL: http://svn.apache.org/viewvc?rev=1395905&view=rev
Log:
fix snippet
Modified:
archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
Modified:
archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt?rev=1395905&r1=1395904&r2=1395905&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt
(original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt
Tue Oct 9 08:19:05 2012
@@ -74,7 +74,7 @@ security.policy.password.rule.nowhitespa
Values from sources
-%{snippet|id=configuration-files-list|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml}
+%{snippet|id=configuration-files-list|ignoreDownloadError=true|url=http://svn.apache.org/repos/asf/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml}
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=1395905&r1=1395904&r2=1395905&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
Tue Oct 9 08:19:05 2012
@@ -54,6 +54,7 @@
<property name="session" ref="mailSession"/>
</bean>
+ <!-- START SNIPPET: configuration-files-list -->
<bean name="commons-configuration"
class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
<property name="properties">
<value>
@@ -92,7 +93,8 @@
</value>
</property>
</bean>
-
+ <!-- END SNIPPET: configuration-files-list -->
+
<bean name="jdoFactory#users"
class="org.apache.archiva.redback.components.jdo.DataSourceConfigurableJdoFactory">
<property name="connectionFactoryName" value="java:comp/env/jdbc/users"/>
<property name="shutdownConnectionFactoryName"
value="java:comp/env/jdbc/usersShutdown"/>