You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2007/01/14 12:03:08 UTC
svn commit: r496060 - in /cocoon/trunk/core/cocoon-servlet-service: ./
cocoon-servlet-service-demo1/ cocoon-servlet-service-demo2/
cocoon-servlet-service-impl/
cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/blocks/
cocoon-servlet-service-s...
Author: danielf
Date: Sun Jan 14 03:03:06 2007
New Revision: 496060
URL: http://svn.apache.org/viewvc?view=rev&rev=496060
Log:
Preparing change of name from blocks-fw to servlet-service. As I will do some refactorings and configuration changes. I will keep a copy of the original modules until the new module stabilizes.
Added:
cocoon/trunk/core/cocoon-servlet-service/
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo1/
- copied from r496059, cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo2/
- copied from r496059, cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/
- copied from r496059, cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/
- copied from r496059, cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-sample/
Modified:
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo1/pom.xml
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo2/pom.xml
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/blocks/DynamicProxyRequestHandler.java
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo1/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo1/pom.xml?view=diff&rev=496060&r1=496059&r2=496060
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo1/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo1/pom.xml Sun Jan 14 03:03:06 2007
@@ -30,14 +30,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-demo1</artifactId>
+ <artifactId>cocoon-servlet-service-demo1</artifactId>
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Cocoon Blocks Framework Demo Block 1</name>
+ <name>Cocoon Servlet Service Demo Block 1</name>
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-impl</artifactId>
+ <artifactId>cocoon-servlet-service-impl</artifactId>
<version>1.0.0-M2-SNAPSHOT</version>
</dependency>
<dependency>
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-demo2</artifactId>
+ <artifactId>cocoon-servlet-service-demo2</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo2/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo2/pom.xml?view=diff&rev=496060&r1=496059&r2=496060
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo2/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-demo2/pom.xml Sun Jan 14 03:03:06 2007
@@ -30,14 +30,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-demo2</artifactId>
+ <artifactId>cocoon-servlet-service-demo2</artifactId>
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Cocoon Blocks Framework Demo Block 2</name>
+ <name>Cocoon Servlet Service Demo Block 2</name>
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-impl</artifactId>
+ <artifactId>cocoon-servlet-service-impl</artifactId>
<version>1.0.0-M2-SNAPSHOT</version>
</dependency>
<dependency>
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml?view=diff&rev=496060&r1=496059&r2=496060
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml Sun Jan 14 03:03:06 2007
@@ -29,12 +29,12 @@
<version>3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>cocoon-blocks-fw-impl</artifactId>
+ <artifactId>cocoon-servlet-service-impl</artifactId>
<packaging>jar</packaging>
<version>1.0.0-M2-SNAPSHOT</version>
- <name>Cocoon Blocks Framework Implementation</name>
+ <name>Cocoon Servlet Service Implementation</name>
<description>${project.name}</description>
- <url>http://cocoon.apache.org/${docs.m.blocks-fw-impl.relPath}</url>
+ <!--url>http://cocoon.apache.org/${docs.m.servlet-service-impl.relPath}</url-->
<dependencies>
<dependency>
@@ -87,17 +87,17 @@
</resource>
</resources>
</build>
-
+ <!--
<properties>
<docs.name>${project.name}</docs.name>
- <docs.version>${docs.m.blocks-fw-impl.version}</docs.version>
+ <docs.version>${docs.m.servlet-service-impl.version}</docs.version>
</properties>
<distributionManagement>
<site>
<id>website</id>
- <url>${docs.deploymentBaseUrl}/${docs.m.blocks-fw-impl.relPath}</url>
+ <url>${docs.deploymentBaseUrl}/${docs.m.servlet-service-impl.relPath}</url>
</site>
</distributionManagement>
-
+ -->
</project>
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/blocks/DynamicProxyRequestHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/blocks/DynamicProxyRequestHandler.java?view=diff&rev=496060&r1=496059&r2=496060
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/blocks/DynamicProxyRequestHandler.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/blocks/DynamicProxyRequestHandler.java Sun Jan 14 03:03:06 2007
@@ -25,7 +25,7 @@
* getServletPath and getPathInfo methods to relect the mount
* path of the block servlet.
*
- * @version $Id:$
+ * @version $Id$
*/
public class DynamicProxyRequestHandler implements InvocationHandler {
private final HttpServletRequest wrapped;
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml?view=diff&rev=496060&r1=496059&r2=496060
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml Sun Jan 14 03:03:06 2007
@@ -29,10 +29,10 @@
<version>3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>cocoon-blocks-fw-sample</artifactId>
+ <artifactId>cocoon-servlet-service-sample</artifactId>
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Cocoon Blocks Framework Sample Blocks</name>
+ <name>Cocoon Servlet Service Sample Blocks</name>
<build>
<plugins>
<plugin>
@@ -52,7 +52,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-impl</artifactId>
+ <artifactId>cocoon-servlet-service-impl</artifactId>
<version>1.0.0-M2-SNAPSHOT</version>
</dependency>
</dependencies>