geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r695986 - in /geronimo/samples/trunk/samples: app-per-port/app-per-port-tomcat/ bank/bank-ear/ bank/bank-jetty/ bank/bank-tomcat/ bank/bank-war/ calculator/calculator-jetty/ ldap-sample-app/ldap-sample-app-jetty/ ldap-sample-app/ldap-sample...
Date Tue, 16 Sep 2008 17:33:55 GMT
Author: jbohn
Date: Tue Sep 16 10:33:53 2008
New Revision: 695986

URL: http://svn.apache.org/viewvc?rev=695986&view=rev
Log:
merge 695937 from branches/2.1 - cleanup the poms a bit

Modified:
    geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml
    geronimo/samples/trunk/samples/bank/bank-ear/pom.xml
    geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
    geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml
    geronimo/samples/trunk/samples/bank/bank-war/pom.xml
    geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml Tue Sep 16 10:33:53
2008
@@ -75,7 +75,6 @@
             <artifactId>jasper</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
-            <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>

Modified: geronimo/samples/trunk/samples/bank/bank-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-ear/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-ear/pom.xml Tue Sep 16 10:33:53 2008
@@ -37,7 +37,6 @@
     <description>Geronimo Samples. EAR Module</description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>bank-war</artifactId>

Modified: geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml Tue Sep 16 10:33:53 2008
@@ -45,6 +45,7 @@
             <type>ear</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>sample-datasource</artifactId>
@@ -97,19 +98,20 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml Tue Sep 16 10:33:53 2008
@@ -97,19 +97,20 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/samples/trunk/samples/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-war/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/bank/bank-war/pom.xml Tue Sep 16 10:33:53 2008
@@ -43,17 +43,20 @@
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_3.0_spec</artifactId>

Modified: geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/calculator/calculator-jetty/pom.xml Tue Sep 16 10:33:53
2008
@@ -69,14 +69,14 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
+                                                                                        
                                                                                         
                                                              <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>persistence-jpa10-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6</artifactId>
@@ -90,12 +90,14 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openjpa</artifactId>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Tue Sep 16
10:33:53 2008
@@ -80,6 +80,7 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6</artifactId>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml Tue Sep 16
10:33:53 2008
@@ -41,7 +41,6 @@
     </description>
 
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
@@ -56,16 +55,6 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-
-        <!--
-                <dependency>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>directory</artifactId>
-                    <version>${geronimoVersion}</version>
-                    <type>car</type>
-                </dependency>
-        -->
-
     </dependencies>
 
     <build>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Tue Sep
16 10:33:53 2008
@@ -74,13 +74,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.configs</groupId>-->
-        <!--<artifactId>jasper</artifactId>-->
-        <!--<version>${geronimoVersion}</version>-->
-        <!--<type>car</type>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6</artifactId>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml Tue Sep
16 10:33:53 2008
@@ -53,14 +53,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.configs</groupId>-->
-        <!--<artifactId>jasper-deployer</artifactId>-->
-        <!--<version>${geronimoVersion}</version>-->
-        <!--<type>car</type>-->
-        <!--<scope>provided</scope>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=695986&r1=695985&r2=695986&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml Tue Sep
16 10:33:53 2008
@@ -53,20 +53,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.configs</groupId>-->
-        <!--<artifactId>jasper-deployer</artifactId>-->
-        <!--<version>${geronimoVersion}</version>-->
-        <!--<type>car</type>-->
-        <!--<scope>provided</scope>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.configs</groupId>-->
-        <!--<artifactId>jasper</artifactId>-->
-        <!--<version>${geronimoVersion}</version>-->
-        <!--<type>car</type>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6</artifactId>



Mime
View raw message