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 2012/02/02 22:10:38 UTC
svn commit: r1239848 - in /archiva/trunk:
archiva-docs/src/site/apt/adminguide/customising-security.apt
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Author: olamy
Date: Thu Feb 2 21:10:38 2012
New Revision: 1239848
URL: http://svn.apache.org/viewvc?rev=1239848&view=rev
Log:
add a snippet to file for configuration file places
Modified:
archiva/trunk/archiva-docs/src/site/apt/adminguide/customising-security.apt
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/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=1239848&r1=1239847&r2=1239848&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 Thu Feb 2 21:10:38 2012
@@ -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.enab
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}
+
+
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1239848&r1=1239847&r2=1239848&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml Thu Feb 2 21:10:38 2012
@@ -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"/>