geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r697195 - in /geronimo/samples/branches/2.1: ./ geronimo-samples-archetype/ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/ samples/ samples/app-per-port/ samples/app-per-port/app-per-port-connector-war/ sample...
Date Fri, 19 Sep 2008 19:18:51 GMT
Author: jbohn
Date: Fri Sep 19 12:18:50 2008
New Revision: 697195

URL: http://svn.apache.org/viewvc?rev=697195&view=rev
Log:
remove special javadoc/xref processing & fix legal file processing

Modified:
    geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
    geronimo/samples/branches/2.1/pom.xml
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml
    geronimo/samples/branches/2.1/samples/app-per-port/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml
    geronimo/samples/branches/2.1/samples/bank/pom.xml
    geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml
    geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml
    geronimo/samples/branches/2.1/samples/calculator/pom.xml
    geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml
    geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml
    geronimo/samples/branches/2.1/samples/customer/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/pom.xml
    geronimo/samples/branches/2.1/samples/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml Fri Sep 19 12:18:50 2008
@@ -37,17 +37,5 @@
     
     <description> Plugin to help create a samples project</description>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-plugin-plugin</artifactId>
-                    <version>2.3</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-     </build>
-
 </project>
 

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml Fri Sep 19 12:18:50 2008
@@ -74,6 +74,10 @@
                             <bundleFileName>${artifactId}-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/pom.xml (original)
+++ geronimo/samples/branches/2.1/pom.xml Fri Sep 19 12:18:50 2008
@@ -87,7 +87,34 @@
         <module>samples</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo</groupId>
+                <artifactId>geronimo</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
+
+        <pluginManagement>
+            <plugins>
+                <!--
+                HACK: Force the use of 2.4, since 2.3 causes the release profile to fail for this project.
+                      Upgrading here to avoid needing to wait for another Genesis release.
+                -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -39,25 +39,4 @@
     <dependencies>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!--Legal files go in odd place, WEB-INF/classes/META-INF -->
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml Fri Sep 19 12:18:50 2008
@@ -89,26 +89,12 @@
                             <bundleFileName>connectors.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!--Legal files go in odd place, WEB-INF/classes/META-INF -->
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml Fri Sep 19 12:18:50 2008
@@ -39,26 +39,4 @@
     <dependencies>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!--Legal files go in odd place, WEB-INF/classes/META-INF -->
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml Fri Sep 19 12:18:50 2008
@@ -39,25 +39,4 @@
     <dependencies>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!--Legal files go in odd place, WEB-INF/classes/META-INF -->
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/app-per-port/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/pom.xml Fri Sep 19 12:18:50 2008
@@ -46,33 +46,4 @@
         <module>app-per-port-tomcat</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
 </project>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml Fri Sep 19 12:18:50 2008
@@ -74,6 +74,10 @@
                             <bundleFileName>bank-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
 

Modified: geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -63,29 +63,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/bank/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/pom.xml Fri Sep 19 12:18:50 2008
@@ -47,15 +47,4 @@
         <module>bank-client</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-ear/pom.xml Fri Sep 19 12:18:50 2008
@@ -77,6 +77,10 @@
                             <bundleFileName>calculator-ejb-${version}.jar</bundleFileName>
                         </ejbModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator/calculator-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -41,29 +41,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator/pom.xml Fri Sep 19 12:18:50 2008
@@ -42,16 +42,4 @@
         <module>calculator-tomcat</module>
     </modules>
 
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer/customer-ear/pom.xml Fri Sep 19 12:18:50 2008
@@ -74,6 +74,10 @@
                             <bundleFileName>customer-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer/customer-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -45,29 +45,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/customer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer/pom.xml Fri Sep 19 12:18:50 2008
@@ -60,15 +60,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -63,29 +63,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/dbtester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/pom.xml Fri Sep 19 12:18:50 2008
@@ -44,16 +44,4 @@
         <module>dbtester-tomcat</module>
     </modules>
 
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -36,29 +36,4 @@
 
     <description>Geronimo Samples. WEB Module</description>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/inventory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/pom.xml Fri Sep 19 12:18:50 2008
