You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/08/20 19:04:09 UTC

svn commit: r234096 - in /cocoon: blocks/javaflow/trunk/WEB-INF/compile/ trunk/pom.xml trunk/src/webapp/WEB-INF/compile/ trunk/webapp/ trunk/webapp/pom.xml

Author: cziegeler
Date: Sat Aug 20 10:03:19 2005
New Revision: 234096

URL: http://svn.apache.org/viewcvs?rev=234096&view=rev
Log:
Add webapp module and move javaflow related stuff into the javaflow block

Added:
    cocoon/blocks/javaflow/trunk/WEB-INF/compile/
      - copied from r234023, cocoon/trunk/src/webapp/WEB-INF/compile/
    cocoon/trunk/webapp/
    cocoon/trunk/webapp/pom.xml   (with props)
Removed:
    cocoon/trunk/src/webapp/WEB-INF/compile/
Modified:
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=234096&r1=234095&r2=234096&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Sat Aug 20 10:03:19 2005
@@ -16,7 +16,7 @@
 -->
 <!--+
     | This is the main Maven file
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project>
   <modelVersion>4.0.0</modelVersion>
@@ -28,5 +28,6 @@
   <url>http://cocoon.apache.org</url>
   <modules>
     <module>core</module>
+    <module>webapp</module>
   </modules>
 </project>

Added: cocoon/trunk/webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/webapp/pom.xml?rev=234096&view=auto
==============================================================================
--- cocoon/trunk/webapp/pom.xml (added)
+++ cocoon/trunk/webapp/pom.xml Sat Aug 20 10:03:19 2005
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>apache-cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>cocoon-webapp</artifactId>
+  <packaging>war</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warSourceDirectory>../src/webapp</warSourceDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>

Propchange: cocoon/trunk/webapp/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/webapp/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id