cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1450268 - in /cocoon/trunk/jail/cocoon3: ./ src/main/java/org/apache/cocoon/sample/classpath/ src/main/resources/COB-INF/ src/main/resources/META-INF/cocoon/spring/ src/main/webapp/WEB-INF/
Date Tue, 26 Feb 2013 16:39:32 GMT
Author: ilgrosso
Date: Tue Feb 26 16:39:32 2013
New Revision: 1450268

URL: http://svn.apache.org/r1450268
Log:
Updating C3 demo at cocoon.zones.apache.org with latest enhancements

Removed:
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/
Modified:
    cocoon/trunk/jail/cocoon3/pom.xml
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/overview.html
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
    cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml
    cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/web.xml

Modified: cocoon/trunk/jail/cocoon3/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/pom.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/overview.html
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/overview.html?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/overview.html (original)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/overview.html Tue Feb 26 16:39:32
2013
@@ -47,6 +47,7 @@
           <li><a href="sax-pipeline/simple">SAX Pipeline</a>: Simplest
possible pipeline that has a generator, transformer and serializer.</li>
           <li><a href="sax-pipeline/simple-xhtml">SAX Pipeline</a>: Same
as before but creates XHTML as output format.</li>
           <li><a href="sax-pipeline/simple-xml">SAX Pipeline</a>: Same
as before but creates XML as output format.</li>
+          <li><a href="sax-pipeline/simple-txt">SAX Pipeline</a>: Same
as before but creates TXT as output format</li>
           <li><a href="sax-pipeline/simple-xsd">SAX Pipeline</a>: Same
as before but creates XML as output format after validating the input.</li>
           <li><a href="sax-pipeline/unauthorized">Status code</a>: Set
status code '401' at pipeline.</li>
         </ul>
@@ -172,6 +173,13 @@
           <li><a href="fop/test.pdf">PDF</a>: Create a PDF document by
using Apache FOP.</li>
         </ul>
       </section>
+      <section id="json">
+        <h2>JSON</h2>
+        <ul>
+          <li><a href="json/xml2json">JSON</a>: Serialize pipeline to JSON
string.</li>
+          <li><a href="json/json2xml">JSON</a>: Generate SAX events from
JSON string.</li>
+        </ul>
+      </section>
       <section id="encoding-serializers">
         <h2>Encoding Serializers</h2>
         <ul>
@@ -197,7 +205,7 @@
     <nav>
       <ul>
         <li><a href="#map-read" target="_self">map:read</a></li>
-        <li><a href="#sax-pipelines" target="_self">Sax Pipelines</a></li>
+        <li><a href="#sax-pipelines" target="_self">SAX Pipelines</a></li>
         <li><a href="#stax-pipelines" target="_self">StAX Pipelines</a></li>
         <li><a href="#caching" target="_self">Caching</a></li>
         <li><a href="#error-handling" target="_self">Error handling</a></li>
@@ -212,7 +220,8 @@
         <li><a href="#xslt" target="_self">XSLT</a></li>
         <li><a href="#sitemap-rest-controller" target="_self">Sitemap REST Controller</a></li>
         <li><a href="#jaxrs-rest-controller" target="_self">JAX-RS REST Controller</a></li>
-        <li><a href="#fop" target="_self">fop</a></li>
+        <li><a href="#fop" target="_self">FOP</a></li>
+        <li><a href="#json" target="_self">JSON</a></li>
         <li><a href="#encoding-serializers" target="_self">Encoding Serializers</a></li>
         <li><a href="#cocoon-wicket-integration" target="_self">Cocoon-Wicket
integration</a></li>
         <li><a href="#stringtemplate" target="_self">StringTemplate</a></li>

Modified: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap Tue Feb 26 16:39:32
2013
@@ -10,13 +10,13 @@
 
       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.
- -->
+ 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$ -->
 <map:sitemap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:map="http://apache.org/cocoon/sitemap"
              xmlns:servlet="http://apache.org/cocoon/servlet" xmlns:controller="http://apache.org/cocoon/controller">
