cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r613099 - in /cocoon/whiteboard/micro: ./ core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/ misc/ misc/cocoon-micro-it-block/ misc/cocoon-micro-it-block/src/ misc/cocoon-micro-it-block/src/main/ misc/cocoon-micro-it-bloc...
Date Fri, 18 Jan 2008 08:30:35 GMT
Author: reinhard
Date: Fri Jan 18 00:30:33 2008
New Revision: 613099

URL: http://svn.apache.org/viewvc?rev=613099&view=rev
Log:
add a block which will become the home of all integration tests

Added:
    cocoon/whiteboard/micro/misc/
    cocoon/whiteboard/micro/misc/build.xml   (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml   (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/rcl.properties   (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/MyBean.java   (with
props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/spring-bean.jx.xml
  (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xml
  (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xslt
  (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/flow/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/flow/spring-bean.js
  (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/README.txt
  (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/README.txt
  (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/sitemap.xmap
  (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
  (with props)
    cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
  (with props)
Removed:
    cocoon/whiteboard/micro/core/cocoon-webapp/src/test/java/org/apache/cocoon/it/servletservice/RequestInformationPassing.java
Modified:
    cocoon/whiteboard/micro/parent/pom.xml
    cocoon/whiteboard/micro/pom.xml

Added: cocoon/whiteboard/micro/misc/build.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/build.xml?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/build.xml (added)
+++ cocoon/whiteboard/micro/misc/build.xml Fri Jan 18 00:30:33 2008
@@ -0,0 +1,34 @@
+<project default="clean">
+  <target name="clean">  
+    <fixcrlf srcdir="."
+      tab="remove"
+      tablength="2"
+      includes="**/*.xml"
+    />    
+    <fixcrlf srcdir="."
+      tab="remove"
+      tablength="2"
+      includes="**/*.xslt"
+    />    
+    <fixcrlf srcdir="."
+      tab="remove"
+      tablength="2"
+      includes="**/*.xslt"
+    />            
+    <fixcrlf srcdir="."
+      tab="remove"
+      tablength="2"
+      includes="**/*.js"
+    />    
+    <fixcrlf srcdir="."
+      tab="remove"
+      tablength="2"
+      includes="**/*.xmap"
+    />             
+    <fixcrlf srcdir="."
+      tab="remove"
+      tablength="4"
+      includes="**/*.java"
+    />      
+  </target>
+</project>

Propchange: cocoon/whiteboard/micro/misc/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/build.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml (added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml Fri Jan 18 00:30:33 2008
@@ -0,0 +1,115 @@
+<?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.
+-->
+<!-- @version $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>
+  <packaging>jar</packaging>
+  
+  <parent>
+    <artifactId>cocoon-micro</artifactId>
+    <groupId>org.apache.cocoon.micro</groupId>
+    <version>1-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+  <name>Cocoon Micro: Integration Tests Block [jar]</name>
+  <artifactId>cocoon-micro-it-block</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <description>
+    Integration test suite for Micro Cocoon.
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon.micro</groupId>
+      <artifactId>cocoon-micro-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-servlet-service-components</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-template-impl</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-flowscript-impl</artifactId>
+      <version>1.0.0-RC3-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-maven-plugin</artifactId>
+        <version>1.0.0-M1</version>
+        <executions>
+          <execution>
+            <id>rcl</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>rcl</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>6.1.7</version>
+        <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>8888</port>
+              <maxIdleTime>30000</maxIdleTime>
+            </connector>
+          </connectors>
+          <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
+          <contextPath>/</contextPath>
+          <systemProperties>
+            <systemProperty>
+              <name>org.apache.cocoon.mode</name>
+              <value>dev</value>
+            </systemProperty>
+          </systemProperties>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/rcl.properties
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/rcl.properties?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/rcl.properties (added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/rcl.properties Fri Jan 18 00:30:33
2008
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+org.apache.cocoon.micro.cocoon-micro-it.service%classes-dir=./target/classes
\ No newline at end of file

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/rcl.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/rcl.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/rcl.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/MyBean.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/MyBean.java?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/MyBean.java (added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/MyBean.java Fri
Jan 18 00:30:33 2008
@@ -0,0 +1,30 @@
+/*
+ * 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 demo;
+
+public class MyBean {
+
+    private String message;
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+}

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/MyBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/MyBean.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/java/demo/MyBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/spring-bean.jx.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/spring-bean.jx.xml?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/spring-bean.jx.xml
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/spring-bean.jx.xml
Fri Jan 18 00:30:33 2008
@@ -0,0 +1,21 @@
+<?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.
+-->
+<demo>
+  <module>org.apache.cocoon.micro:cocoon-micro-it</module>
+  <spring>#{message}</spring>
+</demo>

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/spring-bean.jx.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/spring-bean.jx.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/spring-bean.jx.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xml?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xml
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xml
Fri Jan 18 00:30:33 2008
@@ -0,0 +1,23 @@
+<?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.
+-->
+<content>
+  <h1>Apache Cocoon: Welcome</h1>
+  <p>This block <strong>org.apache.cocoon.micro:cocoon-micro-it</strong>
was created by the Cocoon block archetype.</p>
+  <p/>
+  <p><a href="spring-bean">Link</a> to the output of a simple Flowscript
that accesses a Spring bean.</p>
+</content>

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xslt
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xslt?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xslt
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xslt
Fri Jan 18 00:30:33 2008
@@ -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 under the License.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:template match="/">
+    <html>
+      <head>
+        <title>Apache Cocoon: Welcome!</title>
+      </head>
+      <body>
+        <xsl:copy-of select="content/*"/>
+      </body>
+    </html>
+  </xsl:template>
+
+</xsl:stylesheet>

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xslt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xslt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/demo/welcome.xslt
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/flow/spring-bean.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/flow/spring-bean.js?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/flow/spring-bean.js
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/flow/spring-bean.js
Fri Jan 18 00:30:33 2008
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+//
+// @version $Id: demo.js 448451 2006-09-21 04:04:16Z crossley $
+//
+
+function demo() {
+    var demoBean = cocoon.getComponent("demo");
+    cocoon.sendPage("screens/spring-bean",
+        {
+            "message" : demoBean.message
+        }
+    );
+}

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/flow/spring-bean.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/flow/spring-bean.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/README.txt
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/README.txt?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/README.txt
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/README.txt
Fri Jan 18 00:30:33 2008
@@ -0,0 +1,7 @@
+This is a dummy file provided to avoid Maven archetype plugin's limitation.
+
+Archetype plugin does not create empty directory structure:
+"At this point one can only specify individual files to be created but not empty directories."
+(http://maven.apache.org/plugins/maven-archetype-plugin/examples/archetype.html)
+
+You can safely remove this file at any time.
\ No newline at end of file

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/external/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/README.txt
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/README.txt?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/README.txt
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/README.txt
Fri Jan 18 00:30:33 2008
@@ -0,0 +1,7 @@
+This is a dummy file provided to avoid Maven archetype plugin's limitation.
+
+Archetype plugin does not create empty directory structure:
+"At this point one can only specify individual files to be created but not empty directories."
+(http://maven.apache.org/plugins/maven-archetype-plugin/examples/archetype.html)
+
+You can safely remove this file at any time.
\ No newline at end of file

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/resource/internal/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/sitemap.xmap?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/sitemap.xmap
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/sitemap.xmap
Fri Jan 18 00:30:33 2008
@@ -0,0 +1,99 @@
+<?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.
+-->
+<map:sitemap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://apache.org/cocoon/sitemap/1.0 http://cocoon.apache.org/schema/sitemap/cocoon-sitemap-1.0.xsd"
+ xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+  <!--+
+      | Definition of the control flow implementation.
+      +-->
+  <map:flow language="javascript"/>
+
+  <map:pipelines>
+    <!--+
+        | Demo pipelines
+        +-->
+    <map:pipeline id="demo">
+      <!-- Simple demo, that show how Cocoon pipelines. -->
+      <map:match pattern="">
+        <!--+
+            | Start generating SAX events inside the pipeline. In this case,
+            | since no "type" attribute is specified, the default generator
+            | is used and this is a regular XML parser that reads the
+            | given file from the URL included in the "src" attribute and
+            | sends the events produced by the parser down the pipeline to
+            | be processed by the next stage.
+            +-->
+        <map:generate src="demo/welcome.xml"/>
+        <!--+
+            | This transformer gets the input SAX events and transforms them
+            | using the default transformer (the XSLT transformer) thus
+            | applying the XSLT stylesheet indicated in the "src" attribute
+            | and sending the output down the pipeline to be processed by the
+            | next stage.
+            +-->
+        <map:transform src="demo/welcome.xslt"/>
+        <!--+
+            | The serializer concludes the SAX events journey into the pipeline
+            | since it serializes the events it receives into a representation
+            | depending on the serializer type. Here we choose the "XHMTL"
+            | serializer, which will produce an XHTML representation of the
+            | SAX stream.
+            +-->
+        <map:serialize type="xhtml"/>
+      </map:match>
+      <!-- Implement application logic using a Flowscript function.
+        Flowscripts in ./flow are loaded automatically in alphabetical order. -->
+      <map:match pattern="spring-bean">
+        <map:call function="demo"/>
+      </map:match>
+    </map:pipeline>
+    <map:pipeline id="demo-internal" internal-only="true">
+      <!-- This pipeline is invoked by the above flowscript. -->
+      <map:match pattern="screens/spring-bean">
+        <map:generate src="demo/spring-bean.jx.xml" type="jx"/>
+        <map:serialize type="xml"/>
+      </map:match>
+    </map:pipeline>
+
+    <!--+
+        | Default pipelines
+        +-->
+    <map:pipeline id="internal-resource" internal-only="true">
+      <!-- Put matchers for internal (accessible only to Cocoon blocks) resources here
+        More details: http://cocoon.zones.apache.org/daisy/cdocs-site-main/g2/1345.html -->
+      <map:match pattern="resource/internal/**">
+        <map:read src="resource/internal/{1}"/>
+      </map:match>
+    </map:pipeline>
+
+    <map:pipeline id="external-resource">
+      <!-- Put matchers for external (accessible to the outside world, e.g. browser) resources
here.
+        More details: http://cocoon.zones.apache.org/daisy/cdocs-site-main/g2/1345.html -->
+      <map:match pattern="resource/external/**">
+        <map:read src="resource/external/{1}"/>
+      </map:match>
+    </map:pipeline>
+
+    <map:pipeline id="service">
+      <!-- Put your servlet service matchers here.
+        More details: http://cocoon.zones.apache.org/daisy/cdocs-site-main/g2/1345.html -->
+    </map:pipeline>
+  </map:pipelines>
+
+</map:sitemap>

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
Fri Jan 18 00:30:33 2008
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
+    "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<!--
+  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.
+-->
+<beans>
+  <bean id="demo" class="demo.MyBean" scope="singleton">
+    <property name="message" value="This is a message coming from a Spring bean."/>
+  </bean>
+</beans>

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml?rev=613099&view=auto
==============================================================================
--- cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
(added)
+++ cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
Fri Jan 18 00:30:33 2008
@@ -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
+-->
+<!-- @version $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 id="org.apache.cocoon.micro.cocoon-micro-it.service" class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="" context-path="blockcontext:/cocoon-micro-it-block/"/>
+  </bean>
+
+</beans>

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/micro/misc/cocoon-micro-it-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cocoon/whiteboard/micro/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/parent/pom.xml?rev=613099&r1=613098&r2=613099&view=diff
==============================================================================
--- cocoon/whiteboard/micro/parent/pom.xml (original)
+++ cocoon/whiteboard/micro/parent/pom.xml Fri Jan 18 00:30:33 2008
@@ -412,12 +412,12 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-servlet-service-components</artifactId>
-        <version>1.0.0-RC1</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-servlet-service-impl</artifactId>
-        <version>1.0.0-RC1</version>
+        <version>1.0.0-RC2-SNAPSHOT</version>
       </dependency>
       <!-- ~~~~~~~~~~~~~~~~~~ Cocoon SNAPSHOT dependencies ~~~~~~~~~~~~~~~ -->
       <dependency>

Modified: cocoon/whiteboard/micro/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/pom.xml?rev=613099&r1=613098&r2=613099&view=diff
==============================================================================
--- cocoon/whiteboard/micro/pom.xml (original)
+++ cocoon/whiteboard/micro/pom.xml Fri Jan 18 00:30:33 2008
@@ -54,6 +54,8 @@
     <module>core/cocoon-xml/cocoon-xml-util</module>
     <module>core/cocoon-expression-language/cocoon-expression-language-api</module>
     <module>core/cocoon-expression-language/cocoon-expression-language-impl</module>
+    <!-- Integration tests and webapp -->
+    <module>misc/cocoon-micro-it-block</module>
   </modules>  
 
   <organization>



Mime
View raw message