Simplifying C3 samples webapp for jail in order to avoid block:// issues with C2.2 in the same container - see COCOON3-105
git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk@1415967 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jail/cocoon3/cocoon3-sample-block/pom.xml b/jail/cocoon3/cocoon3-sample-block/pom.xml
deleted file mode 100644
index b94e7cb..0000000
--- a/jail/cocoon3/cocoon3-sample-block/pom.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>cocoon3</artifactId>
- <groupId>org.apache.cocoon.zones</groupId>
- <version>3.0.0-beta-1-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.cocoon.zones</groupId>
- <artifactId>cocoon3-sample-block</artifactId>
- <version>3.0.0-beta-1-SNAPSHOT</version>
- <name>cocoon3-sample-block</name>
- <description>Cocoon 3 samples.</description>
- <properties>
- <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.cocoon.stax</groupId>
- <artifactId>cocoon-stax</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.rest</groupId>
- <artifactId>cocoon-rest</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.stringtemplate</groupId>
- <artifactId>cocoon-stringtemplate</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.wicket</groupId>
- <artifactId>cocoon-wicket</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.profiling</groupId>
- <artifactId>cocoon-profiling</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.monitoring</groupId>
- <artifactId>cocoon-monitoring</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.optional</groupId>
- <artifactId>cocoon-optional</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>fop</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-serializers-charsets</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>1.12</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.12</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- <version>1.12</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>0.9.29</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>0.9.29</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>maven2-repository.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <useProjectReferences>false</useProjectReferences>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-maven-plugin</artifactId>
- <version>1.0.0</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>prepare</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <webappProfile>ssf</webappProfile>
- <customWebappDirectory>rcl-config</customWebappDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8888</port>
- <maxIdleTime>30000</maxIdleTime>
- </connector>
- </connectors>
- <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
- <contextPath>/</contextPath>
- <systemProperties>
- <systemProperty>
- <name>org.apache.cocoon.mode</name>
- <value>dev</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifestEntries>
- <Cocoon-Block-Name>cocoon-sample</Cocoon-Block-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/jail/cocoon3/cocoon3-sample-block/rcl-config/WEB-INF/classes/logback.xml b/jail/cocoon3/cocoon3-sample-block/rcl-config/WEB-INF/classes/logback.xml
deleted file mode 100644
index f170063..0000000
--- a/jail/cocoon3/cocoon3-sample-block/rcl-config/WEB-INF/classes/logback.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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.
- -->
-<configuration>
- <!--
- - This is a sample configuration for logback.
- - It simply just logs everything into a single log file.
- -->
- <appender name="CORE" class="ch.qos.logback.core.FileAppender">
- <file>./target/work/log/cocoon.log</file>
- <append>false</append>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d %-5p %t %c - %m%n</pattern>
- </encoder>
- </appender>
-
- <logger name="org.apache.cocoon" additivity="false">
- <level value="DEBUG"/>
- <appender-ref ref="CORE"/>
- </logger>
- <logger name="org.apache.cocoon.sitemap.node" additivity="false">
- <level value="ERROR"/>
- <appender-ref ref="CORE"/>
- </logger>
- <logger name="org.apache.cocoon.profiling" additivity="false">
- <level value="ERROR"/>
- <appender-ref ref="CORE"/>
- </logger>
- <logger name="org.apache.cocoon.spring.configurator" additivity="false">
- <level value="ERROR"/>
- <appender-ref ref="CORE"/>
- </logger>
-
- <root>
- <level value="WARN"/>
- <appender-ref ref="CORE"/>
- </root>
-</configuration>
diff --git a/jail/cocoon3/cocoon3-sample-block/rcl.properties b/jail/cocoon3/cocoon3-sample-block/rcl.properties
deleted file mode 100644
index e4e49ca..0000000
--- a/jail/cocoon3/cocoon3-sample-block/rcl.properties
+++ /dev/null
@@ -1,21 +0,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.
-#
-org.apache.cocoon.sample.servlet%classes-dir=./target/classes
-
-# cocoon-monitoring
-%classes-dir=../cocoon-monitoring/target/classes
-%exclude-lib=org.apache.cocoon.monitoring:cocoon-monitoring
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml b/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
deleted file mode 100644
index 9c5ae36..0000000
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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: cocoon-sample-servlet-service.xml 774943 2009-05-14 21:56:56Z reinhard $ -->
-<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"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
-
- <!-- 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="blockcontext:/cocoon-sample/" />
- </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:connections>
- <entry key="sample" value-ref="org.apache.cocoon.sample.servlet" />
- </servlet:connections>
- </servlet:context>
-
- <property name="restResourcesList">
- <list>
- <ref bean="org.apache.cocoon.sample.rest.resource.one" />
- <ref bean="org.apache.cocoon.sample.rest.resource.two" />
- </list>
- </property>
- </bean>
-</beans>
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/xpatch/cocoon-sample-block-deployment.xweb b/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/xpatch/cocoon-sample-block-deployment.xweb
deleted file mode 100644
index c0b7aa8..0000000
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/xpatch/cocoon-sample-block-deployment.xweb
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<!-- $Id: cocoon-sample-block-deployment.xweb 884443 2009-11-26 07:55:07Z reinhard $ -->
-<xweb xpath="/web-app"
- unless="comment()[contains(., 'Cocoon Block-Deployment Listener')]"
- insert-after="filter-mapping[last()]">
-
- <!-- Cocoon Block-Deployment Listener -->
- <listener>
- <listener-class>org.apache.cocoon.blockdeployment.BlockDeploymentServletContextListener</listener-class>
- </listener>
-</xweb>
diff --git a/jail/cocoon3/cocoon3-sample-block/src/test/java/org/apache/cocoon/sitemap/MockSettings.java b/jail/cocoon3/cocoon3-sample-block/src/test/java/org/apache/cocoon/sitemap/MockSettings.java
deleted file mode 100644
index 763ec69..0000000
--- a/jail/cocoon3/cocoon3-sample-block/src/test/java/org/apache/cocoon/sitemap/MockSettings.java
+++ /dev/null
@@ -1,76 +0,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.
- */
-package org.apache.cocoon.sitemap;
-
-import java.util.List;
-
-import org.apache.cocoon.configuration.Settings;
-
-public class MockSettings implements Settings {
-
- public String getCacheDirectory() {
- return null;
- }
-
- public String getContainerEncoding() {
- return null;
- }
-
- public long getCreationTime() {
- return 0;
- }
-
- public String getFormEncoding() {
- return null;
- }
-
- public List<?> getLoadClasses() {
- return null;
- }
-
- public String getProperty(String key) {
- return null;
- }
-
- public String getProperty(String key, String defaultValue) {
- return null;
- }
-
- public List<?> getPropertyNames() {
- return null;
- }
-
- public List<?> getPropertyNames(String keyPrefix) {
- return null;
- }
-
- public long getReloadDelay(String type) {
- return 0;
- }
-
- public String getRunningMode() {
- return null;
- }
-
- public String getWorkDirectory() {
- return null;
- }
-
- public boolean isReloadingEnabled(String type) {
- return false;
- }
-}
diff --git a/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-profiling-test-component.xml b/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-profiling-test-component.xml
deleted file mode 100644
index 6154271..0000000
--- a/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-profiling-test-component.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aop="http://www.springframework.org/schema/aop"
- 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
- ">
-
- <bean id="MockSitemapServlet" class="org.apache.cocoon.profiling.MockXMLSitemapServlet" />
- <aop:aspectj-autoproxy />
-
-</beans>
diff --git a/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-collector.xml b/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-collector.xml
deleted file mode 100644
index 0d9805f..0000000
--- a/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-collector.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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: cocoon-sample-test-collector.xml 888393 2009-12-08 13:20:36Z reinhard $ -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aop="http://www.springframework.org/schema/aop"
- 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">
-
- <aop:aspectj-autoproxy proxy-target-class="false" />
-
- <bean id="org.apache.cocoon.servlet.collector.ResponseHeaderCollector" class="org.apache.cocoon.servlet.collector.ResponseHeaderCollector" />
-</beans>
diff --git a/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-spring-configurator.xml b/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-spring-configurator.xml
deleted file mode 100644
index 7f2cfed..0000000
--- a/jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-spring-configurator.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
- -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aop="http://www.springframework.org/schema/aop" xmlns:configurator="http://cocoon.apache.org/schema/configurator"
- 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://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd
- ">
-
- <bean name="org.apache.cocoon.Settings" class="org.apache.cocoon.sitemap.MockSettings" />
-
-</beans>
diff --git a/jail/cocoon3/cocoon3-sample-webapp/pom.xml b/jail/cocoon3/cocoon3-sample-webapp/pom.xml
deleted file mode 100644
index cc26b8b..0000000
--- a/jail/cocoon3/cocoon3-sample-webapp/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>cocoon3</artifactId>
- <groupId>org.apache.cocoon.zones</groupId>
- <version>3.0.0-beta-1-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.cocoon.zones</groupId>
- <artifactId>cocoon3-sample-webapp</artifactId>
- <version>3.0.0-beta-1-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>cocoon3-sample-webapp</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.cocoon.zones</groupId>
- <artifactId>cocoon3-sample-block</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8890</port>
- <maxIdleTime>30000</maxIdleTime>
- </connector>
- </connectors>
- <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</webAppSourceDirectory>
- <contextPath>/</contextPath>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.11</version>
- <configuration>
- <excludes>
- <exclude>**/cocoon/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-</project>
diff --git a/jail/cocoon3/pom.xml b/jail/cocoon3/pom.xml
index 25dcd0c..7ae11b8 100644
--- a/jail/cocoon3/pom.xml
+++ b/jail/cocoon3/pom.xml
@@ -16,602 +16,159 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><!-- $Id: pom.xml 1298309 2012-03-08 09:17:09Z ilgrosso $ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-->
+<!-- $Id: pom.xml 1300980 2012-03-15 13:48:34Z ilgrosso $ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>war</packaging>
- <artifactId>cocoon3</artifactId>
- <groupId>org.apache.cocoon.zones</groupId>
- <version>3.0.0-beta-1-SNAPSHOT</version>
- <name>cocoon3</name>
-
- <modules>
- <module>cocoon3-sample-block</module>
- <module>cocoon3-sample-webapp</module>
- </modules>
-
- <properties>
- <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- <spring.version>3.1.1.RELEASE</spring.version>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <javac.src.version>1.6</javac.src.version>
- <javac.target.version>1.6</javac.target.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- Cocoon subprojects -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-servlet-service-impl</artifactId>
- <!-- After upgrading to 1.2.1 fix the TODO in ServiceServletMonitor -->
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-configuration-api</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-spring-configurator</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-block-deployment</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-jnet</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-xml</artifactId>
- <version>2.0.2</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-serializers-charsets</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <!-- Spring (+ AOP support)-->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>3.0.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jmx</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.6.12</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.6.12</version>
- </dependency>
-
- <!-- Other libraries -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>1.12</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.12</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- <version>1.12</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.2.4-1</version>
- </dependency>
- <dependency>
- <groupId>commons-betwixt</groupId>
- <artifactId>commons-betwixt</artifactId>
- <version>0.8</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.6</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.15</version>
- </dependency>
- <dependency>
- <groupId>org.antlr</groupId>
- <artifactId>ST4</artifactId>
- <version>4.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>3.5.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>3.5.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>1.5.4</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-spring</artifactId>
- <version>1.5.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>fop</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>xmlgraphics-commons</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.10.1</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.4</version>
- </dependency>
-
- <!-- Cocoon internal dependencies -->
- <dependency>
- <groupId>org.apache.cocoon.controller</groupId>
- <artifactId>cocoon-controller</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.optional</groupId>
- <artifactId>cocoon-optional</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.monitoring</groupId>
- <artifactId>cocoon-monitoring</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.pipeline</groupId>
- <artifactId>cocoon-pipeline</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.rest</groupId>
- <artifactId>cocoon-rest</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.sample</groupId>
- <artifactId>cocoon-sample</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.sax</groupId>
- <artifactId>cocoon-sax</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.servlet</groupId>
- <artifactId>cocoon-servlet</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.sitemap</groupId>
- <artifactId>cocoon-sitemap</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.stax</groupId>
- <artifactId>cocoon-stax</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.profiling</groupId>
- <artifactId>cocoon-profiling</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.stringtemplate</groupId>
- <artifactId>cocoon-stringtemplate</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.wicket</groupId>
- <artifactId>cocoon-wicket</artifactId>
- <version>${cocoon.version}</version>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-it-fw</artifactId>
- <version>1.0.0-M1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>5.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <name>cocoon3</name>
+ <groupId>org.apache.cocoon.zones</groupId>
+ <artifactId>cocoon3</artifactId>
+ <version>1.0-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>enforce-maven</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${javac.src.version}</source>
- <target>${javac.target.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>bin/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>na</Implementation-Build>
- <X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>versions-maven-plugin</artifactId>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-it-fw</artifactId>
- <version>1.0.0-M1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-maven-plugin</artifactId>
- <version>1.0.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-2</version>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>versions-maven-plugin</artifactId>
- <version>1.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <properties>
+ <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
- <repositories>
- <repository>
- <id>maven2-repository.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>cocoon3</id>
- <name>Cocoon3 snapshots</name>
- <url>https://repository.apache.org/content/repositories/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon.stax</groupId>
+ <artifactId>cocoon-stax</artifactId>
+ <version>${cocoon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.rest</groupId>
+ <artifactId>cocoon-rest</artifactId>
+ <version>${cocoon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.stringtemplate</groupId>
+ <artifactId>cocoon-stringtemplate</artifactId>
+ <version>${cocoon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.wicket</groupId>
+ <artifactId>cocoon-wicket</artifactId>
+ <version>${cocoon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.profiling</groupId>
+ <artifactId>cocoon-profiling</artifactId>
+ <version>${cocoon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.monitoring</groupId>
+ <artifactId>cocoon-monitoring</artifactId>
+ <version>${cocoon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.optional</groupId>
+ <artifactId>cocoon-optional</artifactId>
+ <version>${cocoon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-serializers-charsets</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.26</version>
+ <configuration>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8888</port>
+ <maxIdleTime>30000</maxIdleTime>
+ </connector>
+ </connectors>
+ <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</webAppSourceDirectory>
+ <contextPath>/</contextPath>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.11</version>
+ <configuration>
+ <excludes>
+ <exclude>**/cocoon/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/action/CustomException.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/action/CustomException.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java
diff --git a/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java
new file mode 100644
index 0000000..82c3b87
--- /dev/null
+++ b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java
@@ -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();
+ }
+ }
+}
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java b/jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
rename to jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/include.xml b/jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/include.xml
rename to jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/sub.xml b/jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/sub.xml
rename to jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/xinclude.xml b/jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/xinclude.xml
rename to jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/controller/demo.html b/jail/cocoon3/src/main/resources/COB-INF/controller/demo.html
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/controller/demo.html
rename to jail/cocoon3/src/main/resources/COB-INF/controller/demo.html
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/404.xml b/jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/404.xml
rename to jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/500.xml b/jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/500.xml
rename to jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/501.xml b/jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/501.xml
rename to jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/503.xml b/jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/503.xml
rename to jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/fop/page.xml b/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml
similarity index 93%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/fop/page.xml
rename to jail/cocoon3/src/main/resources/COB-INF/fop/page.xml
index efa2ee1..de3d6dd 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/fop/page.xml
+++ b/jail/cocoon3/src/main/resources/COB-INF/fop/page.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: page.xml 712183 2008-11-07 16:24:12Z reinhard $ -->
+<!-- $Id$ -->
<page>
<title>Hello</title>
<content>
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/fop/page2fo.xsl b/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl
similarity index 97%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/fop/page2fo.xsl
rename to jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl
index 8087598..a0874b3 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/fop/page2fo.xsl
+++ b/jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: page2fo.xsl 712183 2008-11-07 16:24:12Z reinhard $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fo="http://www.w3.org/1999/XSL/Format">
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base.xml b/jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base.xml
rename to jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_de.properties b/jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_de.properties
rename to jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_en.properties b/jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_en.properties
rename to jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_es.properties b/jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_es.properties
rename to jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_it.properties b/jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_it.properties
rename to jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/linkrewriting/apache_home.html b/jail/cocoon3/src/main/resources/COB-INF/linkrewriting/apache_home.html
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/linkrewriting/apache_home.html
rename to jail/cocoon3/src/main/resources/COB-INF/linkrewriting/apache_home.html
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/overview.html b/jail/cocoon3/src/main/resources/COB-INF/overview.html
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/overview.html
rename to jail/cocoon3/src/main/resources/COB-INF/overview.html
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/cocoon.gif b/jail/cocoon3/src/main/resources/COB-INF/read/cocoon.gif
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/cocoon.gif
rename to jail/cocoon3/src/main/resources/COB-INF/read/cocoon.gif
Binary files differ
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/favicon.ico b/jail/cocoon3/src/main/resources/COB-INF/read/favicon.ico
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/favicon.ico
rename to jail/cocoon3/src/main/resources/COB-INF/read/favicon.ico
Binary files differ
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/javascript-resource b/jail/cocoon3/src/main/resources/COB-INF/read/javascript-resource
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/javascript-resource
rename to jail/cocoon3/src/main/resources/COB-INF/read/javascript-resource
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/javascript-resource.js b/jail/cocoon3/src/main/resources/COB-INF/read/javascript-resource.js
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/javascript-resource.js
rename to jail/cocoon3/src/main/resources/COB-INF/read/javascript-resource.js
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/style.css b/jail/cocoon3/src/main/resources/COB-INF/read/style.css
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/style.css
rename to jail/cocoon3/src/main/resources/COB-INF/read/style.css
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/add-paragraph.xslt b/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/add-paragraph.xslt
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/add-paragraph.xslt
rename to jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/add-paragraph.xslt
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple-1.xml b/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple-1.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple-1.xml
rename to jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple-1.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple-2.xml b/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple-2.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple-2.xml
rename to jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple-2.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xml b/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xml
rename to jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xsd b/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xsd
similarity index 93%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xsd
rename to jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xsd
index 0d73d9b..18aeb00 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xsd
+++ b/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xsd
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: simple.xsd 712103 2008-11-07 10:14:45Z stevendolg $ -->
+<!-- $Id$ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="simple"/>
</xs:schema>
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xslt b/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xslt
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xslt
rename to jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xslt
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/unauthorized.xml b/jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/unauthorized.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/unauthorized.xml
rename to jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/unauthorized.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sitemap.xmap b/jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap
similarity index 99%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sitemap.xmap
rename to jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap
index f94e509..7d8d644 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sitemap.xmap
+++ b/jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- $Id: sitemap.xmap 1308984 2012-04-03 15:38:20Z ilgrosso $ -->
+<!-- $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">
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/string-template/template.xml b/jail/cocoon3/src/main/resources/COB-INF/string-template/template.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/string-template/template.xml
rename to jail/cocoon3/src/main/resources/COB-INF/string-template/template.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/main.xslt b/jail/cocoon3/src/main/resources/COB-INF/xslt/main.xslt
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/main.xslt
rename to jail/cocoon3/src/main/resources/COB-INF/xslt/main.xslt
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/sub-file.xslt b/jail/cocoon3/src/main/resources/COB-INF/xslt/sub-file.xslt
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/sub-file.xslt
rename to jail/cocoon3/src/main/resources/COB-INF/xslt/sub-file.xslt
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/sub-servlet.xslt b/jail/cocoon3/src/main/resources/COB-INF/xslt/sub-servlet.xslt
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/sub-servlet.xslt
rename to jail/cocoon3/src/main/resources/COB-INF/xslt/sub-servlet.xslt
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/properties/cocoon-sample.properties b/jail/cocoon3/src/main/resources/META-INF/cocoon/properties/cocoon-sample.properties
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/properties/cocoon-sample.properties
rename to jail/cocoon3/src/main/resources/META-INF/cocoon/properties/cocoon-sample.properties
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
similarity index 96%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
rename to jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
index f81d73b..d75bc9e 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
+++ b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- $Id: cocoon-sample-controller.xml 765123 2009-04-15 10:33:44Z reinhard $ -->
+<!-- $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"
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
similarity index 94%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
rename to jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
index 24f9e55..654d86a 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
+++ b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- $Id: cocoon-sample-jaxrs.xml 771968 2009-05-05 18:53:25Z reinhard $ -->
+<!-- $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">
diff --git a/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
new file mode 100644
index 0000000..e5fc5db
--- /dev/null
+++ b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cocoon.apache.org/schema/servlet
+ http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+ <!-- 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/" />
+ </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:connections>
+ <entry key="sample" value-ref="org.apache.cocoon.sample.servlet" />
+ </servlet:connections>
+ </servlet:context>
+
+ <property name="restResourcesList">
+ <list>
+ <ref bean="org.apache.cocoon.sample.rest.resource.one" />
+ <ref bean="org.apache.cocoon.sample.rest.resource.two" />
+ </list>
+ </property>
+ </bean>
+
+</beans>
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
similarity index 92%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
rename to jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
index d921b72..01aaced 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
+++ b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- $Id: cocoon-sample-sitemap-components-optional.xml 825425 2009-10-15 07:51:28Z reinhard $ -->
+<!-- $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">
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
similarity index 94%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
rename to jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
index 7d9a6a8..6e121e5 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
+++ b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- $Id: cocoon-sample-sitemap-components.xml 1162725 2011-08-29 10:45:30Z thorsten $ -->
+<!-- $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">
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
similarity index 93%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
rename to jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
index f0265a5..fb5306c 100644
--- a/jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
+++ b/jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- $Id: cocoon-sample-wicket.xml 884443 2009-11-26 07:55:07Z reinhard $ -->
+<!-- $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">
diff --git a/jail/cocoon3/cocoon3-sample-webapp/src/main/resources/logback.xml b/jail/cocoon3/src/main/resources/logback.xml
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-webapp/src/main/resources/logback.xml
rename to jail/cocoon3/src/main/resources/logback.xml
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html b/jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html
rename to jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html
diff --git a/jail/cocoon3/cocoon3-sample-block/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html b/jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html
similarity index 100%
rename from jail/cocoon3/cocoon3-sample-block/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html
rename to jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html
diff --git a/jail/cocoon3/cocoon3-sample-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 75%
rename from jail/cocoon3/cocoon3-sample-webapp/src/main/webapp/WEB-INF/applicationContext.xml
rename to jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml
index 2c5777d..e37fc76 100644
--- a/jail/cocoon3/cocoon3-sample-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: applicationContext.xml 1155368 2011-08-09 13:56:40Z ilgrosso $ -->
+<!-- $Id$ -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
@@ -26,18 +26,20 @@
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"/>
+ </configurator:settings>
- <!-- Activate Cocoon Spring Configurator -->
- <configurator:settings>
- <configurator:property name="org.apache.cocoon.logback.loglevel" value="ERROR"/>
- </configurator:settings>
-
- <!-- Configure Logback -->
- <bean name="org.apache.cocoon.spring.configurator.logback"
+ <!-- Configure Logback -->
+ <bean name="org.apache.cocoon.spring.configurator.logback"
class="org.apache.cocoon.spring.configurator.logback.LogbackConfigurator"
scope="singleton">
- <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
- <property name="resource" value="/WEB-INF/classes/logback.xml"/>
- </bean>
+ <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
+ <property name="resource" value="/WEB-INF/classes/logback.xml"/>
+ </bean>
</beans>
diff --git a/jail/cocoon3/cocoon3-sample-webapp/src/main/webapp/WEB-INF/web.xml b/jail/cocoon3/src/main/webapp/WEB-INF/web.xml
similarity index 97%
rename from jail/cocoon3/cocoon3-sample-webapp/src/main/webapp/WEB-INF/web.xml
rename to jail/cocoon3/src/main/webapp/WEB-INF/web.xml
index ba83810..8ded31f 100644
--- a/jail/cocoon3/cocoon3-sample-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/jail/cocoon3/src/main/webapp/WEB-INF/web.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: web.xml 1155368 2011-08-09 13:56:40Z ilgrosso $ -->
+<!-- $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