@@ -48,7 +48,7 @@
     </map:pipeline>
 
     <!-- ~~~~~~~~~~~~~~~~ sax pipelines ~~~~~~~~~~~~~~~ -->
-    <map:pipeline jmx-group-name="sax">
+    <map:pipeline jmx-group-name="sax" type="noncaching">
       <map:match equals="sax-pipeline/simple">
         <map:generate src="sax-pipeline/simple.xml" />
         <map:transform src="sax-pipeline/simple.xslt">
@@ -80,6 +80,13 @@
         </map:transform>
         <map:serialize type="xml" />
       </map:match>
+      <map:match pattern="sax-pipeline/simple-txt">
+        <map:generate src="sax-pipeline/simple.xml" />
+        <map:transform src="sax-pipeline/simple.xslt">
+          <map:parameter name="myParam" value="3-{jexl:cocoon.request.ssf}" />
+        </map:transform>
+        <map:serialize type="txt" />
+      </map:match>
       <map:match equals="sax-pipeline/simple-xsd">
         <map:generate src="sax-pipeline/simple.xml" />
         <map:transform type="schema" src="sax-pipeline/simple.xsd" />
@@ -233,7 +240,7 @@
     </map:pipeline>
 
     <!-- ~~~~~~~~~~~~~~~~ advanced matching (when/otherwise) ~~~~~~~~~~~~~~~ -->
-    <map:pipeline>
+    <map:pipeline type="noncaching">
       <map:match pattern="advanced-matching">
         <map:select value="{jexl:cocoon.request.myparam}">
           <map:when equals="11">
@@ -386,7 +393,9 @@
       </map:match>
       <map:match equals="aggregation/xinclude-transformer">
         <map:generate src="aggregation/xinclude.xml" />
-        <map:transform type="xinclude" />
+        <map:transform type="xinclude">
+          <map:parameter name="cacheKey" value="{map:0}"/>
+        </map:transform>
         <map:serialize type="xml" />
       </map:match>
       <map:match equals="aggregation/sub-request">
@@ -560,6 +569,21 @@
       </map:match>
     </map:pipeline>
 
+    <!-- JSON -->
+    <map:pipeline>
+      <map:match equals="json/xml2json">
+        <map:generate src="sax-pipeline/simple.xml" />
+        <map:transform src="sax-pipeline/simple.xslt">
+          <map:parameter name="myParam" value="1" />
+        </map:transform>
+        <map:serialize type="json"/>
+      </map:match>
+      <map:match equals="json/json2xml">
+        <map:generate type="json" src="servlet:/json/xml2json" />
+        <map:serialize/>
+      </map:match>
+    </map:pipeline>
+
     <!-- Cocoon Wicket integration -->
     <map:pipeline type="noncaching">
       <map:match wildcard="wicket/**">

Modified: cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
(original)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
Tue Feb 26 16:39:32 2013
@@ -10,32 +10,38 @@
 
       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.
- -->
+ 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$ -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-  ">
+<beans xmlns="http://www.springframework.org/schema/beans" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p" 
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/aop
+                           http://www.springframework.org/schema/aop/spring-aop.xsd
+                           http://www.springframework.org/schema/context
+                           http://www.springframework.org/schema/context/spring-context.xsd">
 
   <!-- Scan for all REST controllers and make them as beans available -->
   <context:component-scan base-package="org.apache.cocoon.sample.controller" use-default-filters="false"
-    name-generator="org.apache.cocoon.rest.controller.ControllerBeanNameGenerator"
-    scope-resolver="org.apache.cocoon.rest.controller.ControllerBeanScopeResolver">
-    <context:include-filter type="annotation" expression="org.apache.cocoon.rest.controller.annotation.RESTController"
/>
+                          name-generator="org.apache.cocoon.rest.controller.ControllerBeanNameGenerator"
+                          scope-resolver="org.apache.cocoon.rest.controller.ControllerBeanScopeResolver">
+    <context:include-filter type="annotation" 
+                            expression="org.apache.cocoon.rest.controller.annotation.RESTController"
/>
   </context:component-scan>
   
   <context:annotation-config />
   
