cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r650234 - in /cocoon/trunk: ./ core/cocoon-servlet-service/cocoon-servlet-service-components-sample/ core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/java/org/ core/cocoon-servlet-service/cocoon-servlet-service-...
Date Mon, 21 Apr 2008 19:44:39 GMT
Author: reinhard
Date: Mon Apr 21 12:44:24 2008
New Revision: 650234

URL: http://svn.apache.org/viewvc?rev=650234&view=rev
Log:
. fix mount paths of ssf samples (after the split up)
. set version numbers of samples
. fix paths of integration tests

Removed:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/java/org/
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/COB-INF/overview/sitemap.xmap
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/COB-INF/test1/
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/COB-INF/test2/
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/COB-INF/test3/
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-overview-servletService.xml
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService1.xml
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService2.xml
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService3.xml
Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-overview-servletService.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService1.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService2.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService3.xml
    cocoon/trunk/core/cocoon-webapp/pom.xml
    cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/BlockPathModule.java
    cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/RequestInformationPassing.java
    cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletConnection.java
    cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletProtocol.java
    cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/SubSitemaps.java
    cocoon/trunk/parent/pom.xml
    cocoon/trunk/pom.xml
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo1-servletService.xml
    cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo2-servletService.xml
    cocoon/trunk/subprojects/pom.xml

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/pom.xml
Mon Apr 21 12:44:24 2008
@@ -17,10 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+<!-- $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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -29,10 +26,10 @@
     <version>6-SNAPSHOT</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
-  <artifactId>cocoon-servlet-service-sample</artifactId>
+  <artifactId>cocoon-servlet-service-components-sample</artifactId>
   <packaging>jar</packaging>
   <version>1.0.0-SNAPSHOT</version>
-  <name>Cocoon Servlet Service Sample Blocks</name>
+  <name>Cocoon Servlet Service Components Sample Blocks</name>
 
   <build>
     <plugins>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-overview-servletService.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-overview-servletService.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-overview-servletService.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-overview-servletService.xml
Mon Apr 21 12:44:24 2008
@@ -26,7 +26,7 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
 	<bean name="org.apache.cocoon.servletservice.sample.overview.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
-	  <servlet:context mount-path="/cocoon-servlet-service-sample/" context-path="blockcontext:/cocoon-servlet-service-sample/overview"/>
+	  <servlet:context mount-path="/cocoon-servlet-service-components-sample/" context-path="blockcontext:/cocoon-servlet-service-components-sample/overview"/>
 	</bean>
 
 </beans>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService1.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService1.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService1.xml
Mon Apr 21 12:44:24 2008
@@ -26,7 +26,7 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
 	<bean name="org.apache.cocoon.servletservice.sample.servlet1" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/cocoon-servlet-service-sample1" context-path="blockcontext:/cocoon-servlet-service-sample/test1">
+    <servlet:context mount-path="/cocoon-servlet-service-components-sample/1" context-path="blockcontext:/cocoon-servlet-service-components-sample/test1">
       <servlet:init-params>
         <entry key="foo" value="bar"/>
       </servlet:init-params>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService2.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService2.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService2.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService2.xml
Mon Apr 21 12:44:24 2008
@@ -24,6 +24,6 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
 	<bean id="org.apache.cocoon.servletservice.sample.servlet2" class="org.apache.cocoon.sitemap.SitemapServlet">
-    	<servlet:context mount-path="/cocoon-servlet-service-sample2" context-path="blockcontext:/cocoon-servlet-service-sample/test2"/>
+    	<servlet:context mount-path="/cocoon-servlet-service-components-sample/2" context-path="blockcontext:/cocoon-servlet-service-components-sample/test2"/>
 	</bean>
 </beans>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService3.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService3.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService3.xml
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-sample-servletService3.xml
Mon Apr 21 12:44:24 2008
@@ -26,7 +26,7 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
 	<bean name="org.apache.cocoon.servletservice.sample.servlet3" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/cocoon-servlet-service-sample3" context-path="blockcontext:/cocoon-servlet-service-sample/test3">
+    <servlet:context mount-path="/cocoon-servlet-service-components-sample/3" context-path="blockcontext:/cocoon-servlet-service-components-sample/test3">
       <servlet:init-params>
         <entry key="bar" value="gazonk"/>
         <entry key="baz" value="blah"/>

Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Mon Apr 21 12:44:24 2008
@@ -98,9 +98,17 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-servlet-service-sample</artifactId>
+      <artifactId>cocoon-servlet-service-impl-sample</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-servlet-service-impl-sample</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-servlet-service-components-sample</artifactId>
+    </dependency>
+	
     <!-- Cocoon Sample Blocks -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/BlockPathModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/BlockPathModule.java?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/BlockPathModule.java
