geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r957816 [3/12] - in /geronimo/samples/branches/3.0-M1: ./ samples/ samples/all-samples/all-samples-jetty/ samples/all-samples/all-samples-tomcat/ samples/daytrader/ samples/daytrader/assemblies/ samples/daytrader/assemblies/javaee/ samples/...
Date Fri, 25 Jun 2010 06:33:49 GMT
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/daytrader-postgre-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/daytrader-postgre-xa-plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/daytrader-postgre-xa-plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/daytrader-postgre-xa-plan.xml Fri Jun 25 06:33:41 2010
@@ -1,363 +1,363 @@
-<?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$ -->
-
-<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.2-SNAPSHOT</version>
-            <type>car</type>
-        </moduleId>
-        <!--
-         **
-         ** The following section describes what other modules this application has dependencies on.  Since we will be 
-         ** accessing our tables using the internal Derby database we need the system-database dependency.  Also, JPA is 
-         ** used as a persistence mechanism so we have a dependency on the openjpa module as well.  
-         **
-         ** The dependency on Yoko is required but should be supplied by default.  This is just silly.
-        -->
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>openjpa</artifactId>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>postgresql</groupId>
-                <artifactId>postgresql</artifactId>
- 		<version>8.3-603.jdbc4</version>
-                <type>jar</type>
-            </dependency>
-            
-        </dependencies>
-	<inverse-classloading/>
-    </environment>
-
-    <!--
-     **
-     **  DayTrader Web War Module Definition  
-     **
-    -->
-    <module>
-        <web>web.war</web>
-        <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>
-                    <port-name>TradeWSServices</port-name>
-                    <protocol>http</protocol>
-                    <host>localhost</host>
-                    <port>8080</port>
-                    <uri>/daytrader/services/TradeWSServices</uri>
-                </port>
-            </service-ref>
-        </web-app>
-    </module>
-
-
-    <!--
-     **
-     **  DayTrader EJB Jar Module Definition  
-     **
-    -->
-    <module>
-        <ejb>dt-ejb.jar</ejb>
-        <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
-            <enterprise-beans>
-                <message-driven>
-                    <ejb-name>DTBroker3MDB</ejb-name>
-                    <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                </message-driven>
-
-                <message-driven>
-                    <ejb-name>DTStreamer3MDB</ejb-name>
-                    <resource-adapter>
-                        <resource-link>TradeJMSResources</resource-link>
-                    </resource-adapter>
-                </message-driven>
-            </enterprise-beans>
-
-            <!--
-            **
-             ** The following section can be used to override the settings in the
-             ** persistence.xml file. For instance, if you choose to deploy DayTrader
-             ** against a DB2 database, the DBDictionary can be specified here.
-                **
-                -->
-
-            <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-                <persistence-unit name="daytrader">
-                    <properties>
-                        <property name="openjpa.jdbc.DBDictionary" value="postgres" />
-                    </properties>
-                </persistence-unit>
-            </persistence>
-        </openejb-jar>
-    </module>
-
-
-    <module>
-        <java>streamer.jar</java>
-        <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.1.1.2</version>
-                    <type>car</type>
-                </moduleId>
-            </client-environment>
-            <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <moduleId>
-                    <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-streamer-client-server</artifactId>
-                    <version>2.1.1.2</version>
-                    <type>car</type>
-                </moduleId>
-            </server-environment>
-            <resource>
-                <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                    <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-                    <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
-                    <dep:type>rar</dep:type>
-                </external-rar>
-                <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-                    <resourceadapter>
-                        <resourceadapter-instance>
-                            <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
-                            <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
-                            <config-property-setting name="UserName">geronimo</config-property-setting>
-                            <config-property-setting name="Password">geronimo</config-property-setting>
-                            <workmanager>
-                                <gbean-link>DefaultWorkManager</gbean-link>
-                            </workmanager>
-                        </resourceadapter-instance>
-                        <outbound-resourceadapter>
-                            <connection-definition>
-                                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                                <connectiondefinition-instance>
-                                    <name>jms/TopicConnectionFactory</name>
-                                    <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-                                    <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-                                    <connectionmanager>
-                                        <xa-transaction>
-                                            <transaction-caching/>
-                                        </xa-transaction>
-                                        <single-pool>
-                                            <max-size>10</max-size>
-                                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                            <match-one/>
-                                        </single-pool>
-                                    </connectionmanager>
-                                </connectiondefinition-instance>
-                            </connection-definition>
-                        </outbound-resourceadapter>
-                    </resourceadapter>
-
-
-                    <adminobject>
-                        <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                        <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
-                        <adminobject-instance>
-                            <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
-                            <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
-                        </adminobject-instance>
-                    </adminobject>
-
-                </connector>
-            </resource>
-        </application-client>
-    </module>
-
-    <module>
-        <java>wsappclient.jar</java>
-        <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.1.1.2</version>
-                    <type>car</type>
-                </moduleId>
-            </client-environment>
-            <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <moduleId>
-                    <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-ws-client-server</artifactId>
-                    <version>2.1.1.2</version>
-                    <type>car</type>
-                </moduleId>
-            </server-environment>
-        </application-client>
-    </module>
-
-    <ext-module>
-        <connector>TradeDataSource</connector>
-        <!--external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:groupId>org.tranql</dep:groupId>
-            <dep:artifactId>tranql-connector-ra</dep:artifactId>
-            <dep:type>rar</dep:type>
-        </external-path-->
-        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:groupId>org.tranql</dep:groupId>
-            <dep:artifactId>tranql-connector-postgresql-xa</dep:artifactId>
-            <dep:type>rar</dep:type>
-        </external-path>
-        
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-
-
-            <resourceadapter>
-                <outbound-resourceadapter>
-                    <connection-definition>
-                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-                        <connectiondefinition-instance>
-                            <name>jdbc/TradeDataSource</name>
-                            <config-property-setting name="PrepareThreshold"/>
-                    	    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
-	                    <config-property-setting name="UserName">trade</config-property-setting>
-        	            <config-property-setting name="Password">trade</config-property-setting>
-        	            <config-property-setting name="ServerName">localhost</config-property-setting>
-			    <config-property-setting name="PortNumber">5432</config-property-setting>
-                            <connectionmanager>
-                                <local-transaction/>
-                                <single-pool>
-                                    <max-size>100</max-size>
-                                    <min-size>0</min-size>
-                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                    <idle-timeout-minutes>1</idle-timeout-minutes>
-                                    <match-one/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                        <connectiondefinition-instance>
-                            <name>jdbc/NoTxTradeDataSource</name>
-                            <config-property-setting name="PrepareThreshold"/>
-                    	    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
-	                    <config-property-setting name="UserName">trade</config-property-setting>
-        	            <config-property-setting name="Password">trade</config-property-setting>
-        	            <config-property-setting name="ServerName">localhost</config-property-setting>
-			    <config-property-setting name="PortNumber">5432</config-property-setting>
-                            <connectionmanager>
-                                <no-transaction/>
-                                <single-pool>
-                                    <max-size>100</max-size>
-                                    <min-size>0</min-size>
-                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                    <idle-timeout-minutes>1</idle-timeout-minutes>
-                                    <match-one/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                    </connection-definition>
-                </outbound-resourceadapter>
-            </resourceadapter>
-        </connector>
-    </ext-module>
-
-
-    <ext-module>
-        <connector>TradeJMS</connector>
-        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-            <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
-            <dep:type>rar</dep:type>
-        </external-path>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-
-            <resourceadapter>
-                <!-- how to connect to the JMS Server -->
-                <resourceadapter-instance>
-                    <resourceadapter-name>TradeJMSResources</resourceadapter-name>
-                    <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
-                    <config-property-setting name="UserName">not needed</config-property-setting>
-                    <config-property-setting name="Password">not needed</config-property-setting>
-                    <workmanager>
-                        <gbean-link>DefaultWorkManager</gbean-link>
-                    </workmanager>
-                </resourceadapter-instance>
-                <!-- defines a ConnectionFactory -->
-                <outbound-resourceadapter>
-	                    <connection-definition>
-                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                        <connectiondefinition-instance>
-                            <name>jms/QueueConnectionFactory</name>
-                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-                            <connectionmanager>
-                                <xa-transaction>
-                                    <transaction-caching/>
-                                </xa-transaction>
-                                <single-pool>
-                                    <max-size>50</max-size>
-                                    <min-size>0</min-size>
-                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                    <idle-timeout-minutes>0</idle-timeout-minutes>
-                                    <match-one/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                    </connection-definition>
-                    <connection-definition>
-                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                        <connectiondefinition-instance>
-                            <name>jms/TopicConnectionFactory</name>
-                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-                            <connectionmanager>
-                                <xa-transaction>
-                                    <transaction-caching/>
-                                </xa-transaction>
-                                <single-pool>
-                                    <max-size>50</max-size>
-                                    <min-size>0</min-size>
-                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                    <idle-timeout-minutes>0</idle-timeout-minutes>
-                                    <match-one/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                    </connection-definition>
-                </outbound-resourceadapter>
-            </resourceadapter>
-
-            <adminobject>
-                <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
-                <adminobject-instance>
-                    <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.Queue</adminobject-interface>
-                <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>jms/TradeBrokerQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-
-        </connector>
-    </ext-module>
-</application>
+<?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$ -->
+
+<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.2-SNAPSHOT</version>
+            <type>car</type>
+        </moduleId>
+        <!--
+         **
+         ** The following section describes what other modules this application has dependencies on.  Since we will be 
+         ** accessing our tables using the internal Derby database we need the system-database dependency.  Also, JPA is 
+         ** used as a persistence mechanism so we have a dependency on the openjpa module as well.  
+         **
+         ** The dependency on Yoko is required but should be supplied by default.  This is just silly.
+        -->
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>openjpa</artifactId>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+ 		<version>8.3-603.jdbc4</version>
+                <type>jar</type>
+            </dependency>
+            
+        </dependencies>
+	<inverse-classloading/>
+    </environment>
+
+    <!--
+     **
+     **  DayTrader Web War Module Definition  
+     **
+    -->
+    <module>
+        <web>web.war</web>
+        <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>
+                    <port-name>TradeWSServices</port-name>
+                    <protocol>http</protocol>
+                    <host>localhost</host>
+                    <port>8080</port>
+                    <uri>/daytrader/services/TradeWSServices</uri>
+                </port>
+            </service-ref>
+        </web-app>
+    </module>
+
+
+    <!--
+     **
+     **  DayTrader EJB Jar Module Definition  
+     **
+    -->
+    <module>
+        <ejb>dt-ejb.jar</ejb>
+        <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+
+            <enterprise-beans>
+                <message-driven>
+                    <ejb-name>DTBroker3MDB</ejb-name>
+                    <resource-adapter>
+                        <resource-link>TradeJMSResources</resource-link>
+                    </resource-adapter>
+                </message-driven>
+
+                <message-driven>
+                    <ejb-name>DTStreamer3MDB</ejb-name>
+                    <resource-adapter>
+                        <resource-link>TradeJMSResources</resource-link>
+                    </resource-adapter>
+                </message-driven>
+            </enterprise-beans>
+
+            <!--
+            **
+             ** The following section can be used to override the settings in the
+             ** persistence.xml file. For instance, if you choose to deploy DayTrader
+             ** against a DB2 database, the DBDictionary can be specified here.
+                **
+                -->
+
+            <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+                <persistence-unit name="daytrader">
+                    <properties>
+                        <property name="openjpa.jdbc.DBDictionary" value="postgres" />
+                    </properties>
+                </persistence-unit>
+            </persistence>
+        </openejb-jar>
+    </module>
+
+
+    <module>
+        <java>streamer.jar</java>
+        <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.1.1.2</version>
+                    <type>car</type>
+                </moduleId>
+            </client-environment>
+            <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <moduleId>
+                    <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>daytrader-streamer-client-server</artifactId>
+                    <version>2.1.1.2</version>
+                    <type>car</type>
+                </moduleId>
+            </server-environment>
+            <resource>
+                <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                    <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+                    <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
+                    <dep:type>rar</dep:type>
+                </external-rar>
+                <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+                    <resourceadapter>
+                        <resourceadapter-instance>
+                            <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
+                            <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
+                            <config-property-setting name="UserName">geronimo</config-property-setting>
+                            <config-property-setting name="Password">geronimo</config-property-setting>
+                            <workmanager>
+                                <gbean-link>DefaultWorkManager</gbean-link>
+                            </workmanager>
+                        </resourceadapter-instance>
+                        <outbound-resourceadapter>
+                            <connection-definition>
+                                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                                <connectiondefinition-instance>
+                                    <name>jms/TopicConnectionFactory</name>
+                                    <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                                    <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                                    <connectionmanager>
+                                        <xa-transaction>
+                                            <transaction-caching/>
+                                        </xa-transaction>
+                                        <single-pool>
+                                            <max-size>10</max-size>
+                                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                            <match-one/>
+                                        </single-pool>
+                                    </connectionmanager>
+                                </connectiondefinition-instance>
+                            </connection-definition>
+                        </outbound-resourceadapter>
+                    </resourceadapter>
+
+
+                    <adminobject>
+                        <adminobject-interface>javax.jms.Topic</adminobject-interface>
+                        <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
+                        <adminobject-instance>
+                            <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
+                            <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
+                        </adminobject-instance>
+                    </adminobject>
+
+                </connector>
+            </resource>
+        </application-client>
+    </module>
+
+    <module>
+        <java>wsappclient.jar</java>
+        <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.1.1.2</version>
+                    <type>car</type>
+                </moduleId>
+            </client-environment>
+            <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <moduleId>
+                    <groupId>org.apache.geronimo.daytrader</groupId>
+                    <artifactId>daytrader-ws-client-server</artifactId>
+                    <version>2.1.1.2</version>
+                    <type>car</type>
+                </moduleId>
+            </server-environment>
+        </application-client>
+    </module>
+
+    <ext-module>
+        <connector>TradeDataSource</connector>
+        <!--external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-ra</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path-->
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.tranql</dep:groupId>
+            <dep:artifactId>tranql-connector-postgresql-xa</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
+        
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+
+
+            <resourceadapter>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>jdbc/TradeDataSource</name>
+                            <config-property-setting name="PrepareThreshold"/>
+                    	    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+	                    <config-property-setting name="UserName">trade</config-property-setting>
+        	            <config-property-setting name="Password">trade</config-property-setting>
+        	            <config-property-setting name="ServerName">localhost</config-property-setting>
+			    <config-property-setting name="PortNumber">5432</config-property-setting>
+                            <connectionmanager>
+                                <local-transaction/>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>1</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                        <connectiondefinition-instance>
+                            <name>jdbc/NoTxTradeDataSource</name>
+                            <config-property-setting name="PrepareThreshold"/>
+                    	    <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+	                    <config-property-setting name="UserName">trade</config-property-setting>
+        	            <config-property-setting name="Password">trade</config-property-setting>
+        	            <config-property-setting name="ServerName">localhost</config-property-setting>
+			    <config-property-setting name="PortNumber">5432</config-property-setting>
+                            <connectionmanager>
+                                <no-transaction/>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>1</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+        </connector>
+    </ext-module>
+
+
+    <ext-module>
+        <connector>TradeJMS</connector>
+        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+            <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
+            <dep:type>rar</dep:type>
+        </external-path>
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+
+            <resourceadapter>
+                <!-- how to connect to the JMS Server -->
+                <resourceadapter-instance>
+                    <resourceadapter-name>TradeJMSResources</resourceadapter-name>
+                    <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
+                    <config-property-setting name="UserName">not needed</config-property-setting>
+                    <config-property-setting name="Password">not needed</config-property-setting>
+                    <workmanager>
+                        <gbean-link>DefaultWorkManager</gbean-link>
+                    </workmanager>
+                </resourceadapter-instance>
+                <!-- defines a ConnectionFactory -->
+                <outbound-resourceadapter>
+	                    <connection-definition>
+                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>jms/QueueConnectionFactory</name>
+                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <single-pool>
+                                    <max-size>50</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>0</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>jms/TopicConnectionFactory</name>
+                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <single-pool>
+                                    <max-size>50</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>0</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+
+            <adminobject>
+                <adminobject-interface>javax.jms.Topic</adminobject-interface>
+                <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
+                <adminobject-instance>
+                    <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.Queue</adminobject-interface>
+                <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
+                <adminobject-instance>
+                    <message-destination-name>jms/TradeBrokerQueue</message-destination-name>
+                    <config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
+                </adminobject-instance>
+            </adminobject>
+
+        </connector>
+    </ext-module>
+</application>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/pom.xml Fri Jun 25 06:33:41 2010
@@ -30,13 +30,32 @@
     <name>DayTrader :: Assemblies for JavaEE</name>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>daytrader-war</module>
