geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r502075 - in /geronimo/samples/branches/2.0-M2: ./ geronimo-samples-archetype/ geronimo-samples-archetype/src/main/resources/archetype-resources/ samples-parent/ samples/ samples/calculator-stateless-pojo/
Date Thu, 01 Feb 2007 02:04:26 GMT
Author: prasad
Date: Wed Jan 31 18:04:25 2007
New Revision: 502075

URL: http://svn.apache.org/viewvc?view=rev&rev=502075
Log:
* the parent artifact of all individual samples is now called "samples"
* the top most artifact is now called samples-parent
* samples-parent inherits from genesis:project.config
* configured all report plugins to inherited=false so that individual samples do not generate
unwanted reports.

Added:
    geronimo/samples/branches/2.0-M2/samples/
      - copied from r502008, geronimo/samples/branches/2.0-M2/samples-parent/
Removed:
    geronimo/samples/branches/2.0-M2/samples-parent/
Modified:
    geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/pom.xml
    geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/samples/branches/2.0-M2/pom.xml
    geronimo/samples/branches/2.0-M2/samples/calculator-stateless-pojo/pom.xml
    geronimo/samples/branches/2.0-M2/samples/pom.xml

Modified: geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/pom.xml?view=diff&rev=502075&r1=502074&r2=502075
==============================================================================
--- geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/pom.xml (original)
+++ geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/pom.xml Wed Jan 31 18:04:25
2007
@@ -27,7 +27,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>samples</artifactId>
+        <artifactId>samples-parent</artifactId>
         <version>2.0-M2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml?view=diff&rev=502075&r1=502074&r2=502075
==============================================================================
--- geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ geronimo/samples/branches/2.0-M2/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
Wed Jan 31 18:04:25 2007
@@ -26,7 +26,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>samples-parent</artifactId>
+        <artifactId>samples</artifactId>
         <version>2.0-M2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/samples/branches/2.0-M2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/pom.xml?view=diff&rev=502075&r1=502074&r2=502075
==============================================================================
--- geronimo/samples/branches/2.0-M2/pom.xml (original)
+++ geronimo/samples/branches/2.0-M2/pom.xml Wed Jan 31 18:04:25 2007
@@ -20,14 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis</groupId>
-        <artifactId>genesis</artifactId>
+        <groupId>org.apache.geronimo.genesis.config</groupId>
+        <artifactId>project-config</artifactId>
         <version>1.1</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>
-    <artifactId>samples</artifactId>
-    <name>Geronimo Samples</name>
+    <artifactId>samples-parent</artifactId>
+    <name>Geronimo Samples :: Parent</name>
     <version>2.0-M2</version>
     <packaging>pom</packaging>
 
@@ -41,7 +41,7 @@
 
     <modules>
         <module>geronimo-samples-archetype</module>
-        <module>samples-parent</module>
+        <module>samples</module>
   </modules>
 
     <build>

Modified: geronimo/samples/branches/2.0-M2/samples/calculator-stateless-pojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/samples/calculator-stateless-pojo/pom.xml?view=diff&rev=502075&r1=502008&r2=502075
==============================================================================
--- geronimo/samples/branches/2.0-M2/samples/calculator-stateless-pojo/pom.xml (original)
+++ geronimo/samples/branches/2.0-M2/samples/calculator-stateless-pojo/pom.xml Wed Jan 31
18:04:25 2007
@@ -23,7 +23,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>samples-parent</artifactId>
+        <artifactId>samples</artifactId>
         <version>2.0-M2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/samples/branches/2.0-M2/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.0-M2/samples/pom.xml?view=diff&rev=502075&r1=502008&r2=502075
==============================================================================
--- geronimo/samples/branches/2.0-M2/samples/pom.xml (original)
+++ geronimo/samples/branches/2.0-M2/samples/pom.xml Wed Jan 31 18:04:25 2007
@@ -21,19 +21,22 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>samples</artifactId>
+        <artifactId>samples-parent</artifactId>
         <version>2.0-M2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>samples-parent</artifactId>
-    <name>Geronimo Samples :: Parent</name>
+
+    <artifactId>samples</artifactId>
+    <name>Geronimo Samples :: Samples</name>
     <packaging>pom</packaging>
     <description>
         Geronimo Samples.
     </description>
+
     <modules>
         <module>calculator-stateless-pojo</module>
     </modules>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -70,9 +73,9 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.0.2</version>
                     <configuration>
-                      <!--
-                        <archiveClasses>true</archiveClasses>
-                        -->
+                        <!--
+                          <archiveClasses>true</archiveClasses>
+                          -->
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
                             <addMavenDescriptor>false</addMavenDescriptor>
@@ -84,7 +87,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
                     <configuration>
-                      <resourcesDir>${project.build.outputDirectory}</resourcesDir>
+                        <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
                             <addMavenDescriptor>false</addMavenDescriptor>
@@ -158,6 +161,21 @@
                     <aggregate>true</aggregate>
                 </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>
 
@@ -167,7 +185,6 @@
             <build>
                 <pluginManagement>
                     <plugins>
-                        
                         <plugin>
                             <groupId>org.apache.geronimo.plugins</groupId>
                             <artifactId>geronimo-maven-plugin</artifactId>



Mime
View raw message