(original)
+++ cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/BlockPathModule.java
Mon Apr 21 12:44:24 2008
@@ -23,10 +23,10 @@
 public class BlockPathModule extends HtmlUnitTestCase {
 
     public void testSimplePipelineFromSubSitemap() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/sub/abs");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/sub/abs");
         Assert.assertTrue(this.response.getStatusCode() == 200);
-        assertXPath("/properties/@other", "/cocoon-servlet-service-sample2/test");
-        assertXPath("/properties/@abs", "/cocoon-servlet-service-sample1/test");
+        assertXPath("/properties/@other", "/cocoon-servlet-service-components-sample/2/test");
+        assertXPath("/properties/@abs", "/cocoon-servlet-service-components-sample/1/test");
     }
 
 }

Modified: cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/RequestInformationPassing.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/RequestInformationPassing.java?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/RequestInformationPassing.java
(original)
+++ cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/RequestInformationPassing.java
Mon Apr 21 12:44:24 2008
@@ -24,7 +24,7 @@
 
     public void testAttributes() throws Exception {
         this.webClient.addRequestHeader("my-header-param", "6");
-        this.loadXmlPage("test1/test4?foo=5");
+        this.loadXmlPage("cocoon-servlet-service-impl-sample/test1/test4?foo=5");
         Assert.assertTrue(this.response.getStatusCode() == 200);
 
         // external request

Modified: cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletConnection.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletConnection.java?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletConnection.java
(original)
+++ cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletConnection.java
Mon Apr 21 12:44:24 2008
@@ -23,27 +23,27 @@
 public class ServletConnection extends HtmlUnitTestCase {
 
     public void testRequestDispatcher() throws Exception {
-        this.loadResponse("test1/test3");
+        this.loadResponse("cocoon-servlet-service-impl-sample/test1/test3");
         Assert.assertTrue(this.response.getStatusCode() == 200);
     }
 
     public void testSourceResolver() throws Exception {
-        this.loadResponse("test1/test2");
+        this.loadResponse("cocoon-servlet-service-impl-sample/test1/test2");
         Assert.assertTrue(this.response.getStatusCode() == 200);
     }
 
     public void testRelativeServletConnection1() throws Exception {
-        this.loadResponse("test1/test5");
+        this.loadResponse("cocoon-servlet-service-impl-sample/test1/test5");
         Assert.assertTrue(this.response.getStatusCode() == 200);
     }
 
     public void testRelativeServletConnection2() throws Exception {
-        this.loadResponse("test1/test6");
+        this.loadResponse("cocoon-servlet-service-impl-sample/test1/test6");
         Assert.assertTrue(this.response.getStatusCode() == 200);
     }
 
     public void testRelativeServletConnectionErrorStatusCode() throws Exception {
-        this.loadResponse("test1/test9");
+        this.loadResponse("cocoon-servlet-service-impl-sample/test1/test9");
         assertTrue(this.response.getContentAsString().indexOf("Forbidden") > 0);
         Assert.assertTrue(this.response.getStatusCode() == 403);
     }

Modified: cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletProtocol.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletProtocol.java?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletProtocol.java
(original)
+++ cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ServletProtocol.java
Mon Apr 21 12:44:24 2008
@@ -23,43 +23,43 @@
 public class ServletProtocol extends HtmlUnitTestCase {
 
     public void testSimplePipeline() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/test");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/test");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/test", "some-text");
     }
 
     public void testSimpleServletProtocol() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/test2");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/test2");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/test2", "some-text");
     }
 
     public void testServletProtocolSelfReferencing() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/test3");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/test3");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/test", "some-text");
     }
 
     public void testResourceReading() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/test4");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/test4");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/test-resource", "some-text");
     }
 
     public void testServletServiceGenerator() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/test5");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/test5");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/test-result/original-content/test", "some-text");
     }
 
     public void testServletServiceTransformer() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/test6");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/test6");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/test-result/original-content/test", "some-text");
     }
 
     public void testServletServiceSerializer() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/test7");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/test7");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/test-result/original-content/test", "some-text");
     }

Modified: cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/SubSitemaps.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/SubSitemaps.java?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/SubSitemaps.java
(original)
+++ cocoon/trunk/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/SubSitemaps.java
Mon Apr 21 12:44:24 2008
@@ -23,13 +23,13 @@
 public class SubSitemaps extends HtmlUnitTestCase {
 
     public void testSimplePipelineFromSubSitemap() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/sub/test");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/sub/test");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/sub/text()", "");
     }
 
     public void testServletProtocolFromSubSitemap() throws Exception {
-        this.loadXmlPage("cocoon-servlet-service-sample1/sub/test3");
+        this.loadXmlPage("cocoon-servlet-service-components-sample/1/sub/test3");
         Assert.assertTrue(this.response.getStatusCode() == 200);
         assertXPath("/test", "some-text");
     }

