geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r673192 - in /geronimo/samples/branches/2.1/samples: ./ all-samples/ all-samples/all-samples-jetty/ all-samples/all-samples-jetty/src/ all-samples/all-samples-jetty/src/main/ all-samples/all-samples-jetty/src/main/plan/ all-samples/all-samp...
Date Tue, 01 Jul 2008 20:08:48 GMT
Author: jbohn
Date: Tue Jul  1 13:08:48 2008
New Revision: 673192

URL: http://svn.apache.org/viewvc?rev=673192&view=rev
Log:
merge 673178 & 673182 from trunk - all samples plugin

Added:
    geronimo/samples/branches/2.1/samples/all-samples/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-jetty/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml
      - copied, changed from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/src/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-jetty/src/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/src/main/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-jetty/src/main/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/src/main/plan/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-jetty/src/main/plan/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/src/main/plan/plan.xml
      - copied unchanged from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml
      - copied, changed from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/src/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/src/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/src/main/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/src/main/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/src/main/plan/
      - copied from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/src/main/plan/
    geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/src/main/plan/plan.xml
      - copied unchanged from r673178, geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.1/samples/all-samples/pom.xml
      - copied, changed from r673178, geronimo/samples/trunk/samples/all-samples/pom.xml
Modified:
    geronimo/samples/branches/2.1/samples/pom.xml

Copied: geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml (from
r673178, geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml?p2=geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml&p1=geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml&r1=673178&r2=673192&rev=673192&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml Tue Jul  1
13:08:48 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>all-samples</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>
@@ -176,22 +176,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>it</id>
-            <!--<properties>-->
-            <!--<it-server>jetty</it-server>-->
-            <!--</properties>-->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.geronimo.buildsupport</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
 

Copied: geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml (from
r673178, geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml?p2=geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml&p1=geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml&r1=673178&r2=673192&rev=673192&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml Tue Jul 
1 13:08:48 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>all-samples</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>
@@ -183,22 +183,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>it</id>
-            <!--<properties>-->
-            <!--<it-server>tomcat</it-server>-->
-            <!--</properties>-->
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.geronimo.buildsupport</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
 

Copied: geronimo/samples/branches/2.1/samples/all-samples/pom.xml (from r673178, geronimo/samples/trunk/samples/all-samples/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/all-samples/pom.xml?p2=geronimo/samples/branches/2.1/samples/all-samples/pom.xml&p1=geronimo/samples/trunk/samples/all-samples/pom.xml&r1=673178&r2=673192&rev=673192&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/all-samples/pom.xml Tue Jul  1 13:08:48 2008
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>all-samples</artifactId>

Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=673192&r1=673191&r2=673192&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Tue Jul  1 13:08:48 2008
@@ -68,6 +68,7 @@
         <module>jsp-examples</module>
         <module>servlet-examples</module>
         <module>app-per-port</module>
+        <module>all-samples</module>
     </modules>
 
     <dependencies>



Mime
View raw message