-  <bean id="org.apache.cocoon.sample.controller.aspect1" class="org.apache.cocoon.sample.controller.DemoRESTControllerAspect1"
/>
-  <bean id="org.apache.cocoon.sample.controller.aspect2" class="org.apache.cocoon.sample.controller.DemoRESTControllerAspect2"
/>
+  <bean id="org.apache.cocoon.sample.controller.aspect1" 
+        class="org.apache.cocoon.sample.controller.DemoRESTControllerAspect1" />
+  <bean id="org.apache.cocoon.sample.controller.aspect2" 
+        class="org.apache.cocoon.sample.controller.DemoRESTControllerAspect2" />
 </beans>

Modified: cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
(original)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
Tue Feb 26 16:39:32 2013
@@ -10,16 +10,18 @@
 
       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.
- -->
+ 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$ -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans.xsd">
 
   <bean id="org.apache.cocoon.sample.rest.resource.one" class="org.apache.cocoon.sample.jaxrs.SampleJaxRsResource1">
     <property name="settings" ref="org.apache.cocoon.configuration.Settings" />

Modified: cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
(original)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
Tue Feb 26 16:39:32 2013
@@ -1,4 +1,23 @@
 <?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
+  und
+-->
+<!-- $Id$ -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:servlet="http://cocoon.apache.org/schema/servlet"
@@ -9,12 +28,12 @@
   
   <!-- A Cocoon-Sitemap based servlet-service. -->
   <bean id="org.apache.cocoon.sample.servlet" class="org.apache.cocoon.servlet.XMLSitemapServlet">
-    <servlet:context mount-path="" context-path="classpath:/COB-INF/" />      
+    <servlet:context mount-path="" context-path="classpath:/classes/COB-INF/" />  
   
   </bean>
   
   <!-- A servlet-service that exposes JAX-RS REST endpoints. -->
   <bean id="org.apache.cocoon.sample.rest.servlet" class="org.apache.cocoon.rest.jaxrs.container.CocoonJAXRSServlet">
-    <servlet:context mount-path="/jax-rs" context-path="blockcontext:/cocoon-sample/">
+    <servlet:context mount-path="/jax-rs" context-path="classpath:/classes/COB-INF/">
       <servlet:connections>
         <entry key="sample" value-ref="org.apache.cocoon.sample.servlet" />
       </servlet:connections>      
@@ -27,5 +46,4 @@
       </list>
     </property>
   </bean>
-
 </beans>

Modified: cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
(original)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
Tue Feb 26 16:39:32 2013
@@ -10,18 +10,22 @@
 
       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.
- -->
+ 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$ -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
+                           http://www.springframework.org/schema/beans/spring-beans.xsd">
 
   <import resource="classpath:META-INF/cocoon/spring-optional/cocoon-optional-fop.xml"
/>
   
+  <import resource="classpath:META-INF/cocoon/spring-optional/cocoon-optional-generators.xml"
/>
+
   <import resource="classpath:META-INF/cocoon/spring-optional/cocoon-optional-serializers.xml"
/>
 </beans>

Modified: cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
(original)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
Tue Feb 26 16:39:32 2013
@@ -10,22 +10,27 @@
 
       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.
- -->
+ 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$ -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-  <import
-    resource="classpath:META-INF/cocoon/spring/cocoon-stax-components.xml" />
-  <bean name="action:error-throwing" class="org.apache.cocoon.sample.action.ErrorThrowingAction"
scope="prototype" />
+  <import resource="classpath:META-INF/cocoon/spring/cocoon-stax-components.xml" />
+  <bean name="action:error-throwing" 
+        class="org.apache.cocoon.sample.action.ErrorThrowingAction" 
+        scope="prototype" />
   
-  <bean name="generator:timestamp-caching" class="org.apache.cocoon.sample.generation.CachingTimestampGenerator"
scope="prototype" />
+  <bean name="generator:timestamp-caching" 
+        class="org.apache.cocoon.sample.generation.CachingTimestampGenerator" 
+        scope="prototype" />
   
