geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r722654 - in /geronimo/daytrader/trunk: ./ bin/ bin/dbscripts/derby/ daytrader-jetty/ daytrader-jetty/src/main/plan/ daytrader-jms/ daytrader-tomcat/ daytrader-tomcat/src/main/plan/ modules/dojo-ui-ear/ modules/dojo-ui-web/ modules/dojo-ui-...
Date Tue, 02 Dec 2008 22:46:34 GMT
Author: dwoods
Date: Tue Dec  2 14:46:33 2008
New Revision: 722654

URL: http://svn.apache.org/viewvc?rev=722654&view=rev
Log:
merged in latest updates from branches/2.1.3

Added:
    geronimo/daytrader/trunk/plans/dayTrader-derby-plan.xml
      - copied, changed from r722614, geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml
    geronimo/daytrader/trunk/repository/
    geronimo/daytrader/trunk/repository/pom.xml   (with props)
Removed:
    geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml
Modified:
    geronimo/daytrader/trunk/NOTICE.txt
    geronimo/daytrader/trunk/README
    geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.bat
    geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.sh
    geronimo/daytrader/trunk/bin/deploy.sh
    geronimo/daytrader/trunk/daytrader-jetty/pom.xml
    geronimo/daytrader/trunk/daytrader-jetty/src/main/plan/plan.xml
    geronimo/daytrader/trunk/daytrader-jms/pom.xml
    geronimo/daytrader/trunk/daytrader-tomcat/pom.xml
    geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml
    geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml
    geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml
    geronimo/daytrader/trunk/modules/dojo-ui-web/src/main/webapp/WEB-INF/geronimo-web.xml.org
    geronimo/daytrader/trunk/modules/ear/pom.xml
    geronimo/daytrader/trunk/modules/ejb/pom.xml
    geronimo/daytrader/trunk/modules/json-proxy/pom.xml
    geronimo/daytrader/trunk/modules/streamer/pom.xml
    geronimo/daytrader/trunk/modules/web/NOTICE
    geronimo/daytrader/trunk/modules/web/pom.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/daytrader/trunk/modules/wsappclient/pom.xml
    geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml
    geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml
    geronimo/daytrader/trunk/plans/dayTrader-sqlserver-plan.xml
    geronimo/daytrader/trunk/plans/dojo-ui-plan.xml
    geronimo/daytrader/trunk/plans/streamerclient/geronimo-plugin.xml
    geronimo/daytrader/trunk/plans/wsclient/geronimo-plugin.xml
    geronimo/daytrader/trunk/pom.xml

Modified: geronimo/daytrader/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/NOTICE.txt?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/NOTICE.txt (original)
+++ geronimo/daytrader/trunk/NOTICE.txt Tue Dec  2 14:46:33 2008
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/daytrader/trunk/README
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/README?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/README (original)
+++ geronimo/daytrader/trunk/README Tue Dec  2 14:46:33 2008
@@ -1,4 +1,4 @@
-(C) Copyright 2006,2007 The Apache Software Foundation.
+(C) Copyright 2006,2008 The Apache Software Foundation.
 ----------------------------------------------------------------------
 
 The code in this directory contains the code for the benchmark sample called Day Trader.  This sample was contributed by IBM to the Apache Geronimo project under the ASF license to further functional and performance testing of Geronimo.  
@@ -6,7 +6,7 @@
 
 BUILD
 -----
-To build the dayTrader EAR, you need to have Maven 2.0.5 or later installed.   This can be found at http://maven.apache.org.  Once installed you can build DayTrader by executing the following command from the dayTrader root directory (the directory containing this README).:
+To build the dayTrader EAR, you need to have Maven 2.0.9 or later installed.   This can be found at http://maven.apache.org.  Once installed you can build DayTrader by executing the following command from the dayTrader root directory (the directory containing this README).:
 
         mvn clean install
 
@@ -22,12 +22,12 @@
 For app clients, you'll have to install them using deploy install-plugin commands for now, before we publish the app client plugins on a public repo, for example: 
 
 ./gsh deploy/install-plugin -u system -w manager $DAYTRADER_HOME/daytrader-tomcat/target/daytrader-ws-client-2.2-SNAPSHOT.car