@@ -44,15 +44,4 @@
         <module>inventory-tomcat</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -59,24 +59,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                    <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.wsdl, **/*.xsd, **/*.jsp, **/*.xml, **/*.class, **/*.html, META-INF/*</warSourceIncludes>
-                    <archiveClasses>true</archiveClasses>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.samples.jws.client.CalculatorClient</mainClass>
-                            <addClasspath>false</addClasspath>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml Fri Sep 19 12:18:50 2008
@@ -44,15 +44,4 @@
         <module>jaxws-calculator-tomcat</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-ear/pom.xml Fri Sep 19 12:18:50 2008
@@ -87,6 +87,10 @@
                             <bundleFileName>jms-mdb-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/jms-mdb-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -45,29 +45,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb/pom.xml Fri Sep 19 12:18:50 2008
@@ -54,15 +54,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml Fri Sep 19 12:18:50 2008
@@ -45,15 +45,4 @@
         <module>ldap-sample-app-tomcat</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml Fri Sep 19 12:18:50 2008
@@ -74,6 +74,10 @@
                             <bundleFileName>myphonebook-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -45,29 +45,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/pom.xml Fri Sep 19 12:18:50 2008
@@ -60,15 +60,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml Fri Sep 19 12:18:50 2008
@@ -74,6 +74,10 @@
                             <bundleFileName>mytime-war-${version}.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -45,29 +45,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/pom.xml Fri Sep 19 12:18:50 2008
@@ -46,15 +46,4 @@
         <module>mytime-tomcat</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Fri Sep 19 12:18:50 2008
@@ -16,7 +16,9 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><!-- $Rev$ $Date$ -->
+-->
+<!-- $Rev$ $Date$ -->
+
 <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>
@@ -68,18 +70,6 @@
         <module>all-samples</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo</groupId>
-                <artifactId>geronimo</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -105,53 +95,10 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <configuration>
-                        <archiveClasses>true</archiveClasses>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-
-                        <webResources>
-                            <resource>
-                                <directory>${pom.basedir}/src/main/webapp/WEB-INF</directory>
-                                <targetPath>WEB-INF</targetPath>
-                                <filtering>true</filtering>
-                            </resource>
-                        </webResources>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-ear-plugin</artifactId>
-                    <configuration>
-                        <resourcesDir>${project.build.outputDirectory}</resourcesDir>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
                     <dependencies>
                         <dependency>
@@ -166,25 +113,46 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
+                    <archiveClasses>true</archiveClasses>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
 
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
+                    <!--
+                    HACK: Include legal files explicity, otherwise they will end up in the wrong path
+                          or in another jar file in the war.
+
+                    NOTE: targetPath is broken for webResources (as documented)
+                    -->
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.outputDirectory}</directory>
+                            <includes>
+                                <include>META-INF/LICENSE*</include>
+                                <include>META-INF/NOTICE*</include>
+                                <include>META-INF/DISCLAIMER*</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
 
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were found -->
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-ear-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                </configuration>
             </plugin>
 
             <plugin>
@@ -211,78 +179,9 @@
                     </commonInstance>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.0.1</version>
-                <reportSets>
-                    <reportSet>
-                        <reports />
-                    </reportSet>
-                </reportSets>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <aggregate>true</aggregate>
-                    <minmemory>128m</minmemory>
-                    <maxmemory>512</maxmemory>
-                    <breakiterator>true</breakiterator>
-                    <quiet>true</quiet>
-                    <verbose>false</verbose>
-                    <source>1.5</source>
-                    <linksource>true</linksource>
-                    <links>
-                        <!-- JSE -->
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-
-                        <!-- JEE -->
-                        <link>http://java.sun.com/javaee/5/docs/api/</link>
-
-                        <!-- Libraries -->
-                        <link>http://jakarta.apache.org/commons/collections/apidocs</link>
-                        <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-                        <link>http://www.junit.org/junit/javadoc/</link>
-                        <link>http://logging.apache.org/log4j/docs/api/</link>
-                        <link>http://jakarta.apache.org/regexp/apidocs/</link>
-                        <link>http://jakarta.apache.org/velocity/api/</link>
-                    </links>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <aggregate>true</aggregate>
-                    <destDir>${project.basedir}/docs/xref</destDir>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <inherited>false</inherited>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <inherited>false</inherited>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <inherited>false</inherited>
-            </plugin>
-        </plugins>
-    </reporting>
-
     <profiles>
         <!-- This profile creates a sample template.
               Use -DsampleName to specify the name of your sample.
@@ -296,22 +195,22 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.1</version>
+                        <!--<version>1.1</version>-->
                         <dependencies>
                             <dependency>
                                 <groupId>oro</groupId>
                                 <artifactId>oro</artifactId>
-                                <version>2.0.8</version>
+                                <!--<version>2.0.8</version>-->
                             </dependency>
                             <dependency>
                                 <groupId>ant</groupId>
                                 <artifactId>ant-apache-oro</artifactId>
-                                <version>1.6.4</version>
+                                <!--<version>1.6.4</version>-->
                             </dependency>
                             <dependency>
                                 <groupId>ant</groupId>
                                 <artifactId>ant-optional</artifactId>
-                                <version>1.5.3-1</version>
+                                <!--<version>1.5.3-1</version>-->
                             </dependency>
                         </dependencies>
                         <inherited>false</inherited>

Modified: geronimo/samples/branches/2.1/samples/sendmail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/pom.xml Fri Sep 19 12:18:50 2008
@@ -44,15 +44,4 @@
         <module>sendmail-tomcat</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -39,29 +39,4 @@
     <dependencies>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/timereport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/pom.xml Fri Sep 19 12:18:50 2008
@@ -44,15 +44,4 @@
         <module>timereport-tomcat</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml?rev=697195&r1=697194&r2=697195&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml Fri Sep 19 12:18:50 2008
@@ -39,29 +39,4 @@
     <dependencies>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>



Mime
View raw message