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/11 13:18:08 UTC
svn commit: r485634 - in
/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp: ./
src/main/resources/META-INF/ src/main/resources/archetype-resources/
src/main/resources/archetype-resources/src/main/webapp/
src/main/resources/archetype-resources/s...
Author: reinhard
Date: Mon Dec 11 04:18:07 2006
New Revision: 485634
URL: http://svn.apache.org/viewvc?view=rev&rev=485634
Log:
reduce archetype to a minimum
Added:
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml (with props)
Removed:
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/sitemap.xmap
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/welcome.xml
Modified:
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/META-INF/archetype.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml?view=diff&rev=485634&r1=485633&r2=485634
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/pom.xml Mon Dec 11 04:18:07 2006
@@ -29,6 +29,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-22-archetype-webapp</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-M1-SNAPSHOT</version>
<name>Cocoon 2.2 Webapp Archetype</name>
</project>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/META-INF/archetype.xml?view=diff&rev=485634&r1=485633&r2=485634
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/META-INF/archetype.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/META-INF/archetype.xml Mon Dec 11 04:18:07 2006
@@ -18,10 +18,8 @@
<archetype>
<id>cocoon-22-archetype-webapp</id>
<resources>
- <resource>src/main/webapp/sitemap.xmap</resource>
- <resource>src/main/webapp/welcome.xml</resource>
<resource>src/main/webapp/WEB-INF/web.xml</resource>
- <resource>src/main/webapp/WEB-INF/applicationContext.xml</resource>
- <resource>src/main/webapp/WEB-INF/cocoon/log4j.xconf</resource>
+ <resource>src/main/webapp/WEB-INF/applicationContext.xml</resource>
+ <resource>src/main/webapp/WEB-INF/log4j.xml</resource>
</resources>
</archetype>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml?view=diff&rev=485634&r1=485633&r2=485634
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml Mon Dec 11 04:18:07 2006
@@ -19,7 +19,6 @@
-->
<!--+
| @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>
@@ -31,25 +30,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0.0-M2-SNAPSHOT</version>
- <configuration>
- <serverVersion>2.2</serverVersion>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.0.0rc4</version>
+ <version>6.0.2</version>
<configuration>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -64,20 +47,10 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
- <version>2.2.0-M3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-forms-impl</artifactId>
- <version>1.0.0-M2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-template-impl</artifactId>
- <version>1.0.0-M2-SNAPSHOT</version>
- </dependency>
+ <!--dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>[the artifact id of the block to be mounted]</artifactId>
+ <version>${version}</version>
+ </dependency-->
</dependencies>
</project>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=485634&r1=485633&r2=485634
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml Mon Dec 11 04:18:07 2006
@@ -36,6 +36,6 @@
If you have an own cocoon.xconf specify the location attribute,
like location="/WEB-INF/cocoon/cocoon.xconf".
-->
- <avalon:avalon loggingConfiguration="/WEB-INF/cocoon/log4j.xconf"/>
+ <avalon:avalon loggingConfiguration="/WEB-INF/log4j.xml"/>
-</beans>
\ No newline at end of file
+</beans>
Added: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml?view=auto&rev=485634
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml (added)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml Mon Dec 11 04:18:07 2006
@@ -0,0 +1,38 @@
+<?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.
+-->
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <!-- This is a sample configuration for log4j.
+ It simply just logs everything into a single
+ log file.
+ Note, that you can use properties for value substitution.
+ -->
+ <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${log-dir}/log4j.log" />
+ <param name="Append" value="false" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
+ </layout>
+ </appender>
+
+
+ <root>
+ <priority value="${org.apache.cocoon.log4j.loglevel}"/>
+ <appender-ref ref="COCOON_DEFAULT" />
+ </root>
+</log4j:configuration>
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/log4j.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?view=diff&rev=485634&r1=485633&r2=485634
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Mon Dec 11 04:18:07 2006
@@ -15,29 +15,79 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!--+
+ | This is the Cocoon web-app configurations file
+ +-->
+
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <!-- This listener sets up the spring container on startup of the web application. -->
+
+ <!-- Servlet Filters ================================================ -->
+
+ <!--+
+ | Declare a filter for multipart MIME handling
+ +-->
+ <filter>
+ <filter-name>CocoonMultipartFilter</filter-name>
+ <display-name>Cocoon multipart filter</display-name>
+ <description>Multipart MIME handling filter for Cocoon</description>
+ <filter-class>org.apache.cocoon.servlet.multipart.MultipartFilter</filter-class>
+ </filter>
+
+ <!--+
+ | Declare a filter for debugging incoming request
+ +-->
+ <filter>
+ <filter-name>CocoonDebugFilter</filter-name>
+ <display-name>Cocoon debug filter</display-name>
+ <description>Log debug information about each request</description>
+ <filter-class>org.apache.cocoon.servlet.DebugFilter</filter-class>
+ </filter>
+
+ <!-- Filter mappings ================================================ -->
+
+ <!--+
+ | Use the Cocoon multipart filter together with the Cocoon demo webapp
+ +-->
+ <filter-mapping>
+ <filter-name>CocoonMultipartFilter</filter-name>
+ <servlet-name>Cocoon</servlet-name>
+ </filter-mapping>
+
+ <!--+
+ | Use the Cocoon debug filter together with the Cocoon demo webapp
+
+ <filter-mapping>
+ <filter-name>CocoonDebugFilter</filter-name>
+ <servlet-name>Cocoon</servlet-name>
+ </filter-mapping>
+ +-->
+
+ <!-- Servlet Context Listener ======================================= -->
+
+ <!--+
+ | Declare Spring context listener which sets up the Spring Application Context
+ | containing all Cocoon components (and user defined as well).
+ +-->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<servlet>
- <servlet-name>Cocoon</servlet-name>
- <display-name>Cocoon</display-name>
- <description>Cocoon servlet - ${artifactId}</description>
-
- <servlet-class>org.apache.cocoon.servlet.SitemapServlet</servlet-class>
-
+ <servlet-name>DispatcherServlet</servlet-name>
+ <display-name>DispatcherServlet</display-name>
+ <description>Cocoon blocks dispatcher</description>
+ <servlet-class>org.apache.cocoon.blocks.DispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>Cocoon</servlet-name>
+ <servlet-name>DispatcherServlet</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
-</web-app>
+</web-app>
\ No newline at end of file