-./gsh deploy/install-plugin -u system -w manager $DAYTRADER_HOME/daytrader-tomcat/target/daytrader-streamer-client-2.2.car 
+./gsh deploy/install-plugin -u system -w manager $DAYTRADER_HOME/daytrader-tomcat/target/daytrader-streamer-client-2.2-SNAPSHOT.car 
 
 
 You will need to create the database and populate the initial data into the database.  Make sure Geronimo is started and the GERONIMO_HOME environment variable is defined.
 
-1. If you want to use the embedded Cloudscape database, you can populate tables and data by visiting http://localhost:8080/daytrader/ in your browser.
+1. If you want to use the embedded Apache Derby database, you can populate tables and data by visiting http://localhost:8080/daytrader/ in your browser.
 
 2. If you want to use a DB2 database as a back-end database provider, please copy DB2 jdbc drivers to server's repository and use the daytrader-db2-datasource plugin instead.    
 

Modified: geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.bat
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.bat?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.bat (original)
+++ geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.bat Tue Dec  2 14:46:33 2008
@@ -26,7 +26,7 @@
 :GERONIMO_OK
 
 set DERBY_PATH=%GERONIMO_HOME%\repository\org\apache\derby
-set DERBY_VER=10.2.2.0
+set DERBY_VER=10.4.2.0
 set CLASSPATH=%DERBY_PATH%\derby\%DERBY_VER%\derby-%DERBY_VER%.jar
 set CLASSPATH=%CLASSPATH%;%DERBY_PATH%\derbynet\%DERBY_VER%\derbynet-%DERBY_VER%.jar
 set CLASSPATH=%CLASSPATH%;%DERBY_PATH%\derbytools\%DERBY_VER%\derbytools-%DERBY_VER%.jar
@@ -41,4 +41,4 @@
 
 @echo Table creation complete
  
-:END
\ No newline at end of file
+:END

Modified: geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.sh
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.sh?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.sh (original)
+++ geronimo/daytrader/trunk/bin/dbscripts/derby/createDerbyDB.sh Tue Dec  2 14:46:33 2008
@@ -28,7 +28,7 @@
 fi
 
 export DERBY_PATH=${GERONIMO_HOME}/repository/org/apache/derby
-export DERBY_VER=10.2.2.0
+export DERBY_VER=10.4.2.0
 export CLASSPATH=${DERBY_PATH}/derby/${DERBY_VER}/derby-${DERBY_VER}.jar
 export CLASSPATH=${CLASSPATH}:${DERBY_PATH}/derbynet/${DERBY_VER}/derbynet-${DERBY_VER}.jar
 export CLASSPATH=${CLASSPATH}:${DERBY_PATH}/derbytools/${DERBY_VER}/derbytools-${DERBY_VER}.jar

Modified: geronimo/daytrader/trunk/bin/deploy.sh
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/bin/deploy.sh?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/bin/deploy.sh (original)
+++ geronimo/daytrader/trunk/bin/deploy.sh Tue Dec  2 14:46:33 2008
@@ -27,4 +27,4 @@
   exit
 fi
 
-${JAVA_HOME}/bin/java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy daytrader-ear-1.2-SNAPSHOT.ear daytrader-1.2-beta-plan.xml
+${JAVA_HOME}/bin/java -jar ${GERONIMO_HOME}/bin/deployer.jar --user system --password manager deploy daytrader-ear-2.2-SNAPSHOT.ear dayTrader-derby-plan.xml

Modified: geronimo/daytrader/trunk/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-jetty/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/trunk/daytrader-jetty/pom.xml Tue Dec  2 14:46:33 2008
@@ -1,4 +1,22 @@
-<?xml version="1.0"?>
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
 <project>
     <parent>
         <artifactId>daytrader</artifactId>

Modified: geronimo/daytrader/trunk/daytrader-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-jetty/src/main/plan/plan.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-jetty/src/main/plan/plan.xml (original)
+++ geronimo/daytrader/trunk/daytrader-jetty/src/main/plan/plan.xml Tue Dec  2 14:46:33 2008
@@ -27,7 +27,7 @@
     -->
     <module>
         <web>web.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
             <service-ref>
                 <service-ref-name>service/Trade</service-ref-name>
                 <port>
