cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1415967 [1/3] - in /cocoon/trunk/jail/cocoon3: ./ cocoon3-sample-block/ cocoon3-sample-webapp/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/cocoon/ src/main/java/org/apache/cocoon/sample/ src/main/ja...
Date Sat, 01 Dec 2012 10:04:46 GMT
Author: ilgrosso
Date: Sat Dec  1 10:04:39 2012
New Revision: 1415967

URL: http://svn.apache.org/viewvc?rev=1415967&view=rev
Log:
Simplifying C3 samples webapp for jail in order to avoid block:// issues with C2.2 in the same container - see COCOON3-105

Added:
    cocoon/trunk/jail/cocoon3/src/main/java/
    cocoon/trunk/jail/cocoon3/src/main/java/org/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/linkrewriting/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/linkrewriting/apache_home.html   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/overview.html   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/read/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/read/cocoon.gif   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/read/favicon.ico   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/read/javascript-resource
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/read/javascript-resource.js   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/read/style.css   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/add-paragraph.xslt   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple-1.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple-2.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xsd   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xslt   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/unauthorized.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/string-template/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/string-template/template.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/xslt/
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/xslt/main.xslt   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/xslt/sub-file.xslt   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/xslt/sub-servlet.xslt   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/properties/
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/properties/cocoon-sample.properties   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/logback.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/org/
    cocoon/trunk/jail/cocoon3/src/main/resources/org/apache/
    cocoon/trunk/jail/cocoon3/src/main/resources/org/apache/cocoon/
    cocoon/trunk/jail/cocoon3/src/main/resources/org/apache/cocoon/sample/
    cocoon/trunk/jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/
    cocoon/trunk/jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html   (with props)
    cocoon/trunk/jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html   (with props)
    cocoon/trunk/jail/cocoon3/src/main/webapp/
    cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/
    cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml   (with props)
    cocoon/trunk/jail/cocoon3/src/main/webapp/WEB-INF/web.xml   (with props)
Removed:
    cocoon/trunk/jail/cocoon3/cocoon3-sample-block/
    cocoon/trunk/jail/cocoon3/cocoon3-sample-webapp/
