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 2006/02/28 21:48:02 UTC
svn commit: r381776 - in /cocoon/trunk: cocoon-session-fw/cocoon-session-fw-impl/ cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/WEB-INF/sitemap-additions/ cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/WEB-INF/xconf/ cocoon-s...

Author: cziegeler
Date: Tue Feb 28 12:48:00 2006
New Revision: 381776

URL: http://svn.apache.org/viewcvs?rev=381776&view=rev
Log:
Try to use maven to build complete webapp

Added:
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/sitemap-additions/
      - copied from r381775, cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/WEB-INF/sitemap-additions/
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/web.xml   (with props)
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/xconf/
      - copied from r381775, cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/WEB-INF/xconf/
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/src/main/webapp/WEB-INF/
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/src/main/webapp/WEB-INF/web.xml   (with props)
Removed:
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/WEB-INF/sitemap-additions/
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/resources/WEB-INF/xconf/
Modified:
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
    cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
    cocoon/trunk/cocoon-webapp/pom.xml

Modified: cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/pom.xml?rev=381776&r1=381775&r2=381776&view=diff
==============================================================================
--- cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/pom.xml (original)
+++ cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/pom.xml Tue Feb 28 12:48:00 2006
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-session-fw-impl</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>war</packaging>
   <name>Session Framework Implementation</name>
   <dependencies>
     <dependency>

Added: cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/web.xml?rev=381776&view=auto
==============================================================================
--- cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/web.xml (added)
+++ cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/web.xml Tue Feb 28 12:48:00 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2006 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.
+-->
+<!--  This file is just here to keep Maven happy -->
+<dummy/>
\ No newline at end of file

Propchange: cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/cocoon-session-fw/cocoon-session-fw-impl/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/pom.xml?rev=381776&r1=381775&r2=381776&view=diff
==============================================================================
--- cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/pom.xml (original)
+++ cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/pom.xml Tue Feb 28 12:48:00 2006
@@ -27,7 +27,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-session-fw-sample</artifactId>
-  <packaging>jar</packaging>
+  <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <name>Session Framework Sample Application </name>
   <dependencies>
@@ -35,6 +35,13 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-session-fw-impl</artifactId>
       <version>1.0-SNAPSHOT</version>
+      <type>war</type>
     </dependency>
   </dependencies>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>snapshots</id>
+      <url>http://snapshots.maven.codehaus.org/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
 </project>

Added: cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/src/main/webapp/WEB-INF/web.xml?rev=381776&view=auto
==============================================================================
--- cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/src/main/webapp/WEB-INF/web.xml (added)
+++ cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/src/main/webapp/WEB-INF/web.xml Tue Feb 28 12:48:00 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2006 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.
+-->
+<!--  This file is just here to keep Maven happy -->
+<dummy/>
\ No newline at end of file

Propchange: cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/cocoon-session-fw/cocoon-session-fw-sample/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-webapp/pom.xml?rev=381776&r1=381775&r2=381776&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/cocoon-webapp/pom.xml Tue Feb 28 12:48:00 2006
@@ -65,8 +65,18 @@
       <artifactId>cocoon-core</artifactId>
       <version>2.2.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-session-fw-sample</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
   <pluginRepositories>
+    <pluginRepository>
+      <id>snapshots</id>
+      <url>http://snapshots.maven.codehaus.org/maven2</url>
+    </pluginRepository>
     <pluginRepository>
       <id>mortbay-repo</id>
       <name>mortbay-repo</name>