geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r809606 - in /geronimo/daytrader/trunk/assemblies: ./ daytrader-javaee/ daytrader-web-ejb/ daytrader-web-jdbc/ dojo-ui-ear/ dojo-ui-web/ javaee/ javaee/daytrader-ear/ javaee/daytrader-war/ javaee/dojo-ui-ear/ javaee/dojo-ui-web/ web/ web/da...
Date Mon, 31 Aug 2009 14:20:30 GMT
Author: dwoods
Date: Mon Aug 31 14:20:29 2009
New Revision: 809606

URL: http://svn.apache.org/viewvc?rev=809606&view=rev
Log:
reorg assemblies into javaee vs. plain webcontainer

Added:
    geronimo/daytrader/trunk/assemblies/javaee/
    geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/
      - copied from r809008, geronimo/daytrader/trunk/assemblies/daytrader-javaee/
    geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml
      - copied, changed from r809033, geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml
    geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/
      - copied from r809008, geronimo/daytrader/trunk/assemblies/daytrader-web-ejb/
    geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-ear/
      - copied from r809008, geronimo/daytrader/trunk/assemblies/dojo-ui-ear/
    geronimo/daytrader/trunk/assemblies/javaee/dojo-ui-web/
      - copied from r809008, geronimo/daytrader/trunk/assemblies/dojo-ui-web/
    geronimo/daytrader/trunk/assemblies/javaee/pom.xml   (with props)
    geronimo/daytrader/trunk/assemblies/web/
    geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/
      - copied from r809008, geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/
    geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/README
      - copied unchanged from r809033, geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README
    geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/daytrader-derby-datasource-plan.xml
      - copied unchanged from r809033, geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/daytrader-derby-datasource-plan.xml
    geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml
      - copied, changed from r809033, geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml
Removed:
    geronimo/daytrader/trunk/assemblies/daytrader-javaee/
    geronimo/daytrader/trunk/assemblies/daytrader-web-ejb/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/
    geronimo/daytrader/trunk/assemblies/dojo-ui-ear/
    geronimo/daytrader/trunk/assemblies/dojo-ui-web/
Modified:
    geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml
    geronimo/daytrader/trunk/assemblies/pom.xml

