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/03/27 16:34:58 UTC
svn commit: r641850 - in
/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block: ./
src/main/resources/META-INF/ src/main/resources/archetype-resources/
src/main/resources/archetype-resources/src/main/java/
src/main/resources/archetype-resources/src/...
Author: reinhard
Date: Thu Mar 27 08:34:55 2008
New Revision: 641850
URL: http://svn.apache.org/viewvc?rev=641850&view=rev
Log:
. use latest Cocoon dependencies versions
. fix bug: DemoBean java classes were always put in the same package. That led to some problems with your classpath when you add several blocks into the same web application
. upgrade to latest plugin versions
. svn:ignore
Added:
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/MyBean.java
- copied, changed from r641638, cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/demo/MyBean.java
Removed:
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/LICENSE.txt
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/NOTICE.txt
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/demo/
Modified:
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/ (props changed)
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/blockServlet.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 27 08:34:55 2008
@@ -1,6 +1,8 @@
-target
-.classpath
-.project
-.wtpmodules
-*.iml
-.settings
+target
+.classpath
+.project
+.wtpmodules
+*.iml
+.settings
+.externalToolBuilders
+maven-eclipse.xml
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml?rev=641850&r1=641849&r2=641850&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/pom.xml Thu Mar 27 08:34:55 2008
@@ -17,19 +17,17 @@
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>
<artifactId>cocoon-tools-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
<version>5-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<artifactId>cocoon-22-archetype-block</artifactId>
<version>1.0.0-RC3-SNAPSHOT</version>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml?rev=641850&r1=641849&r2=641850&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/META-INF/archetype.xml Thu Mar 27 08:34:55 2008
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!-- $Id$ -->
<archetype>
<id>cocoon-archetype-block</id>
<resources>
<resource>rcl.properties</resource>
- <resource>src/main/java/demo/MyBean.java</resource>
<resource>src/main/resources/COB-INF/sitemap.xmap</resource>
<resource>src/main/resources/COB-INF/flow/spring-bean.js</resource>
<resource>src/main/resources/COB-INF/demo/spring-bean.jx.xml</resource>
@@ -30,4 +30,7 @@
<resource>src/main/resources/META-INF/cocoon/spring/demo-application-context.xml</resource>
<resource>src/main/resources/META-INF/cocoon/spring/blockServlet.xml</resource>
</resources>
+ <sources>
+ <source>src/main/java/MyBean.java</source>
+ </sources>
</archetype>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml?rev=641850&r1=641849&r2=641850&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml Thu Mar 27 08:34:55 2008
@@ -17,9 +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>
@@ -34,22 +32,22 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
- <version>2.2.0-RC3-SNAPSHOT</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-components</artifactId>
- <version>1.0.0-RC2-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-template-impl</artifactId>
- <version>1.0.0-RC3-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-flowscript-impl</artifactId>
- <version>1.0.0-RC3-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
@@ -58,13 +56,13 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-maven-plugin</artifactId>
- <version>1.0.0-M1</version>
+ <version>1.0.0-M2</version>
<executions>
<execution>
- <id>rcl</id>
+ <id>prepare</id>
<phase>compile</phase>
<goals>
- <goal>rcl</goal>
+ <goal>prepare</goal>
</goals>
</execution>
</executions>
@@ -72,7 +70,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">
@@ -103,7 +101,7 @@
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
</plugins>
</build>
Copied: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/MyBean.java (from r641638, cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/demo/MyBean.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/MyBean.java?p2=cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/MyBean.java&p1=cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/demo/MyBean.java&r1=641638&r2=641850&rev=641850&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/demo/MyBean.java (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/java/MyBean.java Thu Mar 27 08:34:55 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package demo;
+package $package;
public class MyBean {
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/blockServlet.xml?rev=641850&r1=641849&r2=641850&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/blockServlet.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/blockServlet.xml Thu Mar 27 08:34:55 2008
@@ -17,17 +17,15 @@
specific language governing permissions and limitations
und
-->
-
-<!--
- - @version $Id$
- -->
+<!-- $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.0.xsd
+ 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="${groupId}.${artifactId}.service" class="org.apache.cocoon.sitemap.SitemapServlet">
<servlet:context mount-path="/${artifactId}" context-path="blockcontext:/${artifactId}/"/>
</bean>
+
</beans>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml?rev=641850&r1=641849&r2=641850&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/demo-application-context.xml Thu Mar 27 08:34:55 2008
@@ -1,6 +1,4 @@
<?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
@@ -17,8 +15,21 @@
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>
+<!-- $Id$ -->
+<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="demo" class="${package}.MyBean">
+ <property name="message" value="This is a message coming from a Spring bean." />
+ </bean>
+
</beans>