Author: ilgrosso
Date: Thu Dec 13 08:59:52 2012
New Revision: 1421147
URL: http://svn.apache.org/viewvc?rev=1421147&view=rev
Log:
[COCOON3-105] Making the blockcontext:/ protocol deprecated in favour of classpath:/ + jar:/
Added:
cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/
cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml (with props)
cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/
cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml (with props)
cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/
cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/cocoon-profiling-servlet-service.xml (with props)
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml (with props)
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/cocoon-sample-servlet-service.xml (with props)
cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ClasspathURLStreamHandlerFactory.java (with props)
cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-classpath-url-handler-factory.xml (with props)
cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/
cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml (with props)
Removed:
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/xpatch/cocoon-sample-block-deployment.xweb
Modified:
cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml
cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-context.xml
cocoon/cocoon3/trunk/cocoon-profiling/pom.xml
cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-component.xml
cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-servlet-service.xml
cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml
cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml
cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/web.xml
cocoon/cocoon3/trunk/cocoon-sample/pom.xml
cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
cocoon/cocoon3/trunk/cocoon-servlet/pom.xml
cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-collector.xml
cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-component.xml
cocoon/cocoon3/trunk/cocoon-shiro-sample/pom.xml
cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
cocoon/cocoon3/trunk/cocoon-shiro/src/main/resources/META-INF/cocoon/xpatch/shiro.xweb
cocoon/cocoon3/trunk/parent/pom.xml
cocoon/cocoon3/trunk/parent/src/docbkx/reference/web-applications.xml
Modified: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -21,11 +21,11 @@
<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
+ 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">
<bean name="${groupId}.${artifactId}.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
- <servlet:context mount-path="" context-path="blockcontext:/${artifactId}/"/>
+ <servlet:context mount-path="" context-path="jar:classpath:lib/${project.build.finalName}.jar!/COB-INF/"/>
</bean>
</beans>
Added: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml?rev=1421147&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ und
+-->
+<!-- $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ 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">
+
+ <bean name="${groupId}.${artifactId}.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
+ <servlet:context mount-path="" context-path="classpath:/COB-INF/"/>
+ </bean>
+
+</beans>
Propchange: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/cocoon3/trunk/cocoon-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Thu Dec 13 08:59:52 2012
@@ -25,14 +25,6 @@
<!-- Servlet Context Listener ======================================= -->
<!--
- - Declare a context listener that installs all blocks.
- -->
- <listener>
- <description>Declare a context listener that installs all blocks.</description>
- <listener-class>org.apache.cocoon.blockdeployment.BlockDeploymentServletContextListener</listener-class>
- </listener>
-
- <!--
- Declare Spring context listener which sets up the Spring Application Context
- containing all Cocoon components (and user defined beans as well).
-->
Modified: cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-databases-sample/pom.xml Thu Dec 13 08:59:52 2012
@@ -1,17 +1,17 @@
<?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. -->
+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: pom.xml 1155368 2011-08-09 13:56:40Z 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">
+ 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>jar</packaging>
@@ -26,10 +26,6 @@
<name>Apache Cocoon 3: Databases sample integration</name>
<description>org.cocoon.databases.sample: shows the usage of db in cocoon</description>
- <properties>
- <cocoon.version>3.0.0-beta-1-SNAPSHOT</cocoon.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.cocoon.servlet</groupId>
@@ -39,11 +35,6 @@
<groupId>org.apache.cocoon.stringtemplate</groupId>
<artifactId>cocoon-stringtemplate</artifactId>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Spring (+ AOP support) -->
<dependency>
@@ -131,6 +122,21 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>META-INF/cocoon/spring/**</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources/META-INF/cocoon/spring</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.outputDirectory}/META-INF/cocoon/spring</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -186,7 +192,7 @@
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
+ only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Modified: cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -21,11 +21,13 @@
<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">
+ 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">
<bean name="org.cocoon.databases.sample.cocoon-databases-sample.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
- <servlet:context mount-path="" context-path="blockcontext:/cocoon-databases-sample/"/>
+ <servlet:context mount-path="" context-path="jar:classpath:lib/${project.build.finalName}.jar!/COB-INF/"/>
</bean>
</beans>
Modified: cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-context.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-context.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-context.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/cocoon-databases-context.xml Thu Dec 13 08:59:52 2012
@@ -17,23 +17,16 @@ limitations under the License.
-->
<!-- $Id: block-application-context.xml 697547 2008-09-21 16:52:48Z reinhard $ -->
<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:util="http://www.springframework.org/schema/util"
- xmlns:pipeline="http://cocoon.apache.org/schema/pipeline"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
- http://cocoon.apache.org/schema/pipeline http://cocoon.apache.org/schema/pipeline/cocoon-pipeline-1.0.xsd">
- <bean id="dataSource" destroy-method="close"
- class="org.apache.commons.dbcp.BasicDataSource">
- <!-- Using properties to be able to override the values easy -->
- <property name="driverClassName" value="${jdbc.driverClassName}"/>
- <property name="url" value="${jdbc.url}"/>
- <property name="username" value="${jdbc.username}"/>
- <property name="password" value="${jdbc.password}"/>
- </bean>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="dataSource" destroy-method="close" class="org.apache.commons.dbcp.BasicDataSource">
+ <!-- Using properties to be able to override the values easy -->
+ <property name="driverClassName" value="${jdbc.driverClassName}"/>
+ <property name="url" value="${jdbc.url}"/>
+ <property name="username" value="${jdbc.username}"/>
+ <property name="password" value="${jdbc.password}"/>
+ </bean>
</beans>
Added: cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml?rev=1421147&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ und
+-->
+<!-- $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ 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">
+
+ <bean name="org.cocoon.databases.sample.cocoon-databases-sample.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
+ <servlet:context mount-path="" context-path="classpath:/COB-INF/"/>
+ </bean>
+
+</beans>
Propchange: cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/cocoon3/trunk/cocoon-databases-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/cocoon3/trunk/cocoon-profiling/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/pom.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/pom.xml Thu Dec 13 08:59:52 2012
@@ -10,122 +10,137 @@
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<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>jar</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
- <parent>
- <groupId>org.apache.cocoon.parent</groupId>
- <artifactId>cocoon-parent</artifactId>
- <version>3.0.0-beta-1-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
-
- <groupId>org.apache.cocoon.profiling</groupId>
- <artifactId>cocoon-profiling</artifactId>
+ <parent>
+ <groupId>org.apache.cocoon.parent</groupId>
+ <artifactId>cocoon-parent</artifactId>
<version>3.0.0-beta-1-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.cocoon.profiling</groupId>
+ <artifactId>cocoon-profiling</artifactId>
+ <version>3.0.0-beta-1-SNAPSHOT</version>
- <name>Apache Cocoon 3: Profiling</name>
- <description>Cocoon 3 profiling components.</description>
+ <name>Apache Cocoon 3: Profiling</name>
+ <description>Cocoon 3 profiling components.</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.cocoon.pipeline</groupId>
- <artifactId>cocoon-pipeline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.sitemap</groupId>
- <artifactId>cocoon-sitemap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.rest</groupId>
- <artifactId>cocoon-rest</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon.pipeline</groupId>
+ <artifactId>cocoon-pipeline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.sitemap</groupId>
+ <artifactId>cocoon-sitemap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.rest</groupId>
+ <artifactId>cocoon-rest</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+
+ <!-- dependencies for tests -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon.servlet</groupId>
+ <artifactId>cocoon-servlet</artifactId>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>META-INF/cocoon/spring/**</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources/META-INF/cocoon/spring</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.outputDirectory}/META-INF/cocoon/spring</targetPath>
+ </resource>
+ </resources>
- <!-- dependencies for tests -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon.servlet</groupId>
- <artifactId>cocoon-servlet</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Cocoon-Block-Name>${project.artifactId}</Cocoon-Block-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-component.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-component.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-component.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-component.xml Thu Dec 13 08:59:52 2012
@@ -10,27 +10,28 @@
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<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">
+ 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.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop.xsd
+ http://cocoon.apache.org/schema/configurator
+ http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
<!-- spring -->
<bean id="org.apache.cocoon.profiling.spring.AutomaticProfilerInstaller"
- class="org.apache.cocoon.profiling.spring.AutomaticProfilerInstaller"
- init-method="installProfilers">
+ class="org.apache.cocoon.profiling.spring.AutomaticProfilerInstaller"
+ init-method="installProfilers">
<property name="servletInvocationDispatcher" ref="org.apache.cocoon.profiling.aspects.ServletInvocationDispatcher" />
<property name="pipelineComponentInvocationDispatcher" ref="org.apache.cocoon.profiling.aspects.PipelineComponentInvocationDispatcher" />
<property name="pipelineInvocationDispatcher" ref="org.apache.cocoon.profiling.aspects.PipelineInvocationDispatcher" />
@@ -97,12 +98,12 @@
</bean>
<bean id="org.apache.cocoon.profiling.data.ProfilingDataHolder" class="org.apache.cocoon.profiling.data.EhCacheProfilingDataHolder" init-method="setupCache">
- <property name="cacheManager" ref="cacheManager"/>
- <property name="cacheName" value="profilingCache" />
+ <property name="cacheManager" ref="cacheManager"/>
+ <property name="cacheName" value="profilingCache" />
</bean>
<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
- <property name="configLocation" value="classpath:/META-INF/ehcache/cocoon-profiling-ehcache.xml" />
+ <property name="configLocation" value="classpath:/META-INF/ehcache/cocoon-profiling-ehcache.xml" />
</bean>
<bean id="org.apache.cocoon.profiling.data.ProfilingIdGenerator" class="org.apache.cocoon.profiling.data.UUIDProfilingIdGenerator" />
Modified: cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-servlet-service.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-servlet-service.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/cocoon-profiling-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -19,12 +19,14 @@
-->
<!-- $Id$ -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:servlet="http://cocoon.apache.org/schema/servlet"
- 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">
+ 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">
<bean id="org.apache.cocoon.profiling.servlet" class="org.apache.cocoon.servlet.XMLSitemapServlet">
- <servlet:context mount-path="/cocoon-profiling" context-path="blockcontext:/cocoon-profiling/"/>
+ <servlet:context mount-path="/cocoon-profiling" context-path="jar:classpath:lib/${project.build.finalName}.jar!/COB-INF/"/>
</bean>
</beans>
Added: cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/cocoon-profiling-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/cocoon-profiling-servlet-service.xml?rev=1421147&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/cocoon-profiling-servlet-service.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/cocoon-profiling-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ und
+-->
+<!-- $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ 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">
+
+ <bean id="org.apache.cocoon.profiling.servlet" class="org.apache.cocoon.servlet.XMLSitemapServlet">
+ <servlet:context mount-path="/cocoon-profiling" context-path="classpath:/COB-INF/"/>
+ </bean>
+</beans>
Propchange: cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/cocoon-profiling-servlet-service.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/cocoon-profiling-servlet-service.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/cocoon3/trunk/cocoon-profiling/src/main/resources/META-INF/cocoon/spring/dev/cocoon-profiling-servlet-service.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/pom.xml Thu Dec 13 08:59:52 2012
@@ -10,16 +10,16 @@
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.
- -->
-<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">
+ 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.
+-->
+<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>
<groupId>org.apache.cocoon.parent</groupId>
@@ -27,16 +27,30 @@
<version>3.0.0-beta-1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
+
<artifactId>cocoon-rest-optional</artifactId>
<groupId>org.apache.cocoon.rest.optional</groupId>
<name>Apache cocoon 3: Optional REST components</name>
<description>org.cocoon.rest.optional:cocoon-rest-optional:3.0.0-beta-1-SNAPSHOT</description>
- <build>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>META-INF/cocoon/spring/**</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources/META-INF/cocoon/spring</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.outputDirectory}/META-INF/cocoon/spring</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-maven-plugin</artifactId>
<executions>
@@ -112,7 +126,7 @@
</plugin>
</plugins>
</pluginManagement>
- </build>
+ </build>
<dependencies>
<!-- REST -->
<dependency>
Modified: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -25,7 +25,7 @@
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
<bean name="org.cocoon.rest.optional.cocoon-rest-optional.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
- <servlet:context mount-path="" context-path="blockcontext:/cocoon-rest-optional/"/>
+ <servlet:context mount-path="" context-path="jar:classpath:lib/${project.build.finalName}.jar!/COB-INF/"/>
</bean>
</beans>
Added: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml?rev=1421147&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ und
+-->
+<!-- $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ 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">
+
+ <bean name="org.cocoon.rest.optional.cocoon-rest-optional.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
+ <servlet:context mount-path="" context-path="classpath:/COB-INF/"/>
+ </bean>
+
+</beans>
Propchange: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/cocoon3/trunk/cocoon-rest-optional/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml Thu Dec 13 08:59:52 2012
@@ -92,6 +92,12 @@
<artifactId>cocoon-it-fw</artifactId>
<configuration>
<webAppDirectory>./target/cocoon-sample-webapp-${project.version}</webAppDirectory>
+ <systemProperties>
+ <property>
+ <name>org.apache.cocoon.mode</name>
+ <value>prod</value>
+ </property>
+ </systemProperties>
</configuration>
<executions>
<execution>
Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/web.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/main/webapp/WEB-INF/web.xml Thu Dec 13 08:59:52 2012
@@ -25,14 +25,6 @@
<!-- Servlet Context Listener ======================================= -->
<!--
- - Declare a context listener that installs all blocks.
- -->
- <listener>
- <description>Declare a context listener that installs all blocks.</description>
- <listener-class>org.apache.cocoon.blockdeployment.BlockDeploymentServletContextListener</listener-class>
- </listener>
-
- <!--
- Declare Spring context listener which sets up the Spring Application Context
- containing all Cocoon components (and user defined beans as well).
-->
Modified: cocoon/cocoon3/trunk/cocoon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/pom.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/pom.xml Thu Dec 13 08:59:52 2012
@@ -132,6 +132,21 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>META-INF/cocoon/spring/**</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources/META-INF/cocoon/spring</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.outputDirectory}/META-INF/cocoon/spring</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/cocoon-sample-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -19,19 +19,21 @@
-->
<!-- $Id$ -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:servlet="http://cocoon.apache.org/schema/servlet"
- 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">
+ 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="blockcontext:/cocoon-sample/" />
+ <servlet:context mount-path="" context-path="jar:classpath:lib/${project.build.finalName}.jar!/COB-INF/"/>
</bean>
<!-- A servlet-service that exposes JAX-RS REST endpoints. -->
<bean id="org.apache.cocoon.sample.rest.servlet" class="org.apache.cocoon.rest.jaxrs.container.CocoonJAXRSServlet">
- <servlet:context mount-path="/jax-rs" context-path="blockcontext:/cocoon-sample/">
+ <servlet:context mount-path="/jax-rs" context-path="jar:classpath:lib/${project.build.finalName}.jar!/COB-INF/">
<servlet:connections>
<entry key="sample" value-ref="org.apache.cocoon.sample.servlet" />
</servlet:connections>
Added: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/cocoon-sample-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/cocoon-sample-servlet-service.xml?rev=1421147&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/cocoon-sample-servlet-service.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/cocoon-sample-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ und
+-->
+<!-- $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ 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="classpath:/COB-INF/">
+ <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>
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/cocoon-sample-servlet-service.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/cocoon-sample-servlet-service.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/cocoon3/trunk/cocoon-sample/src/main/resources/META-INF/cocoon/spring/dev/cocoon-sample-servlet-service.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/cocoon3/trunk/cocoon-servlet/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/pom.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/pom.xml Thu Dec 13 08:59:52 2012
@@ -65,10 +65,6 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-jnet</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-block-deployment</artifactId>
- </dependency>
<!-- Spring AOP support -->
<dependency>
Added: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ClasspathURLStreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ClasspathURLStreamHandlerFactory.java?rev=1421147&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ClasspathURLStreamHandlerFactory.java (added)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ClasspathURLStreamHandlerFactory.java Thu Dec 13 08:59:52 2012
@@ -0,0 +1,62 @@
+/*
+ * 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.servlet;
+
+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 static class ClasspathURLStreamHandler extends URLStreamHandler {
+
+ @Override
+ protected URLConnection openConnection(final URL url)
+ throws IOException {
+
+ final URL webinfClasses = Thread.currentThread().getContextClassLoader().getResource("/");
+ URL resourceUrl = new URL(webinfClasses, "../" + url.getPath());
+
+ if (resourceUrl == null) {
+ resourceUrl = Thread.currentThread().getContextClassLoader().getResource(url.getPath());
+ }
+
+ if (resourceUrl == null) {
+ throw new FileNotFoundException(url.toExternalForm());
+ }
+
+ return resourceUrl.openConnection();
+ }
+ }
+}
Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ClasspathURLStreamHandlerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ClasspathURLStreamHandlerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ClasspathURLStreamHandlerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-classpath-url-handler-factory.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-classpath-url-handler-factory.xml?rev=1421147&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-classpath-url-handler-factory.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-classpath-url-handler-factory.xml Thu Dec 13 08:59:52 2012
@@ -0,0 +1,27 @@
+<?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$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean class="org.apache.cocoon.servlet.ClasspathURLStreamHandlerFactory"/>
+</beans>
Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-classpath-url-handler-factory.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-classpath-url-handler-factory.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-classpath-url-handler-factory.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-collector.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-collector.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-collector.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-collector.xml Thu Dec 13 08:59:52 2012
@@ -10,31 +10,33 @@
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- $Id: cocoon-servlet-node.xml 647814 2008-04-14 14:28:00Z 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">
+ 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.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop.xsd">
- <aop:aspectj-autoproxy proxy-target-class="false" />
+ <aop:aspectj-autoproxy proxy-target-class="false" />
- <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <property name="staticMethod" value="org.apache.cocoon.servlet.collector.ResponseHeaderCollector.setCollectorDataStore"/>
- <property name="arguments">
- <list>
- <bean class="org.apache.cocoon.servlet.collector.CallStackCollectorDataStore" />
- </list>
- </property>
- </bean>
+ <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="staticMethod" value="org.apache.cocoon.servlet.collector.ResponseHeaderCollector.setCollectorDataStore"/>
+ <property name="arguments">
+ <list>
+ <bean class="org.apache.cocoon.servlet.collector.CallStackCollectorDataStore" />
+ </list>
+ </property>
+ </bean>
- <bean id="org.apache.cocoon.servlet.collector.ResponseHeaderCollector"
- class="org.apache.cocoon.servlet.collector.ResponseHeaderCollector"/>
+ <bean id="org.apache.cocoon.servlet.collector.ResponseHeaderCollector"
+ class="org.apache.cocoon.servlet.collector.ResponseHeaderCollector"/>
</beans>
Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-component.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-component.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-component.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-component.xml Thu Dec 13 08:59:52 2012
@@ -10,17 +10,18 @@
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- $Id: cocoon-servlet-component.xml 647856 2008-04-14 15:40:50Z reinhard $ -->
<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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean name="redirector" class="org.apache.cocoon.servlet.component.RedirectorComponent" scope="prototype" />
Modified: cocoon/cocoon3/trunk/cocoon-shiro-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-shiro-sample/pom.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-shiro-sample/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-shiro-sample/pom.xml Thu Dec 13 08:59:52 2012
@@ -16,7 +16,8 @@
limitations under the License.
-->
<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">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cocoon.parent</groupId>
@@ -28,7 +29,23 @@
<artifactId>cocoon-shiro-sample</artifactId>
<name>Apache Cocoon 3: Shiro sample integration</name>
<description>org.apache.cocoon.parent:cocoon-shiro-sample:3.0.0-beta-1-SNAPSHOT</description>
+
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>META-INF/cocoon/spring/**</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources/META-INF/cocoon/spring</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.outputDirectory}/META-INF/cocoon/spring</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
Modified: cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/block-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -25,7 +25,7 @@
http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
<bean name="org.apache.cocoon.parent.cocoon-shiro-sample.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
- <servlet:context mount-path="" context-path="blockcontext:/cocoon-shiro-sample/"/>
+ <servlet:context mount-path="" context-path="jar:classpath:lib/${project.build.finalName}.jar!/COB-INF/"/>
</bean>
</beans>
Added: cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml?rev=1421147&view=auto
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml (added)
+++ cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml Thu Dec 13 08:59:52 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ und
+-->
+<!-- $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ 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">
+
+ <bean name="org.apache.cocoon.parent.cocoon-shiro-sample.service" class="org.apache.cocoon.servlet.XMLSitemapServlet">
+ <servlet:context mount-path="" context-path="classpath:/COB-INF/"/>
+ </bean>
+
+</beans>
Propchange: cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/META-INF/cocoon/spring/dev/block-servlet-service.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/cocoon3/trunk/cocoon-shiro/src/main/resources/META-INF/cocoon/xpatch/shiro.xweb
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-shiro/src/main/resources/META-INF/cocoon/xpatch/shiro.xweb?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-shiro/src/main/resources/META-INF/cocoon/xpatch/shiro.xweb (original)
+++ cocoon/cocoon3/trunk/cocoon-shiro/src/main/resources/META-INF/cocoon/xpatch/shiro.xweb Thu Dec 13 08:59:52 2012
@@ -38,7 +38,4 @@
<filter-name>shiroFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
- <listener>
- <listener-class>org.apache.cocoon.blockdeployment.BlockDeploymentServletContextListener</listener-class>
- </listener>
</xweb>
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Thu Dec 13 08:59:52 2012
@@ -10,13 +10,13 @@
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- $Id$ -->
<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">
@@ -223,7 +223,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-impl</artifactId>
- <version>1.3.1</version>
+ <version>1.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -237,11 +237,6 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-block-deployment</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-jnet</artifactId>
<version>1.2.2</version>
</dependency>
@@ -624,7 +619,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-it-fw</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -666,6 +661,15 @@
</repositories>
<pluginRepositories>
+ <!-- TMP, for cocoon-it-fw:1.0.1-SNAPSHOT -->
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
<pluginRepository>
<id>agilejava</id>
<url>http://agilejava.com/maven</url>
@@ -910,7 +914,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-it-fw</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/cocoon3/trunk/parent/src/docbkx/reference/web-applications.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/src/docbkx/reference/web-applications.xml?rev=1421147&r1=1421146&r2=1421147&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/src/docbkx/reference/web-applications.xml (original)
+++ cocoon/cocoon3/trunk/parent/src/docbkx/reference/web-applications.xml Thu Dec 13 08:59:52 2012
@@ -259,7 +259,7 @@ public class SampleRestResource {
<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/">
+ context-path="classpath:/COB-INF/">
<servlet:connections>
<entry key="sample" value-ref="org.apache.cocoon.sample.servlet" />
</servlet:connections>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.