Author: olamy
Date: Fri Jan 13 09:37:32 2012
New Revision: 1230963
URL: http://svn.apache.org/viewvc?rev=1230963&view=rev
Log:
archetype add a module sample with generation of exec war
Added:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-exec/
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-exec/pom.xml
(with props)
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1230963&r1=1230962&r2=1230963&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
Fri Jan 13 09:37:32 2012
@@ -39,6 +39,9 @@
<requiredProperty key="artifactId-webapp">
<defaultValue>basic-webapp</defaultValue>
</requiredProperty>
+ <requiredProperty key="artifactId-webapp-exec">
+ <defaultValue>basic-webapp-exec</defaultValue>
+ </requiredProperty>
<requiredProperty key="artifactId-webapp-it">
<defaultValue>basic-webapp-it</defaultValue>
</requiredProperty>
@@ -108,6 +111,16 @@
</fileSet>
</fileSets>
</module>
+ <module id="test-webapp-exec" dir="test-webapp-exec"
name="test-webapp-exec">
+ <fileSets>
+ <fileSet filtered="false" packaged="false" encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </module>
<module id="test-webapp-it" dir="test-webapp-it" name="test-webapp-it">
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
Added:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-exec/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-exec/pom.xml?rev=1230963&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-exec/pom.xml
(added)
+++
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-exec/pom.xml
Fri Jan 13 09:37:32 2012
@@ -0,0 +1,79 @@
+<?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.
+-->
+
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>\${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>\${version}</version>
+ </parent>
+
+ <artifactId>${artifactId-webapp-exec}</artifactId>
+ <packaging>pom</packaging>
+
+
+ <build>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-war-exec</id>
+ <goals>
+ <goal>exec-war-only</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <path>/</path>
+ <warRunDependencies>
+ <warRunDependency>
+ <dependency>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId-webapp}</artifactId>
+ <version>\${project.version}</version>
+ <type>war</type>
+ </dependency>
+ </warRunDependency>
+ </warRunDependencies>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>\${groupId}</groupId>
+ <artifactId>\${artifactId-webapp}</artifactId>
+ <type>war</type>
+ </dependency>
+
+ </dependencies>
+
+
+
+</project>
Propchange:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-exec/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-exec/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties?rev=1230963&r1=1230962&r2=1230963&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
Fri Jan 13 09:37:32 2012
@@ -6,5 +6,6 @@ artifactId-api=basic-api
artifactId-api-impl=basic-api-impl
artifactId-webapp=basic-webapp
artifactId-webapp-it=basic-webapp-it
+artifactId-webapp-exec=basic-webapp-exec
rootArtifactId=basic
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