Modified:
    cocoon/trunk/jail/cocoon3/pom.xml

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

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.action;
+
+public class CustomException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    public CustomException() {
+        super();
+    }
+
+    public CustomException(String message) {
+        super(message);
+    }
+
+    public CustomException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public CustomException(Throwable cause) {
+        super(cause);
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.action;
+
+import java.util.Map;
+
+import org.apache.cocoon.sitemap.action.Action;
+
+public class ErrorThrowingAction implements Action {
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @see org.apache.cocoon.sitemap.action.Action#setup(java.util.Map)
+     */
+    public void setup(Map<String, Object> parameters) throws Exception {
+        // nothing to do
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @see org.apache.cocoon.sitemap.action.Action#execute()
+     */
+    public void execute() throws Exception {
+        throw new CustomException();
+    }
+
+    /**
+     * {@inheritDoc}
+     * 
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "ErrorThrowingAction";
+    }
+
+    @Override
+    public void setConfiguration(Map<String, ? extends Object> configuration) {
+        // nothing to do
+        
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2012 Tirasa
+ *
+ * Licensed 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.
+ */
+package org.apache.cocoon.sample.classpath;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.net.URLStreamHandlerFactory;
+
+public class ClasspathURLStreamHandlerFactory implements URLStreamHandlerFactory {
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see java.net.URLStreamHandlerFactory#createURLStreamHandler(java.lang.String)
+     */
+    @Override
+    public URLStreamHandler createURLStreamHandler(final String protocol) {
+        return "classpath".equalsIgnoreCase(protocol)
+                ? new ClasspathURLStreamHandler()
+                : null;
+    }
+
+    public class ClasspathURLStreamHandler extends URLStreamHandler {
+
+        @Override
+        protected URLConnection openConnection(final URL url)
+                throws IOException {
+
+            final URL resourceUrl = Thread.currentThread().getContextClassLoader().getResource(url.getPath());
+            if (resourceUrl == null) {
+                throw new FileNotFoundException(url.toExternalForm());
+            }
+
+            return resourceUrl.openConnection();
+        }
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.pipeline.caching.CacheKey;
+import org.apache.cocoon.pipeline.caching.ParameterCacheKey;
+import org.apache.cocoon.rest.controller.annotation.RESTController;
+import org.apache.cocoon.rest.controller.annotation.RequestParameter;
+import org.apache.cocoon.rest.controller.annotation.SitemapParameter;
+import org.apache.cocoon.rest.controller.method.ConditionalGet;
+import org.apache.cocoon.rest.controller.response.RestResponse;
+import org.apache.cocoon.rest.controller.response.URLResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@RESTController
+public class CacheableDemoRESTController implements ConditionalGet {
+
+    @SitemapParameter
+    private String id;
+
+    @SitemapParameter
+    private String name;
+
+    @RequestParameter
+    private String reqparam;
+
+    @Autowired
+    private Settings settings;
+
+    public CacheKey constructCacheKey() {
+        ParameterCacheKey cacheKey = new ParameterCacheKey();
+        cacheKey.addParameter("id", this.id);
+        cacheKey.addParameter("name", this.name);
+        cacheKey.addParameter("reqparam", this.reqparam);
+        return cacheKey;
+    }
+
+    public RestResponse doGet() throws Exception {
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("id", this.id);
+        data.put("name", this.name);
+        data.put("reqparam", this.reqparam);
+        data.put("testProperty", this.settings.getProperty("testProperty"));
+
+        return new URLResponse("servlet:/controller/screen", data);
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.rest.controller.annotation.RESTController;
+import org.apache.cocoon.rest.controller.annotation.RequestParameter;
+import org.apache.cocoon.rest.controller.annotation.SitemapParameter;
+import org.apache.cocoon.rest.controller.method.Get;
+import org.apache.cocoon.rest.controller.response.RestResponse;
+import org.apache.cocoon.rest.controller.response.URLResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@RESTController
+public class DemoRESTController implements Get {
+
+    @SitemapParameter
+    private String id;
+
+    @SitemapParameter
+    private String name;
+
+    @RequestParameter
+    private String reqparam;
+
+    @Autowired
+    private Settings settings;
+
+    @Override
+    public RestResponse doGet() throws Exception {
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("id", this.id);
+        data.put("name", this.name);
+        data.put("reqparam", this.reqparam);
+        data.put("testProperty", this.settings.getProperty("testProperty"));
+
+        return new URLResponse("servlet:/controller/screen", data);
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.controller;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Aspect
+public class DemoRESTControllerAspect1 {
+
+    /**
+     * Logger.
+     */
+    private static final Logger LOG =
+            LoggerFactory.getLogger(DemoRESTControllerAspect1.class);
+
+    @Around("bean(org.apache.cocoon.sample.controller.DemoRESTController)")
+    public Object someTestAdvice(final ProceedingJoinPoint pjp)
+            throws Throwable {
+
+        LOG.info("Going through around advice 1 - start");
+        try {
+            return pjp.proceed();
+        } finally {
+            LOG.info("Going through around advice 1 - end");
+        }
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.controller;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Aspect
+public class DemoRESTControllerAspect2 {
+
+    /**
+     * Logger.
+     */
+    private static final Logger LOG =
+            LoggerFactory.getLogger(DemoRESTControllerAspect2.class);
+
+    @Around("bean(org.apache.cocoon.sample.controller.DemoRESTController)")
+    public Object someTestAdvice(final ProceedingJoinPoint pjp)
+            throws Throwable {
+
+        LOG.info("Going through around advice 2 - start");
+        try {
+            return pjp.proceed();
+        } finally {
+            LOG.info("Going through around advice 2 - end");
+        }
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.generation;
+
+import org.apache.cocoon.pipeline.caching.AbstractCacheKey;
+import org.apache.cocoon.pipeline.caching.CacheKey;
+import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
+import org.apache.cocoon.util.murmurhash.MurmurHashCodeBuilder;
+
+public class CachingTimestampGenerator extends TimestampGenerator implements CachingPipelineComponent {
+
+    private static final int CACHING_PERIOD = 1500;
+
+    public CacheKey constructCacheKey() {
+        return new CacheKeyImplementation(System.currentTimeMillis());
+    }
+
+    private final class CacheKeyImplementation extends AbstractCacheKey {
+
+        private static final long serialVersionUID = 1L;
+        private final long timestamp;
+
+        public CacheKeyImplementation(long timestamp) {
+            this.timestamp = timestamp;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof CacheKeyImplementation;
+        }
+
+        public long getLastModified() {
+            return this.timestamp;
+        }
+
+        @Override
+        public int hashCode() {
+            return new MurmurHashCodeBuilder().append(this.getClass().getName()).toHashCode();
+        }
+
+        public boolean isValid(CacheKey other) {
+            if (!(other instanceof CacheKeyImplementation)) {
+                return false;
+            }
+
+            CacheKeyImplementation otherCacheKey = (CacheKeyImplementation) other;
+            return Math.abs(this.timestamp - otherCacheKey.timestamp) < CACHING_PERIOD;
+        }
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.generation;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.cocoon.pipeline.ProcessingException;
+import org.apache.cocoon.sax.AbstractSAXGenerator;
+import org.apache.cocoon.sax.SAXConsumer;
+import org.apache.cocoon.xml.sax.ImmutableAttributesImpl;
+import org.xml.sax.SAXException;
+
+public class TimestampGenerator extends AbstractSAXGenerator {
+
+    public void execute() {
+        SAXConsumer consumer = this.getSAXConsumer();
+        try {
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+            consumer.startDocument();
+            consumer.startElement("", "timestamp", "timestamp", new ImmutableAttributesImpl());
+            String timestamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S").format(new Date());
+            consumer.characters(timestamp.toCharArray(), 0, timestamp.length());
+            consumer.endElement("", "timestamp", "timestamp");
+
+            consumer.endDocument();
+        } catch (SAXException e) {
+            throw new ProcessingException(e);
+        }
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.jaxrs;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.rest.jaxrs.response.URLResponseBuilder;
+
+@Path("/sample")
+public class SampleJaxRsResource1 {
+
+    private Settings settings;
+
+    @GET
+    @Path("/parameter-passing/{id}")
+    public Response anotherService(@PathParam("id") String id, @QueryParam("req-param") String reqParam,
+            @Context UriInfo uriInfo, @Context Request request) {
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("name", "Donald Duck");
+        data.put("id", id);
+        data.put("reqparam", reqParam);
+        data.put("testProperty", this.settings.getProperty("testProperty"));
+
+        return URLResponseBuilder.newInstance("servlet:sample:/controller/screen", data).build();
+    }
+
+    @GET
+    @Path("/sax-pipeline/unauthorized")
+    public Response saxPipelineUnauthorized() {
+        return URLResponseBuilder.newInstance("servlet:sample:/sax-pipeline/unauthorized").build();
+    }
+
+    public void setSettings(Settings settings) {
+        this.settings = settings;
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.jaxrs;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import org.apache.cocoon.rest.jaxrs.response.URLResponseBuilder;
+
+@Path("/sample2")
+public class SampleJaxRsResource2 {
+
+    @GET
+    @Path("/read/javascript-resource-implicit.js")
+    public Response conditionalGet() {
+        return URLResponseBuilder.newInstance("servlet:sample:/read/javascript-resource-implicit.js").build();
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.wicket;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
+
+public class CocoonSampleWicketWebapp extends WebApplication {
+
+    @Override
+    public Class<? extends Page> getHomePage() {
+        return HelloWicketPage.class;
+    }
+
+    @Override
+    protected void init() {
+        this.getComponentInstantiationListeners().add(
+                new SpringComponentInjector(this));
+        this.mountPage("hello-wicket", HelloWicketPage.class);
+        
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.wicket;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+
+public class HelloWicketPage extends WebPage {
+
+    private AjaxFallbackLink<Object> ajaxFallbackLink;
+
+    private Label text;
+
+    private int counter = 1;
+
+    public HelloWicketPage() {
+        super();
+
+        this.add(new Label("message", "hello, wicket!"));
+        this.text = new Label("text", "text-1");
+        this.text.setOutputMarkupId(true);
+        this.add(this.text);
+
+        this.ajaxFallbackLink = new AjaxFallbackLink<Object>("link") {
+
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public void onClick(final AjaxRequestTarget target) {
+                HelloWicketPage.this.text.setDefaultModelObject(
+                        "text-" + ++HelloWicketPage.this.counter);
+                target.add(HelloWicketPage.this.text);
+            }
+        };
+        this.add(this.ajaxFallbackLink);
+
+        this.add(new Link<Object>("link-other-page") {
+
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public void onClick() {
+                this.setResponsePage(OtherPage.class);
+            }
+        });
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java (added)
+++ cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java Sat Dec  1 10:04:39 2012
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.sample.wicket;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.Link;
+
+public class OtherPage extends WebPage {
+
+    public OtherPage() {
+        super();
+
+        this.add(new Link<Object>("link") {
+
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public void onClick() {
+                this.setResponsePage(HelloWicketPage.class);
+            }
+        });
+    }
+}

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: cocoon/trunk/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +1,25 @@
+<?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.
+-->
+<sample>
+  <sub1>
+    <i:include xmlns:i="http://apache.org/cocoon/3.0/include" src="servlet:/aggregation/sub-request"/>
+  </sub1>
+  <sub2>
+    <i:include xmlns:i="http://apache.org/cocoon/3.0/include" src="aggregation/sub.xml"/>
+  </sub2>
+</sample>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +1,18 @@
+<?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.
+-->
+<sub>sub</sub>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +1,25 @@
+<?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.
+-->
+<sample>
+  <sub1>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="servlet:/aggregation/sub-request"/>
+  </sub1>
+  <sub2>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aggregation/sub.xml"/>
+  </sub2>
+</sample>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html Sat Dec  1 10:04:39 2012
@@ -0,0 +1,31 @@
+<?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.
+ -->
+<html>
+  <head>
+    <title>REST demo</title>
+  </head>
+  <body>
+    <h3>REST demo</h3>
+    <p>name=$name$</p>
+    <p>id=$id$</p>
+    <p>reqparam=$reqparam$</p>
+    <p>testProperty=$testProperty$</p>
+  </body>
+</html>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +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 under the License.
+-->
+<html>
+  <head>
+    <title>404 Resource Not Available (Cocoon 3 Integration Tests)</title>
+  </head>
+  <body>404 Resource Not Available (Cocoon 3 Integration Tests)</body>
+</html>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +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 under the License.
+-->
+<html>
+  <head>
+    <title>Error 500 (Cocoon 3 Integration Tests)</title>
+  </head>
+  <body>Error 500 (Cocoon 3 Integration Tests)</body>
+</html>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +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 under the License.
+-->
+<html>
+  <head>
+    <title>Error 501 (Cocoon 3 Integration Tests)</title>
+  </head>
+  <body>Error 501 (Cocoon 3 Integration Tests)</body>
+</html>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +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 under the License.
+-->
+<html>
+  <head>
+    <title>Error 503 (Cocoon 3 Integration Tests)</title>
+  </head>
+  <body>Error 503 (Cocoon 3 Integration Tests)</body>
+</html>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+  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$ -->
+<page>
+  <title>Hello</title>
+  <content>
+    <para>This is my first Cocoon PDF page!</para>
+  </content>
+</page>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl Sat Dec  1 10:04:39 2012
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+  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$ -->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+  <xsl:template match="/">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="page" page-height="29.7cm" page-width="21cm" margin-top="1cm"
+          margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm">
+          <fo:region-body margin-top="3cm" />
+          <fo:region-before extent="3cm" />
+          <fo:region-after extent="1.5cm" />
+        </fo:simple-page-master>
+
+        <fo:page-sequence-master master-name="all">
+          <fo:repeatable-page-master-alternatives>
+            <fo:conditional-page-master-reference master-reference="page" page-position="first" />
+          </fo:repeatable-page-master-alternatives>
+        </fo:page-sequence-master>
+      </fo:layout-master-set>
+
+      <fo:page-sequence master-reference="all">
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block text-align="center" font-size="10pt" font-family="serif" line-height="14pt">
+            page <fo:page-number />
+          </fo:block>
+        </fo:static-content>
+
+        <fo:flow flow-name="xsl-region-body">
+          <xsl:apply-templates />
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </xsl:template>
+
+  <xsl:template match="title">
+    <fo:block font-size="36pt" space-before.optimum="24pt" text-align="center">
+      <xsl:apply-templates />
+    </fo:block>
+  </xsl:template>
+
+  <xsl:template match="para">
+    <fo:block font-size="12pt" space-before.optimum="12pt" text-align="center">
+      <xsl:apply-templates />
+    </fo:block>
+  </xsl:template>
+</xsl:stylesheet>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml Sat Dec  1 10:04:39 2012
@@ -0,0 +1,26 @@
+<?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.
+-->
+<test xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xmlns:i18n="http://apache.org/cocoon/i18n/3.0">
+
+    <para title="first" name="article" i18n:attr="title name">
+        <i18n:text>This text will be translated.</i18n:text>
+        <br/>
+        <i18n:text i18n:key="key_text">Default value</i18n:text>
+    </para>
+</test>

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties Sat Dec  1 10:04:39 2012
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+first=Erster
+This\ text\ will\ be\ translated.=Beispieltext
+article=Artikel
+key_text=

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties Sat Dec  1 10:04:39 2012
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+first=First
+This\ text\ will\ be\ translated.=Sample text
+article=Article
+key_text=A value

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties Sat Dec  1 10:04:39 2012
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+first=Primero
+This\ text\ will\ be\ translated.=Texto de ejemplo
+article=articulo
+key_text=

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Added: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties?rev=1415967&view=auto
==============================================================================
--- cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties (added)
+++ cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties Sat Dec  1 10:04:39 2012
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+first=Primo
+This\ text\ will\ be\ translated.=Testo di esempio
+article=Articolo
+key_text=

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id



Mime
View raw message