-        <module>daytrader-ear</module>
-        <!--
-        <module>dojo-ui-war</module>
-        <module>dojo-ui-ear</module>
-        -->
-    </modules>
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>daytrader-war</module>
+                <module>daytrader-ear</module>
+                <!--
+                <module>dojo-ui-war</module>
+                <module>dojo-ui-ear</module>
+                -->
+            </modules>
+        </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>daytrader-war</module>
+                <module>daytrader-ear</module>
+                <module>dojo-ui-war</module>
+                <module>dojo-ui-ear</module>
+            </modules>
+        </profile>
+    </profiles>
+    
 
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml Fri Jun 25 06:33:41 2010
@@ -29,10 +29,26 @@
     <artifactId>assemblies</artifactId>
     <name>DayTrader :: Assemblies</name>
     <packaging>pom</packaging>
-
-    <modules>
-        <module>javaee</module>
-        <module>web</module>
-    </modules>
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <!--<module>javaee</module>-->
+                <module>web</module>     
+            </modules>
+        </profile>
+        <profile>
+            <id>all-subprojects</id>            
+            
+            <modules>
+                <module>javaee</module>
+                <module>web</module>     
+            </modules>
+        </profile>    
+    </profiles>
+    
 
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/pom.xml Fri Jun 25 06:33:41 2010
@@ -35,22 +35,22 @@
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
             <artifactId>daytrader-util</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
             <artifactId>daytrader-core</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
             <artifactId>daytrader-beans</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
             <artifactId>daytrader-web</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <!-- we need to include this in the image for logging to work -->
