[waffle-scm] [265] trunk: Added examples parent pom to drive the build of the example webapps.

Sat, 14 Jul 2007 05:11:53 -0700

Title: [waffle-scm] [265] trunk: Added examples parent pom to drive the build of the example webapps.
Revision
265
Author
mauro
Date
2007-07-14 07:11:48 -0500 (Sat, 14 Jul 2007)

Log Message

Added examples parent pom to drive the build of the example webapps.
The parent pom declares the dependencies and functionality common to the child modules, which only need to worry about the dependencies and specifics pertinent to the example webapp.


Modified Paths




Added Paths

Diff

Modified: trunk/examples/freemarker-example/pom.xml (264 => 265)

--- trunk/examples/freemarker-example/pom.xml	2007-07-14 11:21:54 UTC (rev 264)
+++ trunk/examples/freemarker-example/pom.xml	2007-07-14 12:11:48 UTC (rev 265)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.waffle</groupId>
-    <artifactId>waffle-parent</artifactId>
+    <artifactId>waffle-examples</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-freemarker-example</artifactId>
@@ -12,21 +12,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>waffle</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
       <groupId>com.thoughtworks.paranamer</groupId>
       <artifactId>paranamer-asm</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>freemarker</groupId>
       <artifactId>freemarker</artifactId>
       <version>2.3.8</version>
@@ -57,28 +47,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy-webapp</id>
-            <phase>install</phase>
-            <configuration>
-              <tasks>
-                <echo>Deploying webapp</echo>
-                <copy file="target/${pom.artifactId}.war" todir="${webapp.deploy.dir}" verbose="true" overwrite="true" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>

Modified: trunk/examples/jruby-example/pom.xml (264 => 265)

--- trunk/examples/jruby-example/pom.xml	2007-07-14 11:21:54 UTC (rev 264)
+++ trunk/examples/jruby-example/pom.xml	2007-07-14 12:11:48 UTC (rev 265)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.waffle</groupId>
-    <artifactId>waffle-parent</artifactId>
+    <artifactId>waffle-examples</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-jruby-example</artifactId>
@@ -12,30 +12,10 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>waffle</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -63,28 +43,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy-webapp</id>
-            <phase>install</phase>
-            <configuration>
-              <tasks>
-                <echo>Deploying webapp</echo>
-                <copy file="target/${pom.artifactId}.war" todir="${webapp.deploy.dir}" verbose="true" overwrite="true"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>

Modified: trunk/examples/migration-example/pom.xml (264 => 265)

--- trunk/examples/migration-example/pom.xml	2007-07-14 11:21:54 UTC (rev 264)
+++ trunk/examples/migration-example/pom.xml	2007-07-14 12:11:48 UTC (rev 265)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.waffle</groupId>
-    <artifactId>waffle-parent</artifactId>
+    <artifactId>waffle-examples</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-migration-example</artifactId>
@@ -12,26 +12,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>waffle</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-taglib</artifactId>
       <version>1.3.5</version>
@@ -50,7 +30,7 @@
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
           <webXml>${basedir}/src/main/webapp/WEB-INF/${framework}-web.xml</webXml>
-          <warName>waffle-migration-example-${framework}</warName>
+          <warName>${pom.artifactId}</warName>
           <webResources>
             <resource>
               <directory>${basedir}/resources</directory>
@@ -58,25 +38,6 @@
           </webResources>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy-webapp</id>
-            <phase>install</phase>
-            <configuration>
-              <tasks>
-                <echo>Deploying webapp</echo>
-                <copy file="target/waffle-migration-example-${framework}.war" todir="${webapp.deploy.dir}" verbose="true"
-                  overwrite="true" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>

Modified: trunk/examples/mydvds-example/pom.xml (264 => 265)

--- trunk/examples/mydvds-example/pom.xml	2007-07-14 11:21:54 UTC (rev 264)
+++ trunk/examples/mydvds-example/pom.xml	2007-07-14 12:11:48 UTC (rev 265)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.waffle</groupId>
-    <artifactId>waffle-parent</artifactId>
+    <artifactId>waffle-examples</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-mydvds-example</artifactId>
@@ -23,21 +23,6 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
       <scope>runtime</scope>
@@ -70,34 +55,12 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-      </plugin>
-      <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy-webapp</id>
-            <phase>install</phase>
-            <configuration>
-              <tasks>
-                <echo>Deploying webapp</echo>
-                <copy file="target/${pom.artifactId}.war" todir="${webapp.deploy.dir}" verbose="true" overwrite="true" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

