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 13:57:50 UTC

svn commit: r1343688 - in /cocoon/subprojects/cocoon-spring-configurator/trunk/src: changes/changes.xml site/site.xml site/xdoc/logback_configurator.xml

Author: ilgrosso
Date: Tue May 29 11:57:50 2012
New Revision: 1343688

URL: http://svn.apache.org/viewvc?rev=1343688&view=rev
Log:
Updating site generation with latest addition (LogbackConfigurator)

Added:
    cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/logback_configurator.xml
      - copied, changed from r1343673, cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml
Modified:
    cocoon/subprojects/cocoon-spring-configurator/trunk/src/changes/changes.xml
    cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml

Modified: cocoon/subprojects/cocoon-spring-configurator/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/changes/changes.xml?rev=1343688&r1=1343687&r2=1343688&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/changes/changes.xml (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/changes/changes.xml Tue May 29 11:57:50 2012
@@ -24,7 +24,10 @@
   -->
 <document>
   <body>
-    <release version="2.2.0-SNAPSHOT" date="2009-00-00" description="unreleased">
+    <release version="2.2.1-SNAPSHOT" date="2012-00-00" description="unreleased">
+      <action dev="ilgrosso" type="fix" issue="COCOON3-69">
+        Add LogbackConfigurator enabling Logback support alongside with Log4j
+      </action>   
     </release>
     <release version="2.1.0" date="2009-06-16" description="released">
       <action dev="reinhard" type="add">

Modified: 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=1343688&r1=1343687&r2=1343688&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/site.xml Tue May 29 11:57:50 2012
@@ -39,6 +39,7 @@
       <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"/>
+      <item name="Logback Support" href="./logback_configurator.html"/>
     </menu>
 
     <menu ref="reports" inherit="bottom"/>

Copied: cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/logback_configurator.xml (from r1343673, 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/logback_configurator.xml?p2=cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/logback_configurator.xml&p1=cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml&r1=1343673&r2=1343688&rev=1343688&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/1311_1_1.xml (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/site/xdoc/logback_configurator.xml Tue May 29 11:57:50 2012
@@ -15,15 +15,31 @@
       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>  &lt;bean name="org.apache.cocoon.spring.configurator.log4j"
-        class="org.apache.cocoon.spring.configurator.log4j.Log4JConfigurator"
+    -->
+<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 - Logback Support</title>
+    <author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author>
+  </properties>
+  <body>
+    <div id="contentBody">
+      <div id="bodyText">
+        <h1 class="docTitle">Logback Support</h1>
+        <p>You can use the Configurator to configure
+          <a href="http://logback.qos.ch/">Logback</a> through an XML configuration file:
+        </p>
+<pre>  &lt;bean name="org.apache.cocoon.spring.configurator.logback"
+        class="org.apache.cocoon.spring.configurator.logback.LogbackConfigurator"
         scope="singleton"&gt;
-    &lt;property name="resource" value="/WEB-INF/cocoon/log4j.xconf"/&gt;
+    &lt;property name="resource" value="/WEB-INF/cocoon/logback.xml"/&gt;
   &lt;/bean&gt;
-</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
+</pre>
+        <p>The property 
+          <tt>resource</tt> should point to a valid Logback 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