Copied: geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml (from r809033, geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml?p2=geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml&p1=geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml&r1=809033&r2=809606&rev=809606&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-javaee/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear/pom.xml Mon Aug 31 14:20:29 2009
@@ -19,49 +19,59 @@
 <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>
+        <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
+        <artifactId>javaee</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
-    <artifactId>daytrader-javaee</artifactId>
+    <groupId>org.apache.geronimo.daytrader.assemblies.javaee</groupId>
+    <artifactId>daytrader-ear</artifactId>
     <packaging>ear</packaging>
     <name>DayTrader :: Assemblies - JavaEE EAR</name>
     <description>Daytrader EAR</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/daytrader-javaee</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/daytrader-javaee</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/assemblies/daytrader-javaee</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/assemblies/javaee/daytrader-ear</url>
     </scm>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
-            <artifactId>daytrader-web-ejb</artifactId>
+            <groupId>org.apache.geronimo.daytrader.assemblies.javaee</groupId>
+            <artifactId>daytrader-war</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
         <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>ejb3</artifactId>
+            <artifactId>daytrader-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-entities</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-ejb3</artifactId>
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>soap</artifactId>
+            <artifactId>daytrader-soap</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>web</artifactId>
+            <artifactId>daytrader-web</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
@@ -87,35 +97,47 @@
                     <description>DayTrader Stock Trading Performance Benchmark Sample</description>
                     <version>5</version>
                     <modules>
-                        <webModule>
-                            <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
-                            <artifactId>daytrader-web-ejb</artifactId>
-                            <contextRoot>/daytrader</contextRoot>
-                            <bundleFileName>web.war</bundleFileName>
-                        </webModule>
+                        <javaModule>
+                            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+                            <artifactId>daytrader-util</artifactId>
+                            <bundleFileName>util.jar</bundleFileName>
+                            <includeInApplicationXml>false</includeInApplicationXml>
+                        </javaModule>
+                        <javaModule>
+                            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+                            <artifactId>daytrader-core</artifactId>
+                            <bundleFileName>core.jar</bundleFileName>
+                            <includeInApplicationXml>false</includeInApplicationXml>
+                        </javaModule>
+                        <javaModule>
+                            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+                            <artifactId>daytrader-entities</artifactId>
+                            <bundleFileName>entities.jar</bundleFileName>
+                            <includeInApplicationXml>false</includeInApplicationXml>
+                        </javaModule>
                         <ejbModule>
                             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-                            <artifactId>ejb3</artifactId>
+                            <artifactId>daytrader-ejb3</artifactId>
                             <bundleFileName>dt-ejb.jar</bundleFileName>
                         </ejbModule>
                         <javaModule>
                             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-                            <artifactId>web</artifactId>
+                            <artifactId>daytrader-web</artifactId>
                             <bundleFileName>web.jar</bundleFileName>
                             <includeInApplicationXml>false</includeInApplicationXml>
                         </javaModule>
                         <javaModule>
                             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-                            <artifactId>soap</artifactId>
+                            <artifactId>daytrader-soap</artifactId>
                             <bundleFileName>soap.jar</bundleFileName>
                             <includeInApplicationXml>false</includeInApplicationXml>
                         </javaModule>
-                        <javaModule>
-                            <groupId>org.apache.geronimo.daytrader.modules</groupId>
-                            <artifactId>core</artifactId>
-                            <bundleFileName>core.jar</bundleFileName>
-                            <includeInApplicationXml>false</includeInApplicationXml>
-                        </javaModule>
+                        <webModule>
+                            <groupId>org.apache.geronimo.daytrader.assemblies.javaee</groupId>
+                            <artifactId>daytrader-war</artifactId>
+                            <contextRoot>/daytrader</contextRoot>
+                            <bundleFileName>web.war</bundleFileName>
+                        </webModule>
                         <javaModule>
                             <groupId>org.apache.geronimo.daytrader.modules</groupId>
                             <artifactId>streamer</artifactId>

Modified: geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml?rev=809606&r1=809008&r2=809606&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/javaee/daytrader-war/pom.xml Mon Aug 31 14:20:29 2009
@@ -19,45 +19,58 @@
 <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>
+        <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
+        <artifactId>javaee</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
-    <artifactId>daytrader-web-ejb</artifactId>
+    <groupId>org.apache.geronimo.daytrader.assemblies.javaee</groupId>
+    <artifactId>daytrader-war</artifactId>
     <packaging>war</packaging>
-    <name>DayTrader :: Assemblies - Web EJB3</name>
-    <description>Daytrader EJB Web Module</description>
+    <name>DayTrader :: Assemblies - JavaEE WAR</name>
+    <description>Daytrader JavaEE Web Module</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/daytrader-web-ejb</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/daytrader-web-ejb</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/assemblies/daytrader-web-ejb</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/assemblies/javaee/daytrader-war</url>
     </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>daytrader-util</artifactId>
             <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-core</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>ejb3</artifactId>
+            <artifactId>daytrader-entities</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>daytrader-ejb3</artifactId>
+            <version>${pom.version}</version>
             <type>ejb</type>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>soap</artifactId>
+            <artifactId>daytrader-soap</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>web</artifactId>
+            <artifactId>daytrader-web</artifactId>
             <version>${pom.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -135,7 +148,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Class-Path>core.jar dt-ejb.jar soap.jar web.jar streamer.jar
wsappclient.jar</Class-Path>
+                            <Class-Path>util.jar core.jar entities.jar dt-ejb.jar soap.jar
web.jar streamer.jar wsappclient.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                     <resources>

Added: geronimo/daytrader/trunk/assemblies/javaee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/javaee/pom.xml?rev=809606&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/javaee/pom.xml (added)
+++ geronimo/daytrader/trunk/assemblies/javaee/pom.xml Mon Aug 31 14:20:29 2009
@@ -0,0 +1,42 @@
+<?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</groupId>
+    <artifactId>assemblies-javaee</artifactId>
+    <name>DayTrader :: Assemblies - JavaEE</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>daytrader-web</module>
+        <module>daytrader-ear</module>
+        <!--
+        <module>dojo-ui-war</module>
+        <module>dojo-ui-ear</module>
+        -->
+    </modules>
+
+</project>

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

Modified: geronimo/daytrader/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/pom.xml?rev=809606&r1=809605&r2=809606&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/pom.xml Mon Aug 31 14:20:29 2009
@@ -31,12 +31,8 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>daytrader-web-jdbc</module>
-        <module>daytrader-web-ejb</module>
-        <module>daytrader-javaee</module>
-<!--
-        <module>daytrader-web-jpa</module>
--->
+        <module>javaee</module>
+        <module>web</module>
     </modules>
 
 </project>

Copied: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml (from r809033,
geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml?p2=geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml&p1=geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml&r1=809033&r2=809606&rev=809606&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/pom.xml Mon Aug 31 14:20:29
2009
@@ -48,14 +48,31 @@
             <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>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -79,11 +96,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <!-- <version>1.1.1</version>  -->



Mime
View raw message