@@ -61,16 +61,16 @@
         <!-- web container provided specs -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -80,37 +80,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
-        </dependency>
-
-        <!-- Not required for Bean version of TradeDirect
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-        </dependency>
-        -->
+        </dependency>        
     </dependencies>
 
     <build>
@@ -121,7 +91,7 @@
                 <configuration>
                     <resources>
                         <resource implementation="org.apache.maven.model.Resource">
-                            <filtering>false</filtering>
+                            <filtering>true</filtering>
                             <directory>
                                 ${basedir}/src/main/webapp/WEB-INF
                             </directory>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 25 06:33:41 2010
@@ -16,28 +16,29 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+<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"
              xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
         
         <sys:environment>
             <sys:moduleId>
-                <sys:groupId>org.apache.geronimo.daytrader.assemblies.web</sys:groupId>
-                <sys:artifactId>daytrader-web-jdbc</sys:artifactId>
-                <sys:version>2.2</sys:version>
-                <sys:type>war</sys:type>
+                <sys:groupId>${project.groupId}</sys:groupId>
+                <sys:artifactId>${project.artifactId}</sys:artifactId>
+                <sys:version>${project.version}</sys:version>
+                <sys:type>car</sys:type>
             </sys:moduleId>
         
             <sys:dependencies>
                 <sys:dependency>