@@ -88,7 +88,7 @@
 
     <module>
         <java>streamer.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
@@ -159,7 +159,7 @@
 
     <module>
         <java>wsappclient.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>

Modified: geronimo/daytrader/trunk/daytrader-jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-jms/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-jms/pom.xml (original)
+++ geronimo/daytrader/trunk/daytrader-jms/pom.xml Tue Dec  2 14:46:33 2008
@@ -1,14 +1,37 @@
-<?xml version="1.0"?><project>
-  <parent>
-    <artifactId>daytrader</artifactId>
-    <groupId>org.apache.geronimo.daytrader</groupId>
-    <version>2.2-SNAPSHOT</version>
-  </parent>
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+<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>daytrader</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
   <groupId>org.apache.geronimo.daytrader</groupId>
   <artifactId>daytrader-jms</artifactId>
-  <packaging>car</packaging>
   <name>Daytrader :: JMS Resource</name>
+    <packaging>car</packaging>
+    <version>2.2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -73,4 +96,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/daytrader/trunk/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-tomcat/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/trunk/daytrader-tomcat/pom.xml Tue Dec  2 14:46:33 2008
@@ -1,4 +1,22 @@
-<?xml version="1.0"?>
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
 <project>
     <parent>
         <artifactId>daytrader</artifactId>
@@ -243,4 +261,4 @@
 
 
 
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/daytrader/trunk/daytrader-tomcat/src/main/plan/plan.xml Tue Dec  2 14:46:33 2008
@@ -27,7 +27,7 @@
     -->
     <module>
         <web>web.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
             <service-ref>
                 <service-ref-name>service/Trade</service-ref-name>
                 <port>
@@ -88,7 +88,7 @@
 
     <module>
         <java>streamer.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
@@ -159,7 +159,7 @@
 
     <module>
         <java>wsappclient.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>

Modified: geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/dojo-ui-ear/pom.xml Tue Dec  2 14:46:33 2008
@@ -1,4 +1,20 @@
 <?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"
@@ -8,7 +24,6 @@
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>dojo-ui-ear</artifactId>
     <name>DayTrader :: Dojo Interface and Proxy Ear</name>
@@ -16,8 +31,7 @@
     <description>Daytrader EAR</description>
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</connection>
-        <developerConnection>
-            scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</developerConnection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ear</url>
     </scm>
     <dependencies>
@@ -37,31 +51,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <!-- Do not Fail the build if no legal files were found-->
-                        <configuration>
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
+                <version>2.3.1</version>
                 <configuration>
                     <displayName>DayTrader Dojo UI</displayName>
-                    <description>
-                        Dojo User Interface for Daytrader
-                    </description>
+                    <description>Dojo User Interface for Daytrader</description>
                     <version>5</version>
                     <modules>
                         <webModule>
@@ -77,19 +72,12 @@
                             <bundleFileName>json-proxy.war</bundleFileName>
                         </webModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-one-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>install-maven-one-repository</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

Modified: geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/dojo-ui-web/pom.xml Tue Dec  2 14:46:33 2008
@@ -1,4 +1,20 @@
 <?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"
@@ -8,7 +24,6 @@
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>dojo-ui-web</artifactId>
     <name>DayTrader :: Dojo User Interface</name>
@@ -32,9 +47,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.1.1</version>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -73,7 +87,6 @@
                             <Class-Path/>
                         </manifestEntries>
                     </archive>
-
                     <resources>
                         <resource
                                 implementation="org.apache.maven.model.Resource">
@@ -86,6 +99,22 @@
                             </includes>
                         </resource>
                     </resources>
