geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r809684 - in /geronimo/daytrader/trunk/assemblies: javaee/pom.xml web/daytrader-web-jdbc/pom.xml web/pom.xml
Date Mon, 31 Aug 2009 18:44:01 GMT
Author: dwoods
Date: Mon Aug 31 18:43:59 2009
New Revision: 809684

URL: http://svn.apache.org/viewvc?rev=809684&view=rev
Log:
some assembly fixes

Added:
    geronimo/daytrader/trunk/assemblies/web/pom.xml   (with props)
Modified:
    geronimo/daytrader/trunk/assemblies/javaee/pom.xml
    geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml

Modified: geronimo/daytrader/trunk/assemblies/javaee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/pom.xml?rev=809684&r1=809683&r2=809684&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/pom.xml Mon Aug 31 18:43:59 2009
@@ -25,13 +25,13 @@
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.geronimo.daytrader</groupId>
-    <artifactId>assemblies-javaee</artifactId>
-    <name>DayTrader :: Assemblies - JavaEE</name>
+    <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
+    <artifactId>javaee</artifactId>
+    <name>DayTrader :: Assemblies for JavaEE</name>
     <packaging>pom</packaging>
 
     <modules>
-        <module>daytrader-web</module>
+        <module>daytrader-war</module>
         <module>daytrader-ear</module>
         <!--
         <module>dojo-ui-war</module>

Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml?rev=809684&r1=809683&r2=809684&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml Mon Aug 31 18:43:59
2009
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>assemblies</artifactId>
+        <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
+        <artifactId>web</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
-    <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
+    <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
     <artifactId>daytrader-web-jdbc</artifactId>    
     <packaging>war</packaging>
     <name>DayTrader :: Assemblies - Web + Direct JDBC</name>
@@ -34,12 +34,22 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>daytrader-util</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>web</artifactId>
+            <artifactId>daytrader-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-beans</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-web</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
@@ -48,59 +58,59 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
 
-        <!-- HACK - Include these for Web-only containers -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
+        <!-- web container provided specs -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>
         </dependency>
+
+        <!-- test depends -->
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
 
+        <!-- Not required for Bean version of TradeDirect
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
-            <scope>provided</scope>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <!-- <version>1.1.1</version>  -->
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+        </dependency>
+        -->
     </dependencies>
 
     <build>

Added: geronimo/daytrader/trunk/assemblies/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/pom.xml?rev=809684&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/pom.xml (added)
+++ geronimo/daytrader/trunk/assemblies/web/pom.xml Mon Aug 31 18:43:59 2009
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<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>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
+    <artifactId>web</artifactId>
+    <name>DayTrader :: Assemblies for Web containers</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>daytrader-web-jdbc</module>
+<!--
+        <module>daytrader-web-jpa</module>
+-->
+    </modules>
+
+</project>

Propchange: geronimo/daytrader/trunk/assemblies/web/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message