cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1304308 - in /cocoon/cocoon3/trunk: cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/ cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/ cocoon-sample/rcl-config/WEB-INF/
Date Fri, 23 Mar 2012 12:19:11 GMT
Author: ilgrosso
Date: Fri Mar 23 12:19:11 2012
New Revision: 1304308

URL: http://svn.apache.org/viewvc?rev=1304308&view=rev
Log:
Adding possibilty to specify spring configurator properties (includling logback logging) to
blocks

Added:
    cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/applicationContext.xml
  (with props)
    cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/applicationContext.xml   (with props)
Modified:
    cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap

Added: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/applicationContext.xml?rev=1304308&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/applicationContext.xml
(added)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/applicationContext.xml
Fri Mar 23 12:19:11 2012
@@ -0,0 +1,42 @@
+<?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.
+-->
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+                           http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+
+    <!-- Activate Cocoon Spring Configurator -->
+    <configurator:settings>
+        <configurator:property name="org.apache.cocoon.reloading.sitemap" value="true"/>
+        <configurator:property name="org.apache.cocoon.containerencoding" value="UTF-8"/>
+        <configurator:property name="org.apache.cocoon.exception.ProcessingException.unroll"
value="true"/>
+    </configurator:settings>
+
+    <!-- Configure Logback -->
+    <bean name="org.apache.cocoon.spring.configurator.logback"
+          class="org.apache.cocoon.spring.configurator.logback.LogbackConfigurator"
+          scope="singleton">
+        <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
+        <property name="resource" value="/WEB-INF/classes/logback.xml"/>
+    </bean>
+
+</beans>

Propchange: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/rcl-config/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap?rev=1304308&r1=1304307&r2=1304308&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/COB-INF/sitemap.xmap
Fri Mar 23 12:19:11 2012
@@ -17,14 +17,21 @@
 -->
 <!-- $Id$ -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap" xmlns:servlet="http://apache.org/cocoon/servlet"

-  xmlns:controller="http://apache.org/cocoon/controller"> 
-
+	     xmlns:controller="http://apache.org/cocoon/controller"> 
+  
   <map:pipelines>
     <map:pipeline>
       <map:match pattern="">
         <map:read src="welcome.html" />
       </map:match>
     </map:pipeline>    
+    
+    <!-- Global error handling -->
+    <map:handle-errors>
+      <map:generate type="exception" />
+      <map:serialize type="xml" status-code="500" />
+    </map:handle-errors>
+    
   </map:pipelines>
   
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>

Added: cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/applicationContext.xml?rev=1304308&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/applicationContext.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/applicationContext.xml Fri Mar 23
12:19:11 2012
@@ -0,0 +1,42 @@
+<?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.
+-->
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+                           http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+
+    <!-- Activate Cocoon Spring Configurator -->
+    <configurator:settings>
+        <configurator:property name="org.apache.cocoon.reloading.sitemap" value="true"/>
+        <configurator:property name="org.apache.cocoon.containerencoding" value="UTF-8"/>
+        <configurator:property name="org.apache.cocoon.exception.ProcessingException.unroll"
value="true"/>
+    </configurator:settings>
+
+    <!-- Configure Logback -->
+    <bean name="org.apache.cocoon.spring.configurator.logback"
+          class="org.apache.cocoon.spring.configurator.logback.LogbackConfigurator"
+          scope="singleton">
+        <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
+        <property name="resource" value="/WEB-INF/classes/logback.xml"/>
+    </bean>
+
+</beans>

Propchange: cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/cocoon3/trunk/cocoon-sample/rcl-config/WEB-INF/applicationContext.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message