Return-Path: 
 <scm-return-46344-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B38F74C5B
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Thu,  2 Jun 2011 02:39:55 +0000 (UTC)
Received: (qmail 88282 invoked by uid 500); 2 Jun 2011 02:39:55 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 88230 invoked by uid 500); 2 Jun 2011 02:39:55 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 88223 invoked by uid 99); 2 Jun 2011 02:39:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2011 02:39:55 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2011 02:39:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 85AF423889EA; Thu,  2 Jun 2011 02:39:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1130383 [3/3] - in /geronimo/daytrader/trunk: ./
 javaee6/assemblies/daytrader-ear/ javaee6/modules/core/
 javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/
 javaee6/modules/web/src/main/java/org/apache/geroni...
Date: Thu, 02 Jun 2011 02:39:24 -0000
To: scm@geronimo.apache.org
From: violalu@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110602023925.85AF423889EA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Added: geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml?rev=1130383&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml Thu Jun  2 02:39:22 2011
@@ -0,0 +1,67 @@
+<?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$ -->
+
+<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>

Added: geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml?rev=1130383&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml Thu Jun  2 02:39:22 2011
@@ -0,0 +1,135 @@
+<?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">
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>plugins</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+    <artifactId>daytrader-sqlserver-datasource</artifactId>
+    <packaging>car</packaging>
+    <name>Daytrader :: Plugins :: Microsoft SQL Server DataSource</name>
+    <description>Microsoft SQL Server Datasource plugin for Daytrader.  Requires SQL Server 2.0 JDBC files.</description>
+
+    <!--
+        You can build this datasource if you have:
+        1) the MSSQL artifact installed in a local repo and supply the URL:
+            -Dmaven.repo.drivers=http://my.local.repo
+        2) a copy of the MSSQL JDBC driver and run the following command:
+            mvn install:install-file -Dfile=${path to sqljdbc4.jar}\
+                                     -DgroupId=com.microsoft.sqlserver \
+                                     -DartifactId=sqljdbc4 \
+                                     -Dversion=2.0 \
+                                     -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-sqlserver2005-xa</artifactId>
+            <type>rar</type>
+            <version>1.1</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.microsoft.sqlserver</groupId>
+                <artifactId>sqljdbc4</artifactId>
+                <version>2.0</version>
+                <type>jar</type>
+            </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <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-sqlserver2005-xa</artifactId>
+                        <type>rar</type>
+                    </module>
+                    <instance>
+                        <plugin-artifact>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-derby-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-sqlserver-datasource</artifactId>
+                            </obsoletes>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Added: geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml?rev=1130383&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml Thu Jun  2 02:39:22 2011
@@ -0,0 +1,68 @@
+<?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$ -->
+
+<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="UserName">trade</config-property-setting>
+                            <config-property-setting name="Password">trade</config-property-setting>
+                            <config-property-setting name="PortNumber">1433</config-property-setting>
+                            <config-property-setting name="ServerName">localhost</config-property-setting>
+                            <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+                            <connectionmanager>
+                            <!-- By default, SQL Server does not enable XA feature, you need to enable it before running daytrader -->
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                        <connectiondefinition-instance>
+                            <name>jdbc/NoTxTradeDataSource</name>
+                            <config-property-setting name="UserName">trade</config-property-setting>
+                            <config-property-setting name="Password">trade</config-property-setting>
+                            <config-property-setting name="PortNumber">1433</config-property-setting>
+                            <config-property-setting name="ServerName">localhost</config-property-setting>
+                            <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+                            <connectionmanager>
+                                <no-transaction/>
+                                <single-pool>
+                                    <max-size>10</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+</connector>