Modified: trunk/examples/paranamer-example/pom.xml (264 => 265)

--- trunk/examples/paranamer-example/pom.xml	2007-07-14 11:21:54 UTC (rev 264)
+++ trunk/examples/paranamer-example/pom.xml	2007-07-14 12:11:48 UTC (rev 265)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.waffle</groupId>
-    <artifactId>waffle-parent</artifactId>
+    <artifactId>waffle-examples</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-paranamer-example</artifactId>
@@ -12,30 +12,10 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>waffle</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
       <groupId>com.thoughtworks.paranamer</groupId>
       <artifactId>paranamer-asm</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -56,28 +36,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy-webapp</id>
-            <phase>install</phase>
-            <configuration>
-              <tasks>
-                <echo>Deploying webapp</echo>
-                <copy file="target/${pom.artifactId}.war" todir="${webapp.deploy.dir}" verbose="true" overwrite="true" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>

Added: trunk/examples/pom.xml (0 => 265)

--- trunk/examples/pom.xml	                        (rev 0)
+++ trunk/examples/pom.xml	2007-07-14 12:11:48 UTC (rev 265)
@@ -0,0 +1,79 @@
+<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.codehaus.waffle</groupId>
+    <artifactId>waffle-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>waffle-examples</artifactId>
+  <packaging>pom</packaging>
+  <name>Waffle Examples</name>
+
+  <modules>
+    <module>simple-example</module>
+    <module>jruby-example</module>
+    <module>freemarker-example</module>
+    <module>paranamer-example</module>
+    <module>migration-example</module>
+    <module>mydvds-example</module>
+  </modules>
+  
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>waffle</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-war-plugin</artifactId>
+       </plugin>
+       <plugin>
+        <groupId>org.codehaus.mojo.groovy</groupId>
+        <artifactId>groovy-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>install</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>
+                <body>
+                  def ant = new AntBuilder()
+                  def webapp = "${project.build.directory}/${pom.artifactId}.war"
+                  if ( new File(webapp).exists() ){
+                    ant.echo(message: "Deploying ${webapp} to ${webapp.deploy.dir}")
+                    ant.copy(file: "${webapp}", 
+                            todir: "${webapp.deploy.dir}", verbose: true, overwrite: true)
+                  }
+                </body>
+              </source>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Modified: trunk/examples/simple-example/pom.xml (264 => 265)

--- trunk/examples/simple-example/pom.xml	2007-07-14 11:21:54 UTC (rev 264)
+++ trunk/examples/simple-example/pom.xml	2007-07-14 12:11:48 UTC (rev 265)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.waffle</groupId>
-    <artifactId>waffle-parent</artifactId>
+    <artifactId>waffle-examples</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-simple-example</artifactId>
@@ -12,65 +12,10 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>waffle</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.0</version>
-        <configuration>
-          <warName>${pom.artifactId}</warName>
-          <webResources>
-            <resource>
-              <directory>${basedir}/resources</directory>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy-webapp</id>
-            <phase>install</phase>
-            <configuration>
-              <tasks>
-                <echo>Deploying webapp</echo>
-                <copy file="target/${pom.artifactId}.war" todir="${webapp.deploy.dir}" verbose="true" overwrite="true" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Modified: trunk/pom.xml (264 => 265)

--- trunk/pom.xml	2007-07-14 11:21:54 UTC (rev 264)
+++ trunk/pom.xml	2007-07-14 12:11:48 UTC (rev 265)
@@ -230,6 +230,11 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.codehaus.mojo.groovy</groupId>
+          <artifactId>groovy-maven-plugin</artifactId>
+          <version>1.0-alpha-3</version>
+        </plugin>
+        <plugin>
           <groupId>org.codehaus.xsite</groupId>
           <artifactId>xsite-maven-plugin</artifactId>
           <version>1.0-beta-9</version>
@@ -342,12 +347,7 @@
       <!-- Examples profile -->
       <id>examples</id>
       <modules>
-        <module>examples/simple-example</module>
-        <module>examples/jruby-example</module>
-        <module>examples/freemarker-example</module>
-        <module>examples/paranamer-example</module>
-        <module>examples/migration-example</module>
-        <module>examples/mydvds-example</module>
+        <module>examples</module>
       </modules>
     </profile>
   </profiles>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to