Permalink
Browse files

Simplifying C3 samples webapp for jail in order to avoid block:// iss…

…ues 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
  • Loading branch information...
1 parent 9c189a8 commit ff59e0d918e69fa3b3e8f96cea9a1ef0e58eab22 @ilgrosso ilgrosso committed Dec 1, 2012
Showing with 258 additions and 1,182 deletions.
  1. +0 −201 jail/cocoon3/cocoon3-sample-block/pom.xml
  2. +0 −54 jail/cocoon3/cocoon3-sample-block/rcl-config/WEB-INF/classes/logback.xml
  3. +0 −21 jail/cocoon3/cocoon3-sample-block/rcl.properties
  4. +0 −47 .../cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
  5. +0 −29 ...ocoon3-sample-block/src/main/resources/META-INF/cocoon/xpatch/cocoon-sample-block-deployment.xweb
  6. +0 −76 jail/cocoon3/cocoon3-sample-block/src/test/java/org/apache/cocoon/sitemap/MockSettings.java
  7. +0 −27 jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-profiling-test-component.xml
  8. +0 −30 jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-collector.xml
  9. +0 −25 jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-spring-configurator.xml
  10. +0 −57 jail/cocoon3/cocoon3-sample-webapp/pom.xml
  11. +151 −594 jail/cocoon3/pom.xml
  12. 0 ...oon3/{cocoon3-sample-block → }/src/main/java/org/apache/cocoon/sample/action/CustomException.java
  13. 0 .../{cocoon3-sample-block → }/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java
  14. +53 −0 jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java
  15. 0 ...mple-block → }/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java
  16. 0 ...ocoon3-sample-block → }/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java
  17. 0 ...sample-block → }/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java
  18. 0 ...sample-block → }/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java
  19. 0 ...sample-block → }/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java
  20. 0 ...ocoon3-sample-block → }/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
  21. 0 .../{cocoon3-sample-block → }/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java
  22. 0 .../{cocoon3-sample-block → }/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java
  23. 0 ...oon3-sample-block → }/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java
  24. 0 ...oon3/{cocoon3-sample-block → }/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java
  25. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java
  26. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/aggregation/include.xml
  27. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/aggregation/sub.xml
  28. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/aggregation/xinclude.xml
  29. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/controller/demo.html
  30. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/error-handling/404.xml
  31. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/error-handling/500.xml
  32. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/error-handling/501.xml
  33. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/error-handling/503.xml
  34. +1 −1 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/fop/page.xml
  35. +1 −1 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/fop/page2fo.xsl
  36. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/i18n/base.xml
  37. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/i18n/base_de.properties
  38. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/i18n/base_en.properties
  39. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/i18n/base_es.properties
  40. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/i18n/base_it.properties
  41. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/linkrewriting/apache_home.html
  42. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/overview.html
  43. BIN jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/read/cocoon.gif
  44. BIN jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/read/favicon.ico
  45. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/read/javascript-resource
  46. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/read/javascript-resource.js
  47. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/read/style.css
  48. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/sax-pipeline/add-paragraph.xslt
  49. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/sax-pipeline/simple-1.xml
  50. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/sax-pipeline/simple-2.xml
  51. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/sax-pipeline/simple.xml
  52. +1 −1 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/sax-pipeline/simple.xsd
  53. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/sax-pipeline/simple.xslt
  54. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/sax-pipeline/unauthorized.xml
  55. +1 −1 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/sitemap.xmap
  56. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/string-template/template.xml
  57. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/xslt/main.xslt
  58. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/xslt/sub-file.xslt
  59. 0 jail/cocoon3/{cocoon3-sample-block → }/src/main/resources/COB-INF/xslt/sub-servlet.xslt
  60. 0 .../{cocoon3-sample-block → }/src/main/resources/META-INF/cocoon/properties/cocoon-sample.properties
  61. +1 −1 .../{cocoon3-sample-block → }/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml
  62. +1 −1 ...coon3/{cocoon3-sample-block → }/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml
  63. +31 −0 jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
  64. +1 −1 ...block → }/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml
  65. +1 −1 ...3-sample-block → }/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml
  66. +1 −1 ...oon3/{cocoon3-sample-block → }/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml
  67. 0 jail/cocoon3/{cocoon3-sample-webapp → }/src/main/resources/logback.xml
  68. 0 ...{cocoon3-sample-block → }/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html
  69. 0 ...coon3/{cocoon3-sample-block → }/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html
  70. +13 −11 jail/cocoon3/{cocoon3-sample-webapp → }/src/main/webapp/WEB-INF/applicationContext.xml
  71. +1 −1 jail/cocoon3/{cocoon3-sample-webapp → }/src/main/webapp/WEB-INF/web.xml
@@ -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>
@@ -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>
@@ -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
@@ -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>
@@ -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>
Oops, something went wrong.

0 comments on commit ff59e0d

Please sign in to comment.