You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2012/05/29 12:47:20 UTC
svn commit: r1343659 - in
/cocoon/subprojects/cocoon-spring-configurator/trunk: ./ src/site/
src/site/resources/ src/site/resources/images/ src/site/xdoc/
Author: ilgrosso
Date: Tue May 29 10:47:19 2012
New Revision: 1343659
URL: http://svn.apache.org/viewvc?rev=1343659&view=rev
Log:
Adding site generation to own subproject
Added:
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/resources/
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/resources/images/
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/resources/images/external.png (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1303_1_1.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1308_1_1.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1309_1_1.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1310_1_1.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1312_1_1.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1400_1_1.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1474_1_1.xml (with props)
cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/index.xml (with props)
Modified:
cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml
Modified: cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml?rev=1343659&r1=1343658&r2=1343659&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/pom.xml Tue May 29 10:47:19 2012
@@ -53,47 +53,14 @@
<properties>
<docs.name>Cocoon Spring Configurator</docs.name>
- <docs.version>${docs.m.spring-configurator.version}</docs.version>
+ <docs.version>2.1</docs.version>
<docs.urlRelativizer>../../../../../</docs.urlRelativizer>
</properties>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <versionRange>[1.0-alpha-2,)</versionRange>
- <goals>
- <goal>enforce-once</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-configuration-api</artifactId>
- <version>1.0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -145,4 +112,104 @@
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- This plugin's configuration is used to store Eclipse m2e settings only.
+ It has no influence on the Maven build itself. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.0-alpha-2,)</versionRange>
+ <goals>
+ <goal>enforce-once</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <locales>en</locales>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>license</report>
+ <report>summary</report>
+ <report>project-team</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.7.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/resources/images/external.png
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/resources/images/external.png?rev=1343659&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/resources/images/external.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!-- $Id$ -->
+<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
+ name="Cocoon">
+
+ <skin>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-thien-maven-site-skin</artifactId>
+ <version>1.0.1</version>
+ </skin>
+
+ <body>
+ <menu name="Cocoon Spring Configurator">
+ <item name="Introduction to the Spring Configurator" href="./index.html"/>
+ <item name="Installation" href="./1308_1_1.html"/>
+ <item name="Migration" href="./1474_1_1.html"/>
+ <item name="Basic Configuration" href="./1303_1_1.html"/>
+ <item name="Running Modes" href="./1309_1_1.html"/>
+ <item name="Property Handling" href="./1310_1_1.html"/>
+ <item name="Bean Configuration" href="./1312_1_1.html"/>
+ <item name="Dynamic Registry Support" href="./1400_1_1.html"/>
+ <item name="Log4j Support" href="./1311_1_1.html"/>
+ </menu>
+
+ <menu ref="reports" inherit="bottom"/>
+ </body>
+</project>
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1303_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1303_1_1.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1303_1_1.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1303_1_1.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Basic Configuration</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Basic Configuration</h1><section name="Configuration" style="background:none;padding:0;"/><p>The Spring Configurator uses Spring's
+<a href="http://static.springframework.org/spring/docs/2.0.x/reference/new-in-2.html#new-in-2-ioc-custom-configuration">extensible
+XML authoring features</a> and therefore it can be directly used in your Spring
+bean configurations. Usually you add the configurator to your global web
+application context configuration (which is usually located at
+<em>/WEB-INF/applicationContext.xml</em>). The extensible XML authoring requires
+that you use the schema based configuration for Spring. Just add the required
+namespace definition, a reference to the configurator XML schema to your bean
+configuration:</p><pre><beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ <strong>xmlns:configurator="http://cocoon.apache.org/schema/configurator"</strong>
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ <strong>http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd"</strong>>
+ ...
+</beans>
+</pre><p>Then you can initialize the configurator by adding the <tt>settings</tt>
+element to your bean configuration:</p><pre> <!-- Activate Cocoon Spring Configurator -->
+ <configurator:settings/>
+</pre><p>This innocent looking statement initializes the Cocoon Spring Configurator
+and provides support for the following features without any additional
+configuration:</p><ul>
+<li><a href="1309_1_1.html">Running Modes</a></li>
+<li><a href="1310_1_1.html">Properties</a></li>
+<li><a href="1312_1_1.html">Bean Configurations</a></li>
+</ul></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1303_1_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1303_1_1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1303_1_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1308_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1308_1_1.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1308_1_1.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1308_1_1.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Installation</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Installation</h1><section name="Requirements" style="background:none;padding:0;"/><p>The Spring Configurator requires</p><ul>
+<li>the Spring Framework Version 2.5.x (or above)</li>
+<li>JDK 1.5 (or above)</li>
+<li>Servlet API 2.3 (or above)</li>
+</ul>The Spring Configuration requires two additional jar files, the Cocoon
+Configuration API and the Cocoon Spring Configurator, which you can either
+download
+<a href="http://repo1.maven.org/maven2/org/apache/cocoon/cocoon-configuration-api/">here</a>
+and
+<a href="http://repo1.maven.org/maven2/org/apache/cocoon/cocoon-spring-configurator/">here</a>
+or from a public Maven repository by adding the Spring Configurator as a
+dependency to your project:Please refer to the Spring documentation for setting up Spring's web
+application context.</div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1308_1_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1308_1_1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1308_1_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1309_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1309_1_1.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1309_1_1.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1309_1_1.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Running Modes</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Running Modes</h1><section name="Running Modes" style="background:none;padding:0;"/><p>The configurator provides the support of <em>running modes</em>. A running
+mode defines the environment the application is currently running in. For
+example this can be during development, a test setup or production. As you will
+see in just some paragraphs, the configurator can use different configurations
+and settings depending on the running mode.</p><p>A running mode is just a unique text key, like <tt>dev</tt>, <tt>test</tt>
+or <tt>prod</tt>. This key is used to determine the correct configuration at
+runtime. Although you can use any text key, it is advisable to use one of the
+standard keys (dev, test or prod).</p><p>The running mode can be set in two ways: you can either set it in your
+<tt>applicationContext.xml</tt> as a configuration for the <tt>settings
+</tt>element:</p><pre> <!-- Activate Cocoon Spring Configurator -->
+ <configurator:settings runningMode="test"/>
+</pre><p>Or you can define the running mode by setting the system property
+<tt>org.apache.cocoon.mode</tt> on startup of your web application, usually you
+do this by specifying <tt>-Dorg.apache.cocoon.mode=test</tt> when starting your
+application server. The system property has precedence over the value from the
+application context. The default running mode is <tt>prod</tt>.</p></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1309_1_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1309_1_1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1309_1_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1310_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1310_1_1.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1310_1_1.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1310_1_1.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Property Handling</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Property Handling</h1><p>For using properties in your configuration files, Spring provides the
+<a href="http://static.springframework.org/spring/docs/2.0.x/reference/beans.html#beans-factory-placeholderconfigurer">property
+placeholder configurer</a> which you have to configure in your application
+context. The Spring Configurator has already built-in support for replacing
+property values in configuration files, so there is no additional work required
+anymore. In addition the Configurator reads properties from various standard
+locations.</p><p>In general, the Configurator works with directories containing property files
+and supports two areas where these directories can be located: somewhere in the
+classpath or in some directory in your web application. While the first area is
+very convenient for distributing properties within libraries, the second area is
+very easy to edit by administrators or developers.</p><p>Let's start with the full list of actions taken by the Spring Configurator to
+read in properties. During this process, various property files are read. If
+there is more than one definiton for a property, the last definition wins!</p><ol type="1">
+<li>The classpath is scanned for property files inside jar files located at
+<tt>/META-INF/cocoon/properties/*.properties.</tt> Usually these property files
+are default values for beans distributed with the jar the property files are
+contained in. All these property files are read in alphabetical order.</li>
+<li>All property files located at
+<tt>/WEB-INF/classes/META-INF/cocoon/properties/*.properties</tt> are read in
+alphabetical order.</li>
+<li>The classpath is scanned for property files inside jar files located at
+<tt>/META-INF/cocoon/properties/[RUNNING_MODE]/*.properties.</tt> Usually these
+property files are default values in the given running mode for beans
+distributed with the jar the property files are contained in. All these property
+files are read in alphabetical order.</li>
+<li>All property files located at
+<tt>/WEB-INF/classes/META-INF/cocoon/properties/[RUNNING_MODE]/*.properties</tt>
+are read in alphabetical order.</li>
+<li>All property files from <tt>/WEB-INF/cocoon/properties/*.properties</tt>
+are read in alphabetical order.</li>
+<li>All property files from
+<tt>/WEB-INF/cocoon/properties/[RUNNING_MODE]/*.properties</tt> are read in
+alphabetical order.</li>
+<li>If the home directory of the current user contains a
+<tt>.cocoon/settings.properties</tt> file, this is read next.</li>
+<li>If the system property <tt>org.apache.cocoon.settings</tt> is specified and
+points to a property file, this is read. If the system property points to a
+directory all property files from this directory are read in alphabetical order
+and all property files from the sub directory named [RUNNING_MODE] are read in
+alphabetical order.</li>
+<li>If the servlet context init parameter <tt>org.apache.cocoon.settings</tt>
+is specified and points to a property file, this is read. If the system property
+points to a directory all property files from this directory are read in
+alphabetical order and all property files from the sub directory named
+[RUNNING_MODE] are read in alphabetical order.</li>
+<li>If a property provider (see below) is configured in the application context,
+it is queried for a set of properties.</li>
+<li>Read additional configured properties from the settings configuration in the
+application context.</li>
+<li>Apply additional configured properties from the settings configuration in
+the application context.</li>
+<li>Apply system properties.</li>
+</ol>Although this list might look very scary, it is in fact a very simple but
+powerful approach:<ul>
+<li>If you want to use properties within your configurations, make sure to
+supply a default value through a property file which is stored in the jar
+containing your components.</li>
+<li>If you want to provide default values for different running modes, add these
+configurations to your jar as well.</li>
+<li>If you want to override default configurations, put them either in your own
+jar file and make sure that the name of your property file comes after the
+default configuration file in alphabetical order, or put your property file in
+/<tt>WEB-INF/classes/META-INF/cocoon/properties.</tt></li>
+<li>If you want to override a default configuration depending on a running mode,
+add a property file at the same location as before but put it in a sub directory
+with the name of the running mode.</li>
+<li>To override properties globally, e.g. through an administrator, put the
+properties at <tt>/WEB-INF/cocoon/properties</tt> or
+<tt>/WEB-INF/cocoon/[RUNNING_MODE]/properties</tt>.</li>
+<li>If you want to change a configuration value during development you can just
+set it as a system property. (You can also add a property file with the values
+or define your own running mode of course.)</li>
+<li>If you have special requirements for property handling, you can add a
+property provider bean which is a Spring managed bean conforming to the
+<tt>org.apache.cocoon.configuration.PropertyProvider</tt> interface. For
+example, if you want to store your configurations inside a database or configure
+them through a jndi context, you can provide these values through a custom
+implementation.</li>
+</ul></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1310_1_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1310_1_1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1310_1_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Log4j Support</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Log4j Support</h1><p>You can use the Configurator to
+configure <a href="http://logging.apache.org/log4j/">Log4j</a> through an XML
+configuration file:</p><pre> <bean name="org.apache.cocoon.spring.configurator.log4j"
+ class="org.apache.cocoon.spring.configurator.log4j.Log4JConfigurator"
+ scope="singleton">
+ <property name="resource" value="/WEB-INF/cocoon/log4j.xconf"/>
+ </bean>
+</pre><p>The property <tt>resource</tt> should point to a valid Log4j XML
+configuration file. You can use all properties configured through the
+Configurator in the XML configuration and reference the actual values.</p></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1312_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1312_1_1.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1312_1_1.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1312_1_1.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Bean Configurations</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Bean Configurations</h1><p>The Spring Configurator supports an automatic inclusion mechanism for bean
+definitions. By default all configuration files ending with *.xml are read from
+these locations in alphabetical order:</p><ul>
+<li>All configuration files contained in jar files located at
+<tt>/META-INF/cocoon/spring</tt></li>
+<li>All configuration files from
+<tt>/WEB-INF/classes/META-INF/cocoon/spring</tt></li>
+<li>All configuration files contained in jar files located at
+<tt>/META-INF/cocoon/spring/[RUNNING_MODE]</tt></li>
+<li>All configuration files from
+<tt>/WEB-INF/classes/META-INF/cocoon/spring/[RUNNING_MODE]</tt></li>
+</ul>If you want to deploy basic configurations together with your components, you
+can just put the configuration file inside the jar and the beans are available
+in the application context.<section name="Property Overriding" style="background:none;padding:0;"/>To customize bean configurations according to your environment, the Cocoon
+Spring Configurator provides built-in support for Spring's
+<a href="http://static.springframework.org/spring/docs/2.0.x/reference/beans.html#beans-factory-overrideconfigurer">property
+override configuration mechanism</a>. By default, property files are read in
+alphabetical order from the following locations:<ul>
+<li>All files ending with *.properties contained in jar files located at
+<tt>/META-INF/cocoon/spring</tt></li>
+<li>All files ending with *.properties from
+<tt>/WEB-INF/classes/META-INF/cocoon/spring</tt></li>
+<li>All files ending with *.properties contained in jar files located at
+<tt>/META-INF/cocoon/spring/[RUNNING_MODE]</tt></li>
+<li>All files ending with *.properties from
+<tt>/WEB-INF/classes/META-INF/cocoon/spring/[RUNNING_MODE]</tt></li>
+<li>All files ending with *.properties from <tt>/WEB-INF/cocoon/spring</tt>
+</li>
+<li>All files ending with *.properties from
+<tt>/WEB-INF/cocoon/spring/[RUNNING_MODE]</tt></li>
+</ul>The properties defined in these property files are only used for overriding
+bean configurations! These values are not available through the settings object.
+As we suggest to use namespace based identifiers for beans, the Cocoon Spring
+Configurator uses the character <tt>/</tt> for separating the bean name from the
+property name:<pre>my.special.beanName/property=somevalue
+</pre></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1312_1_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1312_1_1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1312_1_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1400_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1400_1_1.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1400_1_1.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1400_1_1.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Dynamic Registry Support</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Dynamic Registry Support</h1><section name="Dynamic Registries" style="background:none;padding:0;"/><p>If you want to develop a managing bean which acts like a registry, you face
+the problem of how to configure this bean. Usually this bean makes use of some
+kind of a map which stores the registered beans under some key. If you want to
+configure this in Spring you have to know which registered beans are available
+at this point of time. Apart from the amount of configuration you have to type,
+this approach is not dynamic. Adding new registered beans requires to change the
+configuration of the managing bean. Especially with the spring-configurator,
+beans can be added dynamically just by dropping a jar into the class-path. The
+approach of this configuration style will simply not work in these cases.</p><section name="The Bean Map" style="background:none;padding:0;"/><p>The spring-configurator provides a dynamic bean map just for this purpose. It
+can either be used as a standalone bean or as a property of another bean. If you
+want to use it as a standalone bean, you have to specify either the name or the
+id attribute (like you do with the usual Spring bean definition as well):</p><pre><configurator:bean-map id/name="optional" type="the.class.of.the.registered.beans" check-parent="true" strip-prefix="true">
+
+</configurator:bean-map>
+</pre><p>This will create a map which contains all registered beans which
+support/implement the given type.</p><p>The key to store the registered beans in the map is the bean name, or if
+"check-parent" is set to true and the bean name starts with the type followed by
+either a "." or a "/" then the postfix is used as the key.</p><p>TBC</p></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1400_1_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1400_1_1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1400_1_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1474_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1474_1_1.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1474_1_1.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1474_1_1.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Migration</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Migration</h1><h1>Migration from 1.0 to 2.0</h1><p>Version 1.0 of the Spring-Configurator incudes functionality to unpack Cocoon
+Blocks at runtime and make them usable with the block-context: protocol. Since
+this feature is Cocoon specific, it was moved into a newly created
+<a href="../../../../../subprojects/block-deployment/1.1/1471_1_1.html">Cocoon Block-Deployment</a> module. This module has to be
+added to your application if you want to retain the same functionality.</p></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1474_1_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1474_1_1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1474_1_1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/index.xml?rev=1343659&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/index.xml (added)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/index.xml Tue May 29 10:47:19 2012
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ 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.
+ --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Spring Configurator - Introduction to the Spring Configurator</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Introduction to the Spring Configurator</h1><p>The Spring Configurator is a useful component providing support in common
+configuration issues when using the Spring framework.</p><p>Although the code was developed as part of Cocoon, it is aimed at making it
+easier to use Spring in any web application. It has no dependencies on Cocoon
+and can be used standalone. The impact on your code is nearly zero and the
+Spring Configurator has only Spring itself as a dependency.</p><section name="Motivation" style="background:none;padding:0;"/><p>When using a framework like Spring there are always the same problems to
+solve, like</p><ul>
+<li>Where do I store my bean configurations?</li>
+<li>How can I parameterize them dynamically?</li>
+<li>Where do I store this extra information?</li>
+<li>How can I handle different environments for testing or development or
+production?</li>
+<li>How can I distribute code configuration information?</li>
+<li>How can I distribute partial web applications?</li>
+<li>How do I manage hierarchial web application contexts?</li>
+</ul>Of course Spring is flexible enough to handle these problems, but you have to
+implement your own solution. The danger here is that every project ends up
+developing its own "proprietary" solution.A standardized way of doing these things would be great. Guess what!, the
+Spring Configurator is the answer to your problems. Just like Maven has
+standardized the build process, the Spring Configurator standardizes the way of
+dealing with various configuration issues with Spring.</div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml