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 2006/12/01 07:29:53 UTC
svn commit: r481168 - in
/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources:
META-INF/archetype.xml archetype-resources/pom.xml
archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml
Author: reinhard
Date: Thu Nov 30 22:29:52 2006
New Revision: 481168
URL: http://svn.apache.org/viewvc?view=rev&rev=481168
Log:
add blocks-fw-impl dependency; use Jetty 6.0.2; add block.xml (Spring); remove build dependency (packaging phase) on the deployer
Added:
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml (with props)
Modified:
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
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?view=diff&rev=481168&r1=481167&r2=481168
==============================================================================
--- 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 Nov 30 22:29:52 2006
@@ -23,5 +23,6 @@
<resource>src/main/resources/COB-INF/demo.js</resource>
<resource>src/main/resources/COB-INF/demo.xml</resource>
<resource>src/main/resources/META-INF/cocoon/spring/demo-application-context.xml</resource>
+ <resource>src/main/resources/META-INF/cocoon/spring/block.xml</resource>
</resources>
</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?view=diff&rev=481168&r1=481167&r2=481168
==============================================================================
--- 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 Nov 30 22:29:52 2006
@@ -37,19 +37,11 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
<version>1.0.0-M2-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty6-plugin</artifactId>
- <version>6.0.0beta10</version>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.0.2</version>
<configuration>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -83,6 +75,11 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-blocks-fw-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-forms-impl</artifactId>
<version>1.0.0-M2-SNAPSHOT</version>
</dependency>
@@ -93,11 +90,6 @@
</dependency>
</dependencies>
<repositories>
- <repository>
- <id>central</id>
- <name>Maven central repository</name>
- <url>http://ibiblio.org/maven2</url>
- </repository>
<repository>
<id>apache.snapshot</id>
<name>Apache Snapshot Repository</name>
Added: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.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/block.xml?view=auto&rev=481168
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml (added)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml Thu Nov 30 22:29:52 2006
@@ -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"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean id="${groupId}.${artifactId}.block" class="org.apache.cocoon.blocks.BlockServlet">
+ <property name="mountPath" value="/${artifactId}"/>
+ <property name="servletClass" value="org.apache.cocoon.sitemap.SitemapServlet"/>
+ <property name="blockContextURL" value="blockcontext:/${artifactId}/"/>
+ </bean>
+</beans>
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/src/main/resources/META-INF/cocoon/spring/block.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml