Update of /var/cvs/all/example-webapp
In directory james.mmbase.org:/tmp/cvs-serv7434/example-webapp
Modified Files:
pom.xml
Log Message:
Improvements for the multiproject build
Kick off a full build inside /maven
See also: http://cvs.mmbase.org/viewcvs/all/example-webapp
Index: pom.xml
===================================================================
RCS file: /var/cvs/all/example-webapp/pom.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- pom.xml 4 Mar 2009 07:34:39 -0000 1.8
+++ pom.xml 8 Mar 2009 18:12:49 -0000 1.9
@@ -1,16 +1,18 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-parent</artifactId>
- <version>1.9</version>
+ <version>1.9-SNAPSHOT</version>
+ <relativePath>../maven-base/pom.xml</relativePath>
</parent>
<artifactId>example-webapp</artifactId>
<packaging>war</packaging>
<name>MMBase Example webapp</name>
- <version>${mmbase.version}</version>
<build>
<defaultGoal>install</defaultGoal>
@@ -27,6 +29,28 @@
</includes>
</resource>
</webResources>
+ <overlays>
+ <overlay>
+ <groupId>org.mmbase</groupId>
+ <artifactId>mmbase-editwizard</artifactId>
+ <targetPath>mmexamples/editwizard</targetPath>
+ <classifier>examples</classifier>
+ </overlay>
+ <overlay>
+ <groupId>org.mmbase</groupId>
+ <artifactId>mmbase-taglib</artifactId>
+ <classifier>examples</classifier>
+ <targetPath>mmexamples/taglib</targetPath>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>src/webapp</warSourceDirectory>
</configuration>
</plugin>
</plugins>
@@ -36,43 +60,67 @@
<dependency>
<groupId>org.mmbase</groupId>
<artifactId>base-webapp</artifactId>
- <version>${mmbase.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-resources</artifactId>
- <version>${mmbase.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-mynews</artifactId>
- <version>${mmbase.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-editwizard</artifactId>
- <version>${mmbase.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-oscache-cache</artifactId>
- <version>${mmbase.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-largeobjects</artifactId>
- <version>${mmbase.version}</version>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mmbase</groupId>
+ <artifactId>mmbase-editwizard</artifactId>
+ <version>${project.version}</version>
+ <classifier>examples</classifier>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.mmbase</groupId>
+ <artifactId>mmbase-taglib</artifactId>
+ <version>${project.version}</version>
+ <classifier>examples</classifier>
+ <type>war</type>
</dependency>
- </dependencies>
- <repositories>
- <repository>
- <id>mmbase</id>
- <url>http://www.mmbase.org/maven2</url>
- </repository>
- </repositories>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
