ff59e0d918e69fa3b3e8f96cea9a1ef0e58eab22 - cocoon

commit	ff59e0d918e69fa3b3e8f96cea9a1ef0e58eab22	[log] [tgz]
author	Francesco Chicchiriccò <ilgrosso@apache.org>	Sat Dec 01 10:04:39 2012 +0000
committer	Francesco Chicchiriccò <ilgrosso@apache.org>	Sat Dec 01 10:04:39 2012 +0000
tree	70ff2329c965ee94d81a6cf5c7368c20207d48d0
parent	9c189a80a789d2834ba398652dab372ff9e63ef6 [diff]

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

jail/cocoon3/cocoon3-sample-block/pom.xml[Deleted - diff]
jail/cocoon3/cocoon3-sample-block/rcl-config/WEB-INF/classes/logback.xml[Deleted - diff]
jail/cocoon3/cocoon3-sample-block/rcl.properties[Deleted - diff]
jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml[Deleted - diff]
jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/xpatch/cocoon-sample-block-deployment.xweb[Deleted - diff]
jail/cocoon3/cocoon3-sample-block/src/test/java/org/apache/cocoon/sitemap/MockSettings.java[Deleted - diff]
jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-profiling-test-component.xml[Deleted - diff]
jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-collector.xml[Deleted - diff]
jail/cocoon3/cocoon3-sample-block/src/test/resources/cocoon-sample-test-spring-configurator.xml[Deleted - diff]
jail/cocoon3/cocoon3-sample-webapp/pom.xml[Deleted - diff]
jail/cocoon3/pom.xml[diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/CustomException.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/action/CustomException.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/action/ErrorThrowingAction.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/classpath/ClasspathURLStreamHandlerFactory.java[Added - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/CacheableDemoRESTController.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTController.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect1.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/controller/DemoRESTControllerAspect2.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/generation/CachingTimestampGenerator.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource1.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/jaxrs/SampleJaxRsResource2.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/CocoonSampleWicketWebapp.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/HelloWicketPage.java - diff]
jail/cocoon3/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/java/org/apache/cocoon/sample/wicket/OtherPage.java - diff]
jail/cocoon3/src/main/resources/COB-INF/aggregation/include.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/include.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/aggregation/sub.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/sub.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/aggregation/xinclude.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/aggregation/xinclude.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/controller/demo.html[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/controller/demo.html - diff]
jail/cocoon3/src/main/resources/COB-INF/error-handling/404.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/404.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/error-handling/500.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/500.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/error-handling/501.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/501.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/error-handling/503.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/error-handling/503.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/fop/page.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/fop/page.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/fop/page2fo.xsl[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/fop/page2fo.xsl - diff]
jail/cocoon3/src/main/resources/COB-INF/i18n/base.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/i18n/base_de.properties[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_de.properties - diff]
jail/cocoon3/src/main/resources/COB-INF/i18n/base_en.properties[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_en.properties - diff]
jail/cocoon3/src/main/resources/COB-INF/i18n/base_es.properties[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_es.properties - diff]
jail/cocoon3/src/main/resources/COB-INF/i18n/base_it.properties[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/i18n/base_it.properties - diff]
jail/cocoon3/src/main/resources/COB-INF/linkrewriting/apache_home.html[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/linkrewriting/apache_home.html - diff]
jail/cocoon3/src/main/resources/COB-INF/overview.html[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/overview.html - diff]
jail/cocoon3/src/main/resources/COB-INF/read/cocoon.gif[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/cocoon.gif - diff]
jail/cocoon3/src/main/resources/COB-INF/read/favicon.ico[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/favicon.ico - diff]
jail/cocoon3/src/main/resources/COB-INF/read/javascript-resource[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/javascript-resource - diff]
jail/cocoon3/src/main/resources/COB-INF/read/javascript-resource.js[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/javascript-resource.js - diff]
jail/cocoon3/src/main/resources/COB-INF/read/style.css[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/read/style.css - diff]
jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/add-paragraph.xslt[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/add-paragraph.xslt - diff]
jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple-1.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple-1.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple-2.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple-2.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xsd[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xsd - diff]
jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/simple.xslt[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/simple.xslt - diff]
jail/cocoon3/src/main/resources/COB-INF/sax-pipeline/unauthorized.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sax-pipeline/unauthorized.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/sitemap.xmap[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/sitemap.xmap - diff]
jail/cocoon3/src/main/resources/COB-INF/string-template/template.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/string-template/template.xml - diff]
jail/cocoon3/src/main/resources/COB-INF/xslt/main.xslt[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/main.xslt - diff]
jail/cocoon3/src/main/resources/COB-INF/xslt/sub-file.xslt[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/sub-file.xslt - diff]
jail/cocoon3/src/main/resources/COB-INF/xslt/sub-servlet.xslt[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/COB-INF/xslt/sub-servlet.xslt - diff]
jail/cocoon3/src/main/resources/META-INF/cocoon/properties/cocoon-sample.properties[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/properties/cocoon-sample.properties - diff]
jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-controller.xml - diff]
jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-jaxrs.xml - diff]
jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml[Added - diff]
jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components-optional.xml - diff]
jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-sitemap-components.xml - diff]
jail/cocoon3/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/META-INF/cocoon/spring/cocoon-sample-wicket.xml - diff]
jail/cocoon3/src/main/resources/logback.xml[Renamed from jail/cocoon3/cocoon3-sample-webapp/src/main/resources/logback.xml - diff]
jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/org/apache/cocoon/sample/wicket/HelloWicketPage.html - diff]
jail/cocoon3/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html[Renamed from jail/cocoon3/cocoon3-sample-block/src/main/resources/org/apache/cocoon/sample/wicket/OtherPage.html - diff]
jail/cocoon3/src/main/webapp/WEB-INF/applicationContext.xml[Renamed from jail/cocoon3/cocoon3-sample-webapp/src/main/webapp/WEB-INF/applicationContext.xml - diff]
jail/cocoon3/src/main/webapp/WEB-INF/web.xml[Renamed from jail/cocoon3/cocoon3-sample-webapp/src/main/webapp/WEB-INF/web.xml - diff]

71 files changed

tree: 70ff2329c965ee94d81a6cf5c7368c20207d48d0