+                    <!--                        
+                    HACK: Include legal files explicity, otherwise they will
+                          end up in the wrong path
+                          or in another jar file in the war.    
+                    NOTE: targetPath is broken for webResources (as documented)
+                    -->
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.outputDirectory}</directory>
+                            <includes>
+                                <include>META-INF/LICENSE*</include>
+                                <include>META-INF/NOTICE*</include>
+                                <include>META-INF/DISCLAIMER*</include>
+                            </includes>
+                        </resource>
+                    </webResources>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/daytrader/trunk/modules/dojo-ui-web/src/main/webapp/WEB-INF/geronimo-web.xml.org
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/dojo-ui-web/src/main/webapp/WEB-INF/geronimo-web.xml.org?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/dojo-ui-web/src/main/webapp/WEB-INF/geronimo-web.xml.org (original)
+++ geronimo/daytrader/trunk/modules/dojo-ui-web/src/main/webapp/WEB-INF/geronimo-web.xml.org Tue Dec  2 14:46:33 2008
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app configId="atradeWeb/atradeWeb" xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.0">
+<web-app configId="atradeWeb/atradeWeb" xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
   <context-root>/atradeWeb</context-root>
   <context-priority-classloader>false</context-priority-classloader>
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/daytrader/trunk/modules/ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ear/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Tue Dec  2 14:46:33 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>daytrader-ear</artifactId>
     <name>DayTrader :: Enterprise Application</name>
@@ -64,48 +63,10 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                  <execution>
-                    <goals>
-                      <goal>process</goal>
-                    </goals>
-                    <configuration>
-                      <properties>
-                        <projectName>Apache Geronimo Daytrader</projectName>
-                      </properties>
-                      <resourceBundles>
-                        <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-                      </resourceBundles>
-                    </configuration>
-                  </execution>
-                </executions>
-              </plugin>
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <!-- Do not Fail the build if no legal files were found-->
-                        <configuration>
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <artifactId>maven-ear-plugin</artifactId>
                 <version>2.3.1</version>
                 <configuration>
-                    <displayName>DayTrader 2.0</displayName>
+                    <displayName>DayTrader EAR</displayName>
                     <description>DayTrader Stock Trading Performance Benchmark Sample</description>
                     <version>5</version>
                     <modules>
@@ -133,6 +94,10 @@
                             <includeInApplicationXml>true</includeInApplicationXml>
                         </javaModule>
                     </modules>
+                    <!--
+                    HACK: Include legal muck from maven-remote-resources-plugin
+                    -->
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Tue Dec  2 14:46:33 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>2.2-SNAPSHOT</version>
     </parent>
     <artifactId>daytrader-ejb</artifactId>
     <name>DayTrader :: EJBs</name>
@@ -61,13 +60,11 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
     	    <groupId>org.apache.geronimo.specs</groupId>
     	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    	    <version>1.1</version>
     	    <scope>provided</scope>
 	</dependency>
         <dependency>
@@ -85,24 +82,23 @@
             <artifactId>openjpa</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!--
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <version>2.6.2</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xmlParserAPIs</artifactId>
             <version>2.2.1</version>
             <scope>provided</scope>
         </dependency>
-
+        -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>    
     </dependencies>

Modified: geronimo/daytrader/trunk/modules/json-proxy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/json-proxy/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/json-proxy/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/json-proxy/pom.xml Tue Dec  2 14:46:33 2008
@@ -1,4 +1,20 @@
 <?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"
@@ -8,7 +24,6 @@
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>json-proxy</artifactId>
     <name>DayTrader :: JSON Proxy</name>
@@ -37,34 +52,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.1.1</version>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <!-- Do not Fail the build if no legal files were found-->
-                        <configuration>
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
@@ -78,7 +73,6 @@
                             <Class-Path/>
                         </manifestEntries>
                     </archive>
-
                     <resources>
                         <resource
                                 implementation="org.apache.maven.model.Resource">
@@ -91,6 +85,23 @@
                             </includes>
                         </resource>
                     </resources>
+                    <!--
+                    HACK: Include legal files explicity, otherwise they will
+                          end up in the wrong path
+                          or in another jar file in the war.
+
+                    NOTE: targetPath is broken for webResources (as documented)
+                    -->
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.outputDirectory}</directory>
+                            <includes>
+                                <include>META-INF/LICENSE*</include>
+                                <include>META-INF/NOTICE*</include>
+                                <include>META-INF/DISCLAIMER*</include>
+                            </includes>
+                        </resource>
+                    </webResources>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Tue Dec  2 14:46:33 2008
@@ -25,7 +25,6 @@
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>daytrader-streamer</artifactId>
@@ -59,13 +58,11 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/daytrader/trunk/modules/web/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/NOTICE?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/NOTICE (original)
+++ geronimo/daytrader/trunk/modules/web/NOTICE Tue Dec  2 14:46:33 2008
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2006 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Tue Dec  2 14:46:33 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>daytrader-web</artifactId>
     <name>DayTrader :: Web Application</name>
