geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r659273 - in /geronimo/samples/trunk/samples: ./ CustomerService/ CustomerService/CustomerService-ear/ CustomerService/CustomerService-jetty/ CustomerService/CustomerService-tomcat/ jaxws-calculator/jaxws-calculator-jetty/
Date Thu, 22 May 2008 21:45:24 GMT
Author: djencks
Date: Thu May 22 14:45:22 2008
New Revision: 659273

URL: http://svn.apache.org/viewvc?rev=659273&view=rev
Log:
Demonstrate import scope.  Build against geronimo 2.1, except for car-maven-plugin

Modified:
    geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml
    geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml
    geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml
    geronimo/samples/trunk/samples/CustomerService/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
    geronimo/samples/trunk/samples/pom.xml

Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml?rev=659273&r1=659272&r2=659273&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml Thu May 22
14:45:22 2008
@@ -40,7 +40,6 @@
         <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-ra</artifactId>
-            <version>1.3</version>
             <type>rar</type>
         </dependency>
                 

Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml?rev=659273&r1=659272&r2=659273&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml Thu May 22
14:45:22 2008
@@ -43,19 +43,19 @@
             <artifactId>CustomerService-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
+            <artifactId>jetty6-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
+            <artifactId>jasper-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>

Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml?rev=659273&r1=659272&r2=659273&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml Thu May
22 14:45:22 2008
@@ -43,11 +43,12 @@
             <artifactId>CustomerService-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -55,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
+            <artifactId>tomcat6-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -63,7 +64,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
+            <artifactId>jasper-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>

Modified: geronimo/samples/trunk/samples/CustomerService/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/pom.xml?rev=659273&r1=659272&r2=659273&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/pom.xml (original)
+++ geronimo/samples/trunk/samples/CustomerService/pom.xml Thu May 22 14:45:22 2008
@@ -50,22 +50,16 @@
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        <version>1.1</version>
-        <type>jar</type>
         <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-core</artifactId>
-        <version>4.1.1</version>
-        <type>jar</type>
         <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jpa_3.0_spec</artifactId>
-        <version>1.1</version>
-        <type>jar</type>
         <scope>provided</scope>
     </dependency>
    </dependencies>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=659273&r1=659272&r2=659273&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Thu May
22 14:45:22 2008
@@ -43,6 +43,7 @@
             <artifactId>jaxws-calculator-ear</artifactId>
             <version>${version}</version>
             <type>ear</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=659273&r1=659272&r2=659273&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Thu May 22 14:45:22 2008
@@ -31,7 +31,7 @@
     </description>
 
     <properties>
-       <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+       <geronimoVersion>2.1</geronimoVersion>
 
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
         <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
@@ -71,23 +71,33 @@
         <module>app-per-port</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>
             <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <version>1.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.1.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -192,13 +202,11 @@
                     -->
                     <commonInstance>
                         <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <!--<geronimo-version>${geronimoVersion}</geronimo-version>-->
                             <jvm-version>1.5</jvm-version>
                             <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
                             <source-repository>~/.m2/repository/</source-repository>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>



Mime
View raw message