Modified: cocoon/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/parent/pom.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/parent/pom.xml (original)
+++ cocoon/trunk/parent/pom.xml Mon Apr 21 12:44:24 2008
@@ -2794,12 +2794,17 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-servlet-service-components-sample</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+      </dependency>	  	  
+      <dependency>
+        <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-servlet-service-impl</artifactId>
         <version>1.1.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
-        <artifactId>cocoon-servlet-service-sample</artifactId>
+        <artifactId>cocoon-servlet-service-impl-sample</artifactId>
         <version>1.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Apr 21 12:44:24 2008
@@ -43,11 +43,8 @@
     <module>dists</module>
     <!-- sub projects -->
     <module>subprojects</module>
-    <module>core/cocoon-configuration/cocoon-configuration-api</module>
-    <module>core/cocoon-configuration/cocoon-spring-configurator</module>
     <module>core/cocoon-servlet-service/cocoon-servlet-service-components</module>
-    <module>core/cocoon-servlet-service/cocoon-servlet-service-impl</module>
-    <module>core/cocoon-servlet-service/cocoon-servlet-service-sample</module>
+    <module>core/cocoon-servlet-service/cocoon-servlet-service-components-sample</module>
   </modules>
 
   <organization>

Modified: cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml
(original)
+++ cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/pom.xml
Mon Apr 21 12:44:24 2008
@@ -29,10 +29,10 @@
     <version>6-SNAPSHOT</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
-  <artifactId>cocoon-servlet-service-sample</artifactId>
+  <artifactId>cocoon-servlet-service-impl-sample</artifactId>
   <packaging>jar</packaging>
   <version>1.0.0-SNAPSHOT</version>
-  <name>Cocoon Servlet Service Sample Blocks</name>
+  <name>Cocoon Servlet Service Implementation Sample Blocks</name>
 
   <build>
     <plugins>
@@ -56,7 +56,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.5</version>
+        <version>6.1.7</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -87,10 +87,6 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-servlet-service-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-servlet-service-components</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo1-servletService.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo1-servletService.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo1-servletService.xml
(original)
+++ cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo1-servletService.xml
Mon Apr 21 12:44:24 2008
@@ -26,7 +26,7 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
   <bean name="org.apache.cocoon.servletservice.demo1.servlet" class="org.apache.cocoon.servletservice.demo1.DemoServlet">
-    <servlet:context mount-path="/test1" context-path="blockcontext:/cocoon-servlet-service-sample/">
+    <servlet:context mount-path="/cocoon-servlet-service-impl-sample/test1" context-path="blockcontext:/cocoon-servlet-service-impl-sample/">
       <servlet:init-params>
         <entry key="foo" value="baz"/>
       </servlet:init-params>

Modified: cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo2-servletService.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo2-servletService.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo2-servletService.xml
(original)
+++ cocoon/trunk/subprojects/cocoon-servlet-service/cocoon-servlet-service-impl-sample/src/main/resources/META-INF/cocoon/spring/cocoon-servlet-service-demo2-servletService.xml
Mon Apr 21 12:44:24 2008
@@ -24,6 +24,6 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
   <bean id="org.apache.cocoon.servletservice.demo2.servlet" class="org.apache.cocoon.servletservice.demo2.DemoServlet">
-    <servlet:context mount-path="/test2" context-path="blockcontext:/cocoon-servlet-service-sample/"/>
+    <servlet:context mount-path="/cocoon-servlet-service-impl-sample/test2" context-path="blockcontext:/cocoon-servlet-service-impl-sample/"/>
   </bean>
 </beans>

Modified: cocoon/trunk/subprojects/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/pom.xml?rev=650234&r1=650233&r2=650234&view=diff
==============================================================================
--- cocoon/trunk/subprojects/pom.xml (original)
+++ cocoon/trunk/subprojects/pom.xml Mon Apr 21 12:44:24 2008
@@ -31,6 +31,10 @@
   <modules>
     <module>cocoon-jnet</module>
     <module>cocoon-block-deployment</module>
+    <module>cocoon-configuration/cocoon-configuration-api</module>
+    <module>cocoon-configuration/cocoon-spring-configurator</module>
+    <module>cocoon-servlet-service/cocoon-servlet-service-impl</module>
+    <module>cocoon-servlet-service/cocoon-servlet-service-impl-sample</module>

   </modules>
   
 </project>



Mime
View raw message