@@ -53,7 +52,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
-            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -61,9 +59,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.1.1</version>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -73,19 +71,16 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
     		<groupId>org.apache.geronimo.specs</groupId>
     		<artifactId>geronimo-annotation_1.0_spec</artifactId>
-    		<version>1.1</version>
     		<scope>provided</scope>
 		</dependency>
         <!-- Removed per DAYTRADER-7 due to interop issues on commercial AppServers 
@@ -130,7 +125,6 @@
                             <Class-Path>dt-ejb.jar streamer.jar wsappclient.jar</Class-Path>
                         </manifestEntries>
                     </archive>
-
                     <resources>
                         <resource
                                 implementation="org.apache.maven.model.Resource">
@@ -143,6 +137,22 @@
                             </includes>
                         </resource>
                     </resources>
+                    <!--                        
+                    HACK: Include legal files explicity, otherwise they will
+                          end up in the wrong path
+                          or in another jar file in the war.    
+                    NOTE: targetPath is broken for webResources (as documented)
+                    -->
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.outputDirectory}</directory>
+                            <includes>
+                                <include>META-INF/LICENSE*</include>
+                                <include>META-INF/NOTICE*</include>
+                                <include>META-INF/DISCLAIMER*</include>
+                            </includes>
+                        </resource>
+                    </webResources>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml Tue Dec  2 14:46:33 2008
@@ -17,8 +17,8 @@
     limitations under the License.
 -->
 
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/web"
-        xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+        xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
         configId="TradeWeb" parentId="Trade">
     
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Tue Dec  2 14:46:33 2008
@@ -25,7 +25,6 @@
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>daytrader</artifactId>
         <version>2.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>daytrader-wsappclient</artifactId>
     <name>DayTrader :: WS Application Client</name>

Modified: geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml Tue Dec  2 14:46:33 2008
@@ -18,12 +18,12 @@
 
 <!-- $Rev: 555467 $ $Date: 2007-07-11 22:39:14 -0400 (Wed, 11 Jul 2007) $ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
     <environment>
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.2-SNAPSHOT</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -67,7 +67,7 @@
     -->
     <module>
         <web>web.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
             <service-ref>
                 <service-ref-name>service/Trade</service-ref-name>
                 <port>
