geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r907731 - in /geronimo/daytrader/trunk/plugins: ./ daytrader-db2-datasource/ daytrader-derby-datasource/ daytrader-informix-datasource/ daytrader-jetty/ daytrader-jms/ daytrader-mysql-datasource/ daytrader-oracle-datasource/ daytrader-postg...
Date Mon, 08 Feb 2010 17:22:43 GMT
Author: dwoods
Date: Mon Feb  8 17:22:43 2010
New Revision: 907731

URL: http://svn.apache.org/viewvc?rev=907731&view=rev
Log:
move commonInstance data up to plugins/pom.xml to simplify maintenance; updated to support 2.2.1-SNAPSHOT servers; added missing obsoletes entries; added plugins for JPA web-only plugins.

Added:
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/pom.xml   (with props)
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/main/
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/main/plan/
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml   (with props)
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/main/
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/main/plan/
    geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml   (with props)
Modified:
    geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml
    geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml
    geronimo/daytrader/trunk/plugins/pom.xml

Modified: geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml Mon Feb  8 17:22:43 2010
@@ -78,47 +78,50 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-db2-xa</artifactId>
                         <type>rar</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                         <plugin-artifact>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${version}/car</artifact-alias>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-db2-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource//car</obsoletes>
-                            -->
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-db2-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+                            <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-db2-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-informix-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-informix-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-mysql-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-mysql-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-oracle-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-postgre-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-postgre-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-sqlserver-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml Mon Feb  8 17:22:43 2010
@@ -71,44 +71,50 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-derby-embed-xa</artifactId>
                         <type>rar</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                         <plugin-artifact>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
-                            -->
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-db2-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <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-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-informix-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-informix-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-mysql-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-mysql-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-oracle-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-postgre-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-postgre-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-sqlserver-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml Mon Feb  8 17:22:43 2010
@@ -78,47 +78,24 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-informix-xa</artifactId>
                         <type>rar</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                         <plugin-artifact>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-informix-datasource/${version}/car</artifact-alias>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-db2-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource//car</obsoletes>
-                            -->
+                            <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-informix-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-informix-datasource</artifactId>
+                            </obsoletes>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml Mon Feb  8 17:22:43 2010
@@ -34,20 +34,20 @@
         <dependency>
             <groupId>org.apache.geronimo.daytrader.assemblies.javaee</groupId>
             <artifactId>daytrader-ear</artifactId>
-            <version>${version}</version>
+            <version>${pom.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>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.plugins</groupId>
             <artifactId>daytrader-jms</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
@@ -148,18 +148,8 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
@@ -175,22 +165,23 @@
                         <artifactId>daytrader-ear</artifactId>
                         <type>ear</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                        <plugin-artifact>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-jetty//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-jetty//car</obsoletes>
-                            -->
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-jetty//car">org.apache.geronimo.daytrader.plugins/daytrader-jetty/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jpa-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-jetty/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jdbc-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-jetty/${pom.version}/car</artifact-alias>
                        </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml Mon Feb  8 17:22:43 2010
@@ -74,44 +74,20 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.modules</groupId>
                         <artifactId>geronimo-activemq-ra</artifactId>
                         <type>rar</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                         <plugin-artifact>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-jms//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-jms//car</obsoletes>
-                            -->
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-jms</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-jms//car">org.apache.geronimo.daytrader.plugins/daytrader-jms/${pom.version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml Mon Feb  8 17:22:43 2010
@@ -1,120 +1,97 @@
-<?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>2.2-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-    <artifactId>daytrader-mysql-datasource</artifactId>
-    <packaging>car</packaging>
-    <name>Daytrader :: Plugins :: MySQL DataSource</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-mysql-xa</artifactId>
-            <type>rar</type>
-            <version>1.3</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>	
+<?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>2.2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+    <artifactId>daytrader-mysql-datasource</artifactId>
+    <packaging>car</packaging>
+    <name>Daytrader :: Plugins :: MySQL DataSource</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-mysql-xa</artifactId>
+            <type>rar</type>
+            <version>1.3</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>	
         <dependency>
     	    <groupId>mysql</groupId>
     	    <artifactId>mysql-connector-java</artifactId>
     	    <version>5.1.10</version>
-	</dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-mysql-xa</artifactId>
-                        <type>rar</type>
-                    </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
-                    <instance>
-                        <plugin-artifact>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-mysql-datasource/${version}/car</artifact-alias>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-db2-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource//car</obsoletes>
-                            -->
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+	</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-mysql-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-mysql-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-mysql-datasource</artifactId>
+                            </obsoletes>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml Mon Feb  8 17:22:43 2010
@@ -71,47 +71,24 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
                     <module>
                         <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-oracle-xa</artifactId>
                         <type>rar</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                         <plugin-artifact>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource/${version}/car</artifact-alias>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-oracle-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource//car</obsoletes>
-                            -->
+                            <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-oracle-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-oracle-datasource</artifactId>
+                            </obsoletes>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml Mon Feb  8 17:22:43 2010
@@ -1,120 +1,97 @@
-<?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>2.2-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-    <artifactId>daytrader-postgre-datasource</artifactId>
-    <packaging>car</packaging>
-    <name>Daytrader :: Plugins :: PostgreSQL DataSource</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-postgresql-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>	
+<?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>2.2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+    <artifactId>daytrader-postgre-datasource</artifactId>
+    <packaging>car</packaging>
+    <name>Daytrader :: Plugins :: PostgreSQL DataSource</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-postgresql-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>	
         <dependency>
     	    <groupId>postgresql</groupId>
 	    <artifactId>postgresql</artifactId>
 	    <version>8.4-701.jdbc4</version>
-	</dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-postgresql-xa</artifactId>
-                        <type>rar</type>
-                    </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
-                    <instance>
-                        <plugin-artifact>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-postgre-datasource/${version}/car</artifact-alias>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-db2-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource//car</obsoletes>
-                            -->
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+	</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-postgresql-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-postgre-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-postgre-datasource</artifactId>
+                            </obsoletes>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: 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=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml Mon Feb  8 17:22:43 2010
@@ -72,47 +72,24 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <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>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                         <plugin-artifact>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${version}/car">org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${version}/car</artifact-alias>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-db2-datasource//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource//car</obsoletes>
-                            -->
+                            <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>

Modified: geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml Mon Feb  8 17:22:43 2010
@@ -147,18 +147,8 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
@@ -174,22 +164,23 @@
                         <artifactId>daytrader-ear</artifactId>
                         <type>ear</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                         <plugin-artifact>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-tomcat//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader.plugins/daytrader-tomcat//car</obsoletes>
-                            -->
+                            <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>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jpa-tomcat</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jdbc-tomcat</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-jetty/pom.xml Mon Feb  8 17:22:43 2010
@@ -84,44 +84,36 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jetty7Deployer}</deploymentConfig>
-                        <deploymentConfig>${jasperDeployer}</deploymentConfig>                        
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
                         <artifactId>daytrader-web-jdbc</artifactId>
                         <type>war</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                        <plugin-artifact>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-jetty//car</obsoletes>