-                    <sys:groupId>org.apache.geronimo.daytrader.plugins</sys:groupId>
+                    <sys:groupId>org.apache.geronimo.samples.daytrader.plugins</sys:groupId>
                     <sys:artifactId>daytrader-derby-datasource</sys:artifactId>
+                    <sys:version>${project.version}</sys:version>
+                    <sys:type>car</sys:type>
                 </sys:dependency>
             </sys:dependencies>
         </sys:environment>
     
-    <context-root>/daytrader</context-root>
+    <context-root>/${project.artifactId}</context-root>
 
      <naming:resource-ref>
         <naming:ref-name>jdbc/TradeDataSource</naming:ref-name>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/pom.xml Fri Jun 25 06:33:41 2010
@@ -61,12 +61,12 @@
         <!-- web container provided specs -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -76,11 +76,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/modules/core/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/modules/core/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/modules/core/pom.xml Fri Jun 25 06:33:41 2010
@@ -80,17 +80,17 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
     	    <groupId>org.apache.geronimo.specs</groupId>
-    	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    	    <artifactId>geronimo-annotation_1.1_spec</artifactId>
     	    <scope>provided</scope>
 	</dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/modules/ejb3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/modules/ejb3/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/modules/ejb3/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/modules/ejb3/pom.xml Fri Jun 25 06:33:41 2010