Added: geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml?rev=1130383&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml Thu Jun  2 02:39:22 2011
@@ -0,0 +1,269 @@
+<?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: 1055802 $ $Date: 2011-01-06 17:28:46 +0800 (Thu, 06 Jan 2011) $ -->
+<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">
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>plugins</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+    <artifactId>daytrader-tomcat</artifactId>
+    <packaging>car</packaging>
+    <name>Daytrader :: Plugins :: JavaEE Tomcat</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+            <artifactId>daytrader-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+            <artifactId>daytrader-derby-datasource</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+            <artifactId>daytrader-jms</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa2</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <!-- external rar for client -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-activemq-ra</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>rar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <!-- needed because maven repo doesn't let our classloader see inside packed car files -->
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-ra</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                        <deploymentConfig>${clientDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+                        <artifactId>daytrader-ear</artifactId>
+                        <type>ear</type>
+                    </module>
+                    <instance>
+                        <plugin-artifact>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-tomcat</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-tomcat//car">org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
+                            
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+
+<!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo>Copying manually generated geronimo-plugin.xml files for app daytrader ws client</echo>
+                                <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car/META-INF"
+                                    failonerror="false" overwrite="true">
+                                    <fileset dir="${basedir}/../plans/wsclient" includes="geronimo-plugin.xml"/>
+                                </copy>
+
+                                <echo>Copying manually generated geronimo-plugin.xml files for app daytrader streamer client</echo>
+                                <copy todir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car/META-INF"
+                                    failonerror="false" overwrite="true">
+                                    <fileset dir="${basedir}/../plans/streamerclient" includes="geronimo-plugin.xml"/>
+                                </copy>
+
+                                <echo>Pack the daytrader ws client car file and install onto local repo</echo>
+                                <jar destfile="${project.build.directory}/daytrader-ws-client-${version}.car"
+                                    basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-ws-client/${version}/daytrader-ws-client-${version}.car"/>
+                                
+                                <condition property="mvn.exe" value="mvn.bat" else="mvn">
+                                    <os family="windows"/>
+                                </condition>
+                                <exec executable="${mvn.exe}">
+                                    <arg value="install:install-file"/>
+                                    <arg value="-Dfile=${project.build.directory}/daytrader-ws-client-${version}.car"/>
+                                    <arg value="-DgroupId=org.apache.geronimo.daytrader.plugins"/>
+                                    <arg value="-DartifactId=daytrader-ws-client"/>
+                                    <arg value="-Dversion=${version}"/>
+                                    <arg value="-Dpackaging=car"/>
+                                    <arg value="-DgeneratePom=true"/>
+                                    <arg value="-DcreateChecksum=true"/>
+                                </exec>
+                                
+                                <echo>Pack the daytrader streamer client car file and install onto local repo</echo>
+                                <jar destfile="${project.build.directory}/daytrader-streamer-client-${version}.car"
+                                    basedir="${project.build.directory}/repository/org/apache/geronimo/daytrader/plugins/daytrader-streamer-client/${version}/daytrader-streamer-client-${version}.car"/>
+                                
+
+                                <condition property="mvn.exe" value="mvn.bat" else="mvn">
+                                    <os family="windows"/>
+                                </condition>
+                                <exec executable="${mvn.exe}">
+                                    <arg value="install:install-file"/>
+                                    <arg value="-Dfile=${project.build.directory}/daytrader-streamer-client-${version}.car"/>
+                                    <arg value="-DgroupId=org.apache.geronimo.daytrader.plugins"/>
+                                    <arg value="-DartifactId=daytrader-streamer-client"/>
+                                    <arg value="-Dversion=${version}"/>
+                                    <arg value="-Dpackaging=car"/>
+                                    <arg value="-DgeneratePom=true"/>
+                                    <arg value="-DcreateChecksum=true"/>
+                                </exec>
+
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+-->
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <!--<properties>-->
+            <!--<it-server>jetty-minimal</it-server>-->
+            <!--</properties>-->
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+</project>

Added: geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/history/dependencies.xml?rev=1130383&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/history/dependencies.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/history/dependencies.xml Thu Jun  2 02:39:22 2011
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+    <module-id>
+        <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+        <artifactId>daytrader-tomcat</artifactId>
+        <version>3.0-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-ra</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>axis</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jasper</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openejb</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openjpa2</artifactId>
+        <type>car</type>
+    </dependency>
+    <!--<dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>tomcat7</artifactId>
+        <type>car</type>
+    </dependency>-->
+    <dependency>
+        <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+        <artifactId>daytrader-derby-datasource</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+        <artifactId>daytrader-jms</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Added: geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/plan/plan.xml?rev=1130383&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/plan/plan.xml Thu Jun  2 02:39:22 2011
@@ -0,0 +1,182 @@
+<?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: 1055368 $ $Date: 2011-01-05 17:24:04 +0800 (Wed, 05 Jan 2011) $ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+
+    <!--
+     **
+     **  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="db2" />
+                        <property name="openjpa.jdbc.DBDictionary" value="derby" />
+                    </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.2.1-SNAPSHOT</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.2.1-SNAPSHOT</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.2.1-SNAPSHOT</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.2.1-SNAPSHOT</version>
+                    <type>car</type>
+                </moduleId>
+            </server-environment>
+        </application-client>
+    </module>-->
+
+</application>

Added: geronimo/daytrader/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/pom.xml?rev=1130383&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/pom.xml (added)
+++ geronimo/daytrader/trunk/plugins/pom.xml Thu Jun  2 02:39:22 2011
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>daytrader-parent</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader</groupId>
+    <artifactId>plugins</artifactId>
+    <name>DayTrader :: Plugins</name>
+    <packaging>pom</packaging>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>default</name>
+                </property>
+            </activation>
+            <modules>
+                <module>daytrader-derby-datasource</module>        	
+                <module>daytrader-jms</module>
+                <!--<module>daytrader-jetty</module>
+                <module>daytrader-tomcat</module>-->
+            </modules>
+        </profile>
+        <!--
+            You can build the extra datasources in this profile if you have
+            the required JDBC artifacts from each DB vendor installed into
+            either your local repo or a private maven repo you have setup,
+            by supplying the URL on the mvn cmdline as:
+                -Dmaven.repo.drivers=http://my.local.repo
+        -->
+        <profile>
+            <id>all</id>
+            <activation>
+                <property>
+                    <name>all</name>
+                </property>
+            </activation>
+            <modules>
+                <module>daytrader-derby-datasource</module>
+                <module>daytrader-db2-datasource</module>
+                <module>daytrader-oracle-datasource</module>
+        	<module>daytrader-mysql-datasource</module>
+                <module>daytrader-informix-datasource</module>
+        	<module>daytrader-sqlserver-datasource</module>
+                <module>daytrader-postgre-datasource</module>        	
+                <!--<module>daytrader-jetty</module>
+                <module>daytrader-tomcat</module>-->
+            </modules>
+            <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>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${geronimoVersion}</version>
+                <!-- Install as extention to allow 'car' packaging to be used. -->
+                <extensions>true</extensions>
+                <configuration>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                    <url>http://geronimo.apache.org/</url>
+                    <author>The Apache Geronimo development community</author>
+                    <osiApproved>true</osiApproved>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                        <useTransitiveDependencies>true</useTransitiveDependencies>
+                    </useMavenDependencies>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <commonInstance>
+                        <plugin-artifact>
+                        <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <!--<geronimo-version>2.2</geronimo-version>
+                            <geronimo-version>2.2.1-SNAPSHOT</geronimo-version>-->
+                            <jvm-version>1.5</jvm-version>
+                            <jvm-version>1.6</jvm-version>
+                            <source-repository>~/.m2/repository/</source-repository>
+                            <source-repository>http://repository.apache.org/snapshots/</source-repository>
+                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                        </plugin-artifact>
+                    </commonInstance>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <!-- Allow any Java >= 1.5 -->
+                                <requireJavaVersion>
+                                    <version>[1.5,)</version>
+                                </requireJavaVersion>
+
+                                <!-- Allow any Maven >= 2.0.9 -->
+                                <requireMavenVersion>
+                                    <version>[2.0.9,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.5</jdkName>
+                    <linkModules>true</linkModules>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Thu Jun  2 02:39:22 2011
@@ -42,7 +42,25 @@
         <geronimoVersion>3.0-SNAPSHOT</geronimoVersion>
         <!-- set siteId to artifactId for any "top level" project rooting a website -->
         <siteId>daytrader</siteId>
-        <openjpaVersion>2.0.0</openjpaVersion>
+        <openjpaVersion>2.1.0</openjpaVersion>
+
+        <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
+        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
+        <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
+        <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${geronimoVersion}/car</connectorDeployer>
+        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
+        <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
+        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
+        <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
+        <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat7-deployer/${geronimoVersion}/car</tomcatDeployer>
+        <jetty7Deployer>org.apache.geronimo.configs/jetty8-deployer/${geronimoVersion}/car</jetty7Deployer>
+        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
+        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${geronimoVersion}/car</jpaDeployer>
+        <myfacesDeployer>org.apache.geronimo.configs/myfaces-deployer/${geronimoVersion}/car</myfacesDeployer>
+        <openwebbeansDeployer>org.apache.geronimo.configs/openwebbeans-deployer/${geronimoVersion}/car</openwebbeansDeployer>
+        <winkDeployer>org.apache.geronimo.configs/wink-deployer/${geronimoVersion}/car</winkDeployer>
     </properties>
 
     <issueManagement>
@@ -212,78 +230,36 @@
                 <version>${openjpaVersion}</version>
             </dependency>
             
-            <!-- All daytrader sub modules listed here -->
-        <dependency>
-       <groupId>org.apache.geronimo.daytrader</groupId>
-         <artifactId>daytrader-util</artifactId>
-           <version>${project.version}</version>
-            <scope>provided</scope>
-                </dependency>
-                
+            <!-- All daytrader sub modules listed here --> 
                 <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-beans</artifactId>
+                        <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+                    <artifactId>utils</artifactId>
                     <version>${project.version}</version>
                     <scope>provided</scope>            
                 </dependency>
                 
                 <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-core</artifactId>
+                        <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+                    <artifactId>core</artifactId>
                     <version>${project.version}</version>            
                     <scope>provided</scope>
-                </dependency>
+                </dependency>                
+               
                 
                 <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-ejb3</artifactId>
-                    <version>${project.version}</version>
-                    <type>ejb</type>                 
-                    <scope>provided</scope>
-                </dependency>
-                
-                <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-entities</artifactId>
+                        <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+                    <artifactId>entities</artifactId>
                     <version>${project.version}</version>      
                     <scope>provided</scope>              
-                </dependency>
+                </dependency> 
                 
                 <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>json-proxy</artifactId>
-                    <version>${project.version}</version>      
-                    <scope>provided</scope>              
-                </dependency>
-                
-                <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-soap</artifactId>
-                    <version>${project.version}</version>   
-                    <scope>provided</scope>                 
-                </dependency>
-                
-                <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>streamer</artifactId>
-                    <version>${project.version}</version>    
-                    <scope>provided</scope>                
-                </dependency>
-                
-                <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-web</artifactId>
+                        <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
+                    <artifactId>web</artifactId>
                     <version>${project.version}</version>        
                     <scope>provided</scope>            
                 </dependency>
-                
-                <dependency>
-                        <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>wsappclient</artifactId>
-                    <version>${project.version}</version>       
-                    <scope>provided</scope>             
-                </dependency>
-                
+               
                 <dependency>
                 <groupId>org.apache.taglibs</groupId>
                 <artifactId>taglibs-standard-jstlel</artifactId>
@@ -334,7 +310,8 @@
             </properties>
             <modules>
                 <!-- Daytrader Java EE 6 -->
-               <module>javaee6</module>   
+               <module>javaee6</module>  
+               <module>plugins</module> 
             </modules>
         </profile>
         <profile>
@@ -351,7 +328,8 @@
             </properties>
             <modules>               
                 <!-- Daytrader Java EE 6 -->
-               <module>javaee6</module>                
+               <module>javaee6</module>
+               <module>plugins</module>                 
             </modules>
         </profile>