@@ -129,12 +129,12 @@
 
     <module>
         <java>streamer.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -142,7 +142,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -202,12 +202,12 @@
 
     <module>
         <java>wsappclient.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -215,7 +215,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Copied: geronimo/daytrader/trunk/plans/dayTrader-derby-plan.xml (from r722614, geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-derby-plan.xml?p2=geronimo/daytrader/trunk/plans/dayTrader-derby-plan.xml&p1=geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml&r1=722614&r2=722654&rev=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-derby-plan.xml Tue Dec  2 14:46:33 2008
@@ -18,12 +18,12 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
     <environment>
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.2-SNAPSHOT</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -60,7 +60,7 @@
     -->
     <module>
         <web>web.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
             <service-ref>
                 <service-ref-name>service/Trade</service-ref-name>
                 <port>
@@ -121,12 +121,12 @@
 
     <module>
         <java>streamer.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -134,7 +134,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -181,7 +181,7 @@
                         <adminobject-interface>javax.jms.Topic</adminobject-interface>
                         <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
                         <adminobject-instance>
-                            <message-destination-name>TradeStreamerTopic</message-destination-name>
+                            <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
                             <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
                         </adminobject-instance>
                     </adminobject>
@@ -192,12 +192,12 @@
 
     <module>
         <java>wsappclient.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -205,7 +205,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -333,43 +333,19 @@
                 <adminobject-interface>javax.jms.Topic</adminobject-interface>
                 <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
                 <adminobject-instance>
-                    <message-destination-name>TradeStreamerTopic</message-destination-name>
+                    <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
                     <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
                 </adminobject-instance>
             </adminobject>
-            <adminobject>
-                <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>DTStreamerTopic3</message-destination-name>
-                    <config-property-setting name="PhysicalName">DTStreamerTopic3</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
 
             <adminobject>
                 <adminobject-interface>javax.jms.Queue</adminobject-interface>
                 <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
                 <adminobject-instance>
-                    <message-destination-name>TradeBrokerQueue</message-destination-name>
+                    <message-destination-name>jms/TradeBrokerQueue</message-destination-name>
                     <config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
                 </adminobject-instance>
             </adminobject>
-            <adminobject>
-                <adminobject-interface>javax.jms.Queue</adminobject-interface>
-                <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>DTBrokerQueue3</message-destination-name>
-                    <config-property-setting name="PhysicalName">DTBrokerQueue3</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-            <adminobject>
-                <adminobject-interface>javax.jms.Queue</adminobject-interface>
-                <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>TestQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">TestQueue</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
         </connector>
     </ext-module>
 </application>

Modified: geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml Tue Dec  2 14:46:33 2008
@@ -18,12 +18,12 @@
 
 <!-- $Rev: 555467 $ $Date: 2007-07-11 22:39:14 -0400 (Wed, 11 Jul 2007) $ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
     <environment>
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.2-SNAPSHOT</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -61,7 +61,7 @@
     -->
     <module>
         <web>web.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
             <service-ref>
                 <service-ref-name>service/Trade</service-ref-name>
                 <port>
@@ -123,12 +123,12 @@
 
     <module>
         <java>streamer.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -136,7 +136,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -196,12 +196,12 @@
 
     <module>
         <java>wsappclient.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -209,7 +209,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Modified: geronimo/daytrader/trunk/plans/dayTrader-sqlserver-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-sqlserver-plan.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-sqlserver-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-sqlserver-plan.xml Tue Dec  2 14:46:33 2008
@@ -18,12 +18,12 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
     <environment>
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.2-SNAPSHOT</version>
             <type>car</type>
         </moduleId>
         <!--
@@ -61,7 +61,7 @@
     -->
     <module>
         <web>web.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
             <service-ref>
                 <service-ref-name>service/Trade</service-ref-name>
                 <port>
@@ -123,12 +123,12 @@
 
     <module>
         <java>streamer.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -136,7 +136,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>
@@ -196,12 +196,12 @@
 
     <module>
         <java>wsappclient.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </client-environment>
@@ -209,7 +209,7 @@
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
                     <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.0-SNAPSHOT</version>
+                    <version>2.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
             </server-environment>

Modified: geronimo/daytrader/trunk/plans/dojo-ui-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dojo-ui-plan.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/dojo-ui-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dojo-ui-plan.xml Tue Dec  2 14:46:33 2008
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<!--
+    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.
+-->
+
+<!-- $Rev: 673675 $ $Date: 2008-07-03 09:38:41 -0400 (Thu, 03 Jul 2008) $ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:moduleId>
       <dep:groupId>geronimo</dep:groupId>
       <dep:artifactId>daytrader-dojo</dep:artifactId>
@@ -19,8 +38,8 @@
         <dep:type>car</dep:type>
       </dep:dependency>
       <dep:dependency>
-        <dep:groupId>geronimo</dep:groupId>
-        <dep:artifactId>daytrader-derby-tomcat</dep:artifactId>
+        <dep:groupId>org.apache.geronimo.daytrader</dep:groupId>
+        <dep:artifactId>daytrader</dep:artifactId>
         <dep:type>car</dep:type>
       </dep:dependency>
     </dep:dependencies>
@@ -29,7 +48,7 @@
   </dep:environment>
   <module>
     <web>json-proxy.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1">
       <service-ref>
         <service-ref-name>service/Trade</service-ref-name>
         <port>
@@ -44,7 +63,7 @@
   </module>
   <module>
     <web>dojo-ui.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1">
     </web-app>
   </module>
 

Modified: geronimo/daytrader/trunk/plans/streamerclient/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/streamerclient/geronimo-plugin.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/streamerclient/geronimo-plugin.xml (original)
+++ geronimo/daytrader/trunk/plans/streamerclient/geronimo-plugin.xml Tue Dec  2 14:46:33 2008
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <name>Daytrader :: Streamer Client</name>
     <category>Daytrader</category>

Modified: geronimo/daytrader/trunk/plans/wsclient/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/wsclient/geronimo-plugin.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/wsclient/geronimo-plugin.xml (original)
+++ geronimo/daytrader/trunk/plans/wsclient/geronimo-plugin.xml Tue Dec  2 14:46:33 2008
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <name>Daytrader :: WS Client</name>
     <category>Daytrader</category>

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=722654&r1=722653&r2=722654&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Tue Dec  2 14:46:33 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.daytrader</groupId>
@@ -137,6 +137,7 @@
         <url>http://www.apache.org/</url>
     </organization>
     <modules>
+        <module>repository</module>
         <module>modules/ejb</module>
         <module>modules/web</module>
         <module>modules/streamer</module>
@@ -145,6 +146,7 @@
         <module>modules/json-proxy</module>
         <module>modules/dojo-ui-web</module>
         <module>modules/dojo-ui-ear</module>
+        <!-- c-m-p built plugins -->
         <module>daytrader-derby-datasource</module>
         <!-- see profiles -->
         <!--<module>daytrader-db2-datasource</module>-->
@@ -184,8 +186,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
-                    <version>2.2-SNAPSHOT</version>
-                    <!--<version>${geronimoVersion}</version>-->
+                    <version>${geronimoVersion}</version>
 
                     <configuration>
                         <assemblies>
@@ -328,14 +329,14 @@
                         </goals>
                         <configuration>
                             <rules>
-                                <!-- Allow any Java >= 1.5, but not 1.6 or above -->
+                                <!-- Allow any Java >= 1.5 -->
                                 <requireJavaVersion>
-                                    <version>[1.5,1.6)</version>
+                                    <version>[1.5,)</version>
                                 </requireJavaVersion>
 
-                                <!-- Allow any Maven >= 2.0.5 -->
+                                <!-- Allow any Maven >= 2.0.9 -->
                                 <requireMavenVersion>
-                                    <version>[2.0.5,)</version>
+                                    <version>[2.0.9,)</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>
@@ -344,27 +345,6 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <!-- Do not Fail the build if no legal files were found
-                        <configuration>
-                            <strict>true</strict>
-                        </configuration>
-                        -->
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -385,6 +365,20 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>java.net</id>
+            <url>http://download.java.net/maven/1/</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
     <profiles>
 
         <profile>
@@ -434,4 +428,4 @@
             </modules>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>

Added: geronimo/daytrader/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/repository/pom.xml?rev=722654&view=auto
==============================================================================
--- geronimo/daytrader/trunk/repository/pom.xml (added)
+++ geronimo/daytrader/trunk/repository/pom.xml Tue Dec  2 14:46:33 2008
@@ -0,0 +1,93 @@
+<?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.
+-->
+
+<!-- $Rev: 680611 $ $Date: 2008-07-28 23:08:37 -0400 (Mon, 28 Jul 2008) $ -->
+
+<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>daytrader</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>repository</artifactId>
+    <name>Geronimo Local Repository</name>
+    <packaging>jar</packaging>
+
+    <description>
+        Container for local artifacts, this is a temporary solution until a more
+        permeant Geronimo specific repository solution can be implemented.
+    </description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo</groupId>
+                <artifactId>geronimo</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- See GERONIMO-4262 -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+        </dependency>
+
+        <!-- See GERONIMO-3010  These artifacts are here temporarily while we discuss the proposed change in
+        managed object lifecycle handling with the tomcat team.  One way or another it should be gone in a couple
+        of weeks -->
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>catalina</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>jasper</artifactId>
+        </dependency>
+        <!-- This is an additional patch until 6.0.19 is released -->
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>jasper-el</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>geronimo-repo</id>
+            <name>Geronimo Server Private Repository</name>
+            <url>http://svn.apache.org/repos/asf/geronimo/server/trunk/repository</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+</project>

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



Mime
View raw message