@@ -72,17 +72,17 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
     	    <groupId>org.apache.geronimo.specs</groupId>
-    	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    	    <artifactId>geronimo-annotation_1.1_spec</artifactId>
     	    <scope>provided</scope>
 	</dependency>
         <dependency>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/modules/entities/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/modules/entities/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/modules/entities/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/modules/entities/pom.xml Fri Jun 25 06:33:41 2010
@@ -55,17 +55,17 @@
         </dependency>    
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
     	    <groupId>org.apache.geronimo.specs</groupId>
-    	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    	    <artifactId>geronimo-annotation_1.1_spec</artifactId>
     	    <scope>provided</scope>
 	</dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/modules/json-proxy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/modules/json-proxy/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/modules/json-proxy/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/modules/json-proxy/pom.xml Fri Jun 25 06:33:41 2010
@@ -44,16 +44,16 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/modules/soap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/modules/soap/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/modules/soap/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/modules/soap/pom.xml Fri Jun 25 06:33:41 2010
@@ -81,12 +81,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/modules/streamer/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/modules/streamer/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/modules/streamer/pom.xml Fri Jun 25 06:33:41 2010
@@ -67,17 +67,17 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/modules/web/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/modules/web/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/modules/web/pom.xml Fri Jun 25 06:33:41 2010
@@ -68,12 +68,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -88,21 +88,21 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jstl</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -122,7 +122,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <plugins>
+        <plugins>            
             <!-- Removed per DATRADER-7 due to interop issues on commercial AppServers
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-db2-datasource/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-db2-datasource/pom.xml Fri Jun 25 06:33:41 2010
@@ -92,7 +92,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
+            <artifactId>connector-deployer-1_6</artifactId>
             <type>car</type>
             <version>${geronimoVersion}</version>
             <scope>provided</scope>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-derby-datasource/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-derby-datasource/pom.xml Fri Jun 25 06:33:41 2010