-  <bean name="generator:timestamp-noncaching" class="org.apache.cocoon.sample.generation.TimestampGenerator"
scope="prototype" />
+  <bean name="generator:timestamp-noncaching" 
+        class="org.apache.cocoon.sample.generation.TimestampGenerator" 
+        scope="prototype" />
 </beans>

Modified: cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
(original)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
Tue Feb 26 16:39:32 2013
@@ -10,17 +10,19 @@
 
       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.
- -->
+ 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$ -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           http://www.springframework.org/schema/beans/spring-beans.xsd">
 
   <bean id="org.apache.cocoon.sample.wicket.CocoonSampleWicketWebapp" 
-    class="org.apache.cocoon.sample.wicket.CocoonSampleWicketWebapp"/>
+        class="org.apache.cocoon.sample.wicket.CocoonSampleWicketWebapp"/>
 </beans>

Modified: cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml Tue Feb 26 16:39:32
2013
@@ -26,9 +26,7 @@
                            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">
-  
-  <bean class="org.apache.cocoon.sample.classpath.ClasspathURLStreamHandlerFactory"/>
-  
+    
   <!-- Activate Cocoon Spring Configurator -->
   <configurator:settings>
     <configurator:property name="org.apache.cocoon.logback.loglevel" value="ERROR"/>
@@ -36,8 +34,8 @@
 
   <!-- Configure Logback -->
   <bean name="org.apache.cocoon.spring.configurator.logback"
-          class="org.apache.cocoon.spring.configurator.logback.LogbackConfigurator"
-          scope="singleton">
+        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>

Modified: cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/web.xml?rev=1450268&r1=1450267&r2=1450268&view=diff
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/web.xml Tue Feb 26 16:39:32 2013
@@ -17,34 +17,26 @@
 -->
 <!-- $Id$ -->
 <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
         http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-        version="2.5">
+         version="2.5">
 
   <!-- Servlet Context Listener ======================================= -->
 
   <!--
-    - Declare a context listener that installs all blocks.
-    -->
-  <listener>
-    <description>Declare a context listener that installs all blocks.</description>
-    <listener-class>org.apache.cocoon.blockdeployment.BlockDeploymentServletContextListener</listener-class>
-  </listener>
-
-  <!--
-    - Declare Spring context listener which sets up the Spring Application Context
-    - containing all Cocoon components (and user defined beans as well).
-    -->
+  - Declare Spring context listener which sets up the Spring Application Context
+  - containing all Cocoon components (and user defined beans as well).
+  -->
   <listener>
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
 
   <!--
-    - Declare Spring request listener which sets up the required RequestAttributes
-    - to support Springs and Cocoon custom bean scopes like the request scope or the
-    - session scope.
-    -->
+  - Declare Spring request listener which sets up the required RequestAttributes
+  - to support Springs and Cocoon custom bean scopes like the request scope or the
+  - session scope.
+  -->
   <listener>
     <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
   </listener>
@@ -52,8 +44,8 @@
   <!-- Servlet Configuration ========================================== -->
 
   <!--
-    - Servlet that dispatches requests to the Spring managed block servlets
-    -->
+  - Servlet that dispatches requests to the Spring managed block servlets
+  -->
   <servlet>
     <description>Cocoon blocks dispatcher</description>
     <display-name>DispatcherServlet</display-name>
@@ -65,11 +57,11 @@
   <!-- URL space mappings ============================================= -->
 
   <!--
-    - The Servlet-Service framework handles all the URL space assigned to the webapp using
its sitemap.
-    - It is recommended to leave it unchanged. Under some circumstances though
-    - (like integration with proprietary webapps or servlets) you might have
-    - to change this parameter.
-    -->
+  - The Servlet-Service framework handles all the URL space assigned to the webapp using
its sitemap.
+  - It is recommended to leave it unchanged. Under some circumstances though
+  - (like integration with proprietary webapps or servlets) you might have
+  - to change this parameter.
+  -->
   <servlet-mapping>
     <servlet-name>DispatcherServlet</servlet-name>
     <url-pattern>/*</url-pattern>



Mime
View raw message