-                            -->
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jdbc-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty//car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jpa-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
                        </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/daytrader-web-jdbc-tomcat/pom.xml Mon Feb  8 17:22:43 2010
@@ -81,44 +81,36 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- 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>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${jasperDeployer}</deploymentConfig>                        
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
                         <artifactId>daytrader-web-jdbc</artifactId>
                         <type>war</type>
                     </module>
-                    <commonInstance>
-                        <plugin-artifact>
-                            <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
                     <instance>
                         <plugin-artifact>
-                            <!-- The following doesn't work with c-m-p in 2.1.3
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader//car</obsoletes>
-                            <obsoletes>org.apache.geronimo.daytrader/daytrader-tomcat//car</obsoletes>
-                            -->
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jdbc-tomcat</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat//car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jpa-tomcat</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-tomcat</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-tomcat/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Added: geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/pom.xml?rev=907731&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/pom.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/pom.xml Mon Feb  8 17:22:43 2010
@@ -0,0 +1,140 @@
+<?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: 813223 $ $Date: 2009-09-10 00:19:29 -0400 (Thu, 10 Sep 2009) $ -->
+<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>2.2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+    <artifactId>daytrader-web-jpa-jetty</artifactId>
+    <packaging>car</packaging>
+    <name>Daytrader :: Plugins :: Web + JPA :: Jetty</name>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+            <artifactId>daytrader-web-jpa</artifactId>
+            <version>${version}</version>
+            <type>war</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.configs</groupId>
+            <artifactId>jetty7-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>jetty7</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</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>${jetty7Deployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
+                        <artifactId>daytrader-web-jpa</artifactId>
+                        <type>war</type>
+                    </module>
+                    <instance>
+                       <plugin-artifact>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jpa-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty//car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-web-jdbc-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-jetty</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-jetty/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
+                       </plugin-artifact>
+                    </instance>
+                </configuration>
+            </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>

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

Added: geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml?rev=907731&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml Mon Feb  8 17:22:43 2010
@@ -0,0 +1,35 @@
+<?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.
+-->
+
+    <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">
+        
+        
+    
+    <context-root>/daytrader</context-root>
+
+     <naming:resource-ref>
+        <naming:ref-name>jdbc/TradeDataSource</naming:ref-name>
+        <naming:resource-link>jdbc/TradeDataSource</naming:resource-link>
+    </naming:resource-ref>
+
+</web-app>
+
+

Propchange: geronimo/daytrader/trunk/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml?rev=907731&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml Mon Feb  8 17:22:43 2010
@@ -0,0 +1,35 @@
+<?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.
+-->
+
+    <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">
+        
+        
+    
+    <context-root>/daytrader</context-root>
+
+     <naming:resource-ref>
+        <naming:ref-name>jdbc/TradeDataSource</naming:ref-name>
+        <naming:resource-link>jdbc/TradeDataSource</naming:resource-link>
+    </naming:resource-ref>
+
+</web-app>
+
+

Propchange: geronimo/daytrader/trunk/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/daytrader/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/pom.xml?rev=907731&r1=907730&r2=907731&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plugins/pom.xml (original)
+++ geronimo/daytrader/trunk/plugins/pom.xml Mon Feb  8 17:22:43 2010
@@ -42,6 +42,8 @@
         <!--<module>daytrader-postgre-datasource</module>-->
 	<module>daytrader-web-jdbc-jetty</module>
         <module>daytrader-web-jdbc-tomcat</module>
+	<module>daytrader-web-jpa-jetty</module>
+        <module>daytrader-web-jpa-tomcat</module>
         <module>daytrader-jms</module>
         <module>daytrader-jetty</module>
         <module>daytrader-tomcat</module>
@@ -50,6 +52,44 @@
     <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>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>



Mime
View raw message