@@ -36,7 +36,7 @@
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <type>rar</type>
-            <version>1.5</version>
+            <version>1.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
+            <artifactId>connector-deployer-1_6</artifactId>
             <type>car</type>
             <version>${geronimoVersion}</version>
             <scope>provided</scope>
@@ -63,8 +63,9 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <type>car</type>
             <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -75,6 +76,11 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-derby-embed-xa</artifactId>
@@ -86,37 +92,37 @@
                                 <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
                                 <artifactId>daytrader-db2-datasource</artifactId>
                             </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-db2-datasource/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${project.version}/car</artifact-alias>
                             <obsoletes>
                                 <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
                                 <artifactId>daytrader-derby-datasource</artifactId>
                             </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${project.version}/car</artifact-alias>
                             <obsoletes>
                                 <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
                                 <artifactId>daytrader-informix-datasource</artifactId>
                             </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-informix-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-informix-datasource/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${project.version}/car</artifact-alias>
                             <obsoletes>
                                 <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
                                 <artifactId>daytrader-mysql-datasource</artifactId>
                             </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-mysql-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-mysql-datasource/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${project.version}/car</artifact-alias>
                             <obsoletes>
                                 <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
                                 <artifactId>daytrader-oracle-datasource</artifactId>
                             </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-oracle-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-oracle-datasource/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${project.version}/car</artifact-alias>
                             <obsoletes>
                                 <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
                                 <artifactId>daytrader-postgre-datasource</artifactId>
                             </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-postgre-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-postgre-datasource/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${project.version}/car</artifact-alias>
                             <obsoletes>
                                 <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
                                 <artifactId>daytrader-sqlserver-datasource</artifactId>
                             </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-sqlserver-datasource/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${project.version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,23 +1,23 @@
-<?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">
+<?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>
@@ -26,119 +26,119 @@
         <version>3.0-M1-SNAPSHOT</version>
     </parent>
     
-    <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
-    <artifactId>daytrader-informix-datasource</artifactId>
-    <packaging>car</packaging>
-    <name>Daytrader :: Plugins :: IBM Informix DataSource</name>
-    <description>IBM Informix Datasource plugin for Daytrader.  Requires Informix v3.50 JDBC files.</description>
-
-    <!--
-        You can build this datasource if you:
-        1) have the IDS artifacts installed in a local repo and supply the URL:
-            -Dmaven.repo.drivers=http://my.local.repo
-        2) have a copy of the IDS JDBC driver and run the following commands :
-            mvn install:install-file -Dfile=${path to ifxjdbc.jar} \
-                                     -DgroupId=com.informix \
-                                     -DartifactId=ifxjdbc \
-                                     -Dversion=3.50 \
-                                     -Dpackaging=jar
-
-            mvn install:install-file -Dfile=${path to ifxjdbcx.jar} \
-                                     -DgroupId=com.informmix \
-                                     -DartifactId=ifxjdbcx \
-                                     -Dversion=3.50 \
-                                     -Dpackaging=jar
-    -->
-    <properties>
-        <maven.repo.drivers>http://not.a.real.repository</maven.repo.drivers>
-    </properties>
-    <repositories>
-        <repository>
-            <id>maven.repo.drivers</id>
-            <name>Private JDBC Driver Repository</name>
-            <url>${maven.repo.drivers}</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-informix-xa</artifactId>
-            <type>rar</type>
-            <version>1.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-	<!--You need to install the jdbc driver into local maven repo by self-->
-        <dependency>
-                <groupId>com.informix</groupId>
-                <artifactId>ifxjdbc</artifactId>
-                <version>3.50</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>com.informix</groupId>
-                <artifactId>ifxjdbcx</artifactId>
-                <version>3.50</version>
-                <type>jar</type>
-            </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <module>
-                        <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-informix-xa</artifactId>
-                        <type>rar</type>
-                    </module>
-                    <instance>
-                        <plugin-artifact>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
-                                <artifactId>daytrader-derby-datasource</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-informix-datasource/${pom.version}/car</artifact-alias>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
-                                <artifactId>daytrader-informix-datasource</artifactId>
-                            </obsoletes>
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+    <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+    <artifactId>daytrader-informix-datasource</artifactId>
+    <packaging>car</packaging>
+    <name>Daytrader :: Plugins :: IBM Informix DataSource</name>
+    <description>IBM Informix Datasource plugin for Daytrader.  Requires Informix v3.50 JDBC files.</description>
+
+    <!--
+        You can build this datasource if you:
+        1) have the IDS artifacts installed in a local repo and supply the URL:
+            -Dmaven.repo.drivers=http://my.local.repo
+        2) have a copy of the IDS JDBC driver and run the following commands :
+            mvn install:install-file -Dfile=${path to ifxjdbc.jar} \
+                                     -DgroupId=com.informix \
+                                     -DartifactId=ifxjdbc \
+                                     -Dversion=3.50 \
+                                     -Dpackaging=jar
+
+            mvn install:install-file -Dfile=${path to ifxjdbcx.jar} \
+                                     -DgroupId=com.informmix \
+                                     -DartifactId=ifxjdbcx \
+                                     -Dversion=3.50 \
+                                     -Dpackaging=jar
+    -->
+    <properties>
+        <maven.repo.drivers>http://not.a.real.repository</maven.repo.drivers>
+    </properties>
+    <repositories>
+        <repository>
+            <id>maven.repo.drivers</id>
+            <name>Private JDBC Driver Repository</name>
+            <url>${maven.repo.drivers}</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-informix-xa</artifactId>
+            <type>rar</type>
+            <version>1.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer-1_6</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+	<!--You need to install the jdbc driver into local maven repo by self-->
+        <dependency>
+                <groupId>com.informix</groupId>
+                <artifactId>ifxjdbc</artifactId>
+                <version>3.50</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>com.informix</groupId>
+                <artifactId>ifxjdbcx</artifactId>
+                <version>3.50</version>
+                <type>jar</type>
+            </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-informix-xa</artifactId>
+                        <type>rar</type>
+                    </module>
+                    <instance>
+                        <plugin-artifact>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+                                <artifactId>daytrader-derby-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-informix-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+                                <artifactId>daytrader-informix-datasource</artifactId>
+                            </obsoletes>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>



Mime
View raw message