You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/04/16 15:39:32 UTC
svn commit: r648694 - in /cocoon/whiteboard/corona/trunk/corona-servlet:
pom.xml src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java
src/main/java/org/apache/excalibur/
Author: reinhard
Date: Wed Apr 16 06:39:26 2008
New Revision: 648694
URL: http://svn.apache.org/viewvc?rev=648694&view=rev
Log:
. JNet was moved to cocoon/trunk/subprojects/cocoon-jnet
. use AOP to setup JNet
Removed:
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/
Modified:
cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml?rev=648694&r1=648693&r2=648694&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml Wed Apr 16 06:39:26 2008
@@ -18,8 +18,7 @@
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">
+<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>
@@ -37,6 +36,7 @@
<description>Using Cocoon Corona within the Servlet Service framework.</description>
<dependencies>
+ <!-- Corona -->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>corona-sitemap</artifactId>
@@ -46,27 +46,17 @@
<artifactId>corona-controller</artifactId>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>corona-image</artifactId>
- </dependency>
- -->
-
+ <!-- Cocoon subprojects -->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-impl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-sourceresolve</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-spring-configurator</artifactId>
</dependency>
+
+ <!-- Spring AOP support -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
@@ -79,15 +69,15 @@
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
</dependency>
+
+ <!-- Other libraries -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <!-- Excalibur dependencies (Source Resolving) -->
- <!-- tbd -->
-
+ <!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -102,7 +92,6 @@
<artifactId>cocoon-maven-plugin</artifactId>
<configuration>
<webappProfile>ssf</webappProfile>
- <!-- reloadingClassLoaderEnabled>false</reloadingClassLoaderEnabled-->
</configuration>
</plugin>
<plugin>
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java?rev=648694&r1=648693&r2=648694&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java Wed Apr 16 06:39:26 2008
@@ -39,8 +39,6 @@
import org.apache.cocoon.corona.sitemap.InvocationImpl;
import org.apache.cocoon.corona.sitemap.SitemapBuilder;
import org.apache.cocoon.corona.sitemap.node.Sitemap;
-import org.apache.excalibur.sourceresolve.jnet.DynamicURLStreamHandlerFactory;
-import org.apache.excalibur.sourceresolve.jnet.URLStreamHandlerFactoryInstaller;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -60,8 +58,6 @@
SitemapBuilder sitemapBuilder = (SitemapBuilder) this.beanFactory.getBean(SitemapBuilder.class.getName());
URL url = servletConfig.getServletContext().getResource("/sitemap.xmap");
this.sitemap = sitemapBuilder.build(url);
-
- URLStreamHandlerFactoryInstaller.setURLStreamHandlerFactory(new DynamicURLStreamHandlerFactory());
} catch (Exception e) {
throw new ServletException(e);
}
@@ -85,7 +81,6 @@
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
try {
- DynamicURLStreamHandlerFactory.push(new ServletURLStreamHandlerFactory());
SitemapDelegator.setSitemapServlet(this);
// assemble parameters
@@ -104,7 +99,6 @@
writer.close();
} finally {
SitemapDelegator.removeSitemapServlet();
- DynamicURLStreamHandlerFactory.pop();
}
}