geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Bohn <joe.b...@earthlink.net>
Subject Re: svn commit: r660588 [1/3] - in /geronimo/samples/trunk: ./ samples/ samples/CustomerService/CustomerService-ear/ samples/CustomerService/CustomerService-ear/src/main/resources/ samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/ sa...
Date Tue, 27 May 2008 20:31:08 GMT

David,

Thanks for committing this to trunk.  It will be great to have the 
itests for samples.

I have few questions on the shared sample datasource plugin (not just 
for David to answer):

1) Big Picture Question:  Is this what the users are typically expecting 
when they work through a sample regarding any necessary datasource 
entries?  Until now the samples included the datasource definitions 
within the application (ear).  They could follow the sample without 
using the plugins at all.  Now it would appear that they must install 
the SampleDatasource plugin before they can install any sample and they 
will not see the datasource definition within the sample itself.  David 
and I have already discussed this on IRC some but I was wondering what 
others thought.

2) It seems that the datasource is still being defined within the ear 
(at least partially).  The geronimo-application.xml for each sample 
still includes a module for the tranql-connector-ra-1.3.rar and a 
reference to the application specific pool definition in the alt-dd. 
See for example, 
/bank-ear/src/main/resources/META-INF/geronimo-application.xml.  I'm not 
well versed on this but I thought this meant that the application was 
still defining a pool based upon BankPool.xml.

3) The pool definitions are slightly different for the various samples. 
  I think most of this was just due to different names for the pools. 
However, there are some other differences.  Some include a username and 
others do not.  Also, the TimeReportPool.xml includes a gbean definition 
for the TimeReportRealm.  How are these differences addressed in these 
changes and are the samples still functional?

Thanks,
Joe



djencks@apache.org wrote:
> Author: djencks
> Date: Tue May 27 09:29:53 2008
> New Revision: 660588
> 
> URL: http://svn.apache.org/viewvc?rev=660588&view=rev
> Log:
> GERONIMO-4084 add separate datasource plugin, and simple itests.  Uses new install-plugin g-m-p command
> 
> Added:
>     geronimo/samples/trunk/samples/SampleDatasource/
>     geronimo/samples/trunk/samples/SampleDatasource/pom.sample.xml   (with props)
>     geronimo/samples/trunk/samples/SampleDatasource/pom.xml   (with props)
>     geronimo/samples/trunk/samples/SampleDatasource/src/
>     geronimo/samples/trunk/samples/SampleDatasource/src/main/
>     geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/
>     geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml   (with props)
>     geronimo/samples/trunk/samples/SampleDatasource/src/main/resources/
> Modified:
>     geronimo/samples/trunk/pom.xml
>     geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml
>     geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml
>     geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml
>     geronimo/samples/trunk/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml
>     geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml
>     geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml
>     geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml
>     geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/bank/bank-ear/pom.xml
>     geronimo/samples/trunk/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml
>     geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
>     geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml
>     geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml
>     geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml
>     geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml
>     geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml
>     geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml
>     geronimo/samples/trunk/samples/inventory/inventory-jetty/pom.xml
>     geronimo/samples/trunk/samples/inventory/inventory-jetty/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/inventory/inventory-tomcat/pom.xml
>     geronimo/samples/trunk/samples/inventory/inventory-tomcat/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
>     geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
>     geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
>     geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
>     geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
>     geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
>     geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
>     geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
>     geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
>     geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/pom.xml
>     geronimo/samples/trunk/samples/myphonebook/myphonebook-ejb/src/main/resources/META-INF/persistence.xml
>     geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/pom.xml
>     geronimo/samples/trunk/samples/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/pom.xml
>     geronimo/samples/trunk/samples/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/mytime/mytime-jetty/pom.xml
>     geronimo/samples/trunk/samples/mytime/mytime-tomcat/pom.xml
>     geronimo/samples/trunk/samples/pom.xml
>     geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml
>     geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml
>     geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
>     geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
>     geronimo/samples/trunk/samples/timereport/timereport-ear/pom.xml
>     geronimo/samples/trunk/samples/timereport/timereport-jetty/pom.xml
>     geronimo/samples/trunk/samples/timereport/timereport-jetty/src/main/plan/plan.xml
>     geronimo/samples/trunk/samples/timereport/timereport-tomcat/pom.xml
>     geronimo/samples/trunk/samples/timereport/timereport-tomcat/src/main/plan/plan.xml
> 
> Modified: geronimo/samples/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/pom.xml (original)
> +++ geronimo/samples/trunk/pom.xml Tue May 27 09:29:53 2008
> @@ -65,6 +65,142 @@
>      </modules>
>  
>      <build>
> +        <pluginManagement>
> +            <plugins>
> +                <plugin>
> +                    <groupId>org.apache.geronimo.buildsupport</groupId>
> +                    <artifactId>geronimo-maven-plugin</artifactId>
> +                    <version>2.2-SNAPSHOT</version>
> +                    <!--<version>${geronimoVersion}</version>-->
> +
> +                    <configuration>
> +                        <assemblies>
> +                            <assembly>
> +                                <id>jetty</id>
> +                                <groupId>org.apache.geronimo.assemblies</groupId>
> +                                <artifactId>geronimo-jetty6-javaee5</artifactId>
> +                                <version>${geronimoVersion}</version>
> +                                <classifier>bin</classifier>
> +                                <type>zip</type>
> +                            </assembly>
> +
> +                            <assembly>
> +                                <id>jetty-minimal</id>
> +                                <groupId>org.apache.geronimo.assemblies</groupId>
> +                                <artifactId>geronimo-jetty6-minimal</artifactId>
> +                                <version>${geronimoVersion}</version>
> +                                <classifier>bin</classifier>
> +                                <type>zip</type>
> +                            </assembly>
> +
> +                            <assembly>
> +                                <id>tomcat</id>
> +                                <groupId>org.apache.geronimo.assemblies</groupId>
> +                                <artifactId>geronimo-tomcat6-javaee5</artifactId>
> +                                <version>${geronimoVersion}</version>
> +                                <classifier>bin</classifier>
> +                                <type>zip</type>
> +                            </assembly>
> +
> +                            <assembly>
> +                                <id>tomcat-minimal</id>
> +                                <groupId>org.apache.geronimo.assemblies</groupId>
> +                                <artifactId>geronimo-tomcat6-minimal</artifactId>
> +                                <version>${geronimoVersion}</version>
> +                                <classifier>bin</classifier>
> +                                <type>zip</type>
> +                            </assembly>
> +
> +                            <assembly>
> +                                <id>framework</id>
> +                                <groupId>org.apache.geronimo.assemblies</groupId>
> +                                <artifactId>geronimo-framework</artifactId>
> +                                <version>${geronimoVersion}</version>
> +                                <classifier>bin</classifier>
> +                                <type>zip</type>
> +                            </assembly>
> +                        </assemblies>
> +
> +                        <defaultAssemblyId>framework</defaultAssemblyId>
> +
> +                        <optionSets>
> +                            <optionSet>
> +                                <id>morememory</id>
> +                                <options>
> +                                    <option>-Xmx512m</option>
> +                                    <option>-XX:MaxPermSize=128m</option>
> +                                </options>
> +                            </optionSet>
> +
> +                            <optionSet>
> +                                <id>debug</id>
> +                                <options>
> +                                    <option>-Xdebug</option>
> +                                    <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
> +                                </options>
> +                            </optionSet>
> +                        </optionSets>
> +                    </configuration>
> +                    <executions>
> +                         <execution>
> +                             <id>start</id>
> +                             <phase>pre-integration-test</phase>
> +                             <goals>
> +                                 <goal>start-server</goal>
> +                             </goals>
> +                             <configuration>
> +                                 <assemblyId>${it-server}</assemblyId>
> +                                 <logOutput>true</logOutput>
> +                                 <background>true</background>
> +                                 <verifyTimeout>300</verifyTimeout>
> +                                 <refresh>true</refresh>
> +                                 <optionSets>
> +                                     <optionSet>
> +                                         <id>default</id>
> +                                         <options>
> +                                            <option>-XX:MaxPermSize=128m</option>
> +                                         </options>
> +                                     </optionSet>
> +
> +                                     <optionSet>
> +                                          <id>morememory</id>
> +                                          <options>
> +                                              <option>-Xmx512m</option>
> +                                              <option>-XX:MaxPermSize=128m</option>
> +                                          </options>
> +                                      </optionSet>
> +
> +                                      <optionSet>
> +                                          <id>debug</id>
> +                                          <options>
> +                                              <option>-Xdebug</option>
> +                                              <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
> +                                          </options>
> +                                      </optionSet>
> +                                 </optionSets>
> +                             </configuration>
> +                         </execution>
> +                         <execution>
> +                             <id>install-plugin</id>
> +                             <phase>install</phase>
> +                             <goals>
> +                                 <goal>install-plugin</goal>
> +                             </goals>
> +                             <!--<configuration>-->
> +                                 <!--<defaultGeronimoRepository>http://geronimo.apache.org/plugins/geronimo-${geronimoVersion}/</defaultGeronimoRepository>-->
> +                             <!--</configuration>-->
> +                         </execution>
> +                         <execution>
> +                             <id>stop</id>
> +                             <phase>install</phase>
> +                             <goals>
> +                                 <goal>stop-server</goal>
> +                             </goals>
> +                         </execution>
> +                     </executions>
> +                </plugin>
> +            </plugins>
> +        </pluginManagement>
>          <plugins>
>              <plugin>
>                  <groupId>org.apache.maven.plugins</groupId>
> 
> Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml (original)
> +++ geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/pom.xml Tue May 27 09:29:53 2008
> @@ -38,12 +38,6 @@
>  
>      <dependencies>
>          <dependency>
> -            <groupId>org.tranql</groupId>
> -            <artifactId>tranql-connector-ra</artifactId>
> -            <type>rar</type>
> -        </dependency>
> -                
> -        <dependency>
>              <groupId>org.apache.geronimo.samples</groupId>
>              <artifactId>CustomerService-war</artifactId>
>              <version>${version}</version>
> 
> Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml (original)
> +++ geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerServicePool.xml Tue May 27 09:29:53 2008
> @@ -21,7 +21,7 @@
>      <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
>          <dep:moduleId>
>              <dep:groupId>console.dbpool</dep:groupId>
> -            <dep:artifactId>CustomerServicePool</dep:artifactId>
> +            <dep:artifactId>SampleDatasource</dep:artifactId>
>              <dep:version>1.0</dep:version>
>              <dep:type>rar</dep:type>
>          </dep:moduleId>
> @@ -38,7 +38,7 @@
>              <connection-definition>
>                  <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
>                  <connectiondefinition-instance>
> -                    <name>CustomerServicePool</name>
> +                    <name>SampleDatasource</name>
>                      <config-property-setting name="Driver">org.apache.derby.jdbc.EmbeddedDriver</config-property-setting>
>                      <config-property-setting name="ConnectionURL">jdbc:derby:CustomerDB</config-property-setting>
>                      <connectionmanager>
> 
> Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml (original)
> +++ geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml Tue May 27 09:29:53 2008
> @@ -29,9 +29,9 @@
>        <dep:non-overridable-classes/>
>     </dep:environment>
>     
> -   <module>
> -        <connector>tranql-connector-ra-1.3.rar</connector>
> -        <alt-dd>CustomerServicePool.xml</alt-dd>
> -   </module>
> +   <!--<module>-->
> +        <!--<connector>tranql-connector-ra-1.3.rar</connector>-->
> +        <!--<alt-dd>CustomerServicePool.xml</alt-dd>-->
> +   <!--</module>-->
>     
>  </application>
> 
> Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml (original)
> +++ geronimo/samples/trunk/samples/CustomerService/CustomerService-ejb/src/main/resources/META-INF/persistence.xml Tue May 27 09:29:53 2008
> @@ -23,11 +23,11 @@
>      <persistence-unit name="CustomerPU">
>          <description>Entity Beans for Customer</description>
>          <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
> +        <jta-data-source>SampleTxDatasource</jta-data-source>
> +        <non-jta-data-source>SampleNoTxDatasource</non-jta-data-source>
>          <class>com.service.customer.ejb.Customer</class>
>          <properties>
>              <property name="openjpa.jdbc.SynchronizeMappings" value="false"/>
>          </properties>
> -        <jta-data-source>CustomerServicePool</jta-data-source>
> -        <non-jta-data-source>CustomerServicePool</non-jta-data-source>
>      </persistence-unit>
>  </persistence>
> 
> Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml (original)
> +++ geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/pom.xml Tue May 27 09:29:53 2008
> @@ -45,6 +45,12 @@
>              <type>ear</type>
>              <scope>provided</scope>
>          </dependency>
> +        <dependency>
> +            <groupId>org.apache.geronimo.samples</groupId>
> +            <artifactId>SampleDatasource</artifactId>
> +            <version>${version}</version>
> +            <type>car</type>
> +        </dependency>
>  
>          <dependency>
>              <groupId>org.apache.geronimo.framework</groupId>
> @@ -84,6 +90,30 @@
>              <type>car</type>
>              <scope>provided</scope>
>          </dependency>
> +        <dependency>
> +            <groupId>org.apache.geronimo.configs</groupId>
> +            <artifactId>jetty6</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>
> +        <dependency>
> +            <groupId>org.apache.geronimo.configs</groupId>
> +            <artifactId>j2ee-server</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>
>      </dependencies>
>  
>      <build>
> @@ -120,19 +150,19 @@
>                      <category>Sample</category>
>                      <instance>
>                          <plugin-artifact>
> -                            <prerequisite>
> -                                <id>
> -                                    <groupId>org.apache.geronimo.configs</groupId>
> -                                    <artifactId>jetty6</artifactId>
> -                                </id>
> -                                <resource-type>Web Container</resource-type>
> -                                <description>
> -                                    This version of the application works with the Geronimo/Jetty distribution. 
> -                                    It is not intended to run in the Geronimo/Tomcat distribution. 
> -                                    There is a separate version of the application that works with Tomcat. 
> -                                    Please install the version appropriate to your Geronimo distribution.
> -                                </description> 
> -                            </prerequisite>
> +                            <!--<prerequisite>-->
> +                                <!--<id>-->
> +                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
> +                                    <!--<artifactId>jetty6</artifactId>-->
> +                                <!--</id>-->
> +                                <!--<resource-type>Web Container</resource-type>-->
> +                                <!--<description>-->
> +                                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
> +                                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
> +                                    <!--There is a separate version of the application that works with Tomcat. -->
> +                                    <!--Please install the version appropriate to your Geronimo distribution.-->
> +                                <!--</description> -->
> +                            <!--</prerequisite>-->
>                          </plugin-artifact>
>                      </instance>
>                  </configuration>
> @@ -140,5 +170,23 @@
>          </plugins>
>      </build>
>  
> +    <profiles>
> +        <profile>
> +            <id>it</id>
> +            <!--<properties>-->
> +                <!--<it-server>jetty</it-server>-->
> +            <!--</properties>-->
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.geronimo.buildsupport</groupId>
> +                        <artifactId>geronimo-maven-plugin</artifactId>
> +                        <version>2.2-SNAPSHOT</version>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +        </profile>
> +    </profiles>
> +
>  </project>
>  
> 
> Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml (original)
> +++ geronimo/samples/trunk/samples/CustomerService/CustomerService-jetty/src/main/plan/plan.xml Tue May 27 09:29:53 2008
> @@ -20,10 +20,5 @@
>  
>  <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
>  <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
> -
> -   <module>
> -        <connector>tranql-connector-ra-1.3.rar</connector>
> -        <alt-dd>CustomerServicePool.xml</alt-dd>
> -   </module>
>     
>  </application>
> 
> Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml (original)
> +++ geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/pom.xml Tue May 27 09:29:53 2008
> @@ -45,7 +45,13 @@
>              <type>ear</type>
>              <scope>provided</scope>
>          </dependency>
> -        
> +        <dependency>
> +            <groupId>org.apache.geronimo.samples</groupId>
> +            <artifactId>SampleDatasource</artifactId>
> +            <version>${version}</version>
> +            <type>car</type>
> +        </dependency>
> +
>          <dependency>
>              <groupId>org.apache.geronimo.framework</groupId>
>              <artifactId>geronimo-gbean-deployer</artifactId>
> @@ -85,6 +91,31 @@
>              <type>car</type>
>              <scope>provided</scope>
>          </dependency>
> +        
> +        <dependency>
> +            <groupId>org.apache.geronimo.configs</groupId>
> +            <artifactId>tomcat6</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>
> +        <dependency>
> +            <groupId>org.apache.geronimo.configs</groupId>
> +            <artifactId>j2ee-server</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>
>      </dependencies>
>  
>      <build>
> @@ -121,19 +152,19 @@
>                      <category>Sample</category>
>                      <instance>
>                          <plugin-artifact>
> -                            <prerequisite>
> -                                <id>
> -                                    <groupId>org.apache.geronimo.configs</groupId>
> -                                    <artifactId>tomcat6</artifactId>
> -                                </id>
> -                                <resource-type>Web Container</resource-type>
> -                                <description>
> -                                    This version of the application works with the Geronimo/Tomcat distribution. 
> -                                    It is not intended to run in the Geronimo/Jetty distribution. 
> -                                    There is a separate version of the application that works with Jetty. 
> -                                    Please install the version appropriate to your Geronimo distribution.
> -                                </description> 
> -                            </prerequisite>
> +                            <!--<prerequisite>-->
> +                                <!--<id>-->
> +                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
> +                                    <!--<artifactId>tomcat6</artifactId>-->
> +                                <!--</id>-->
> +                                <!--<resource-type>Web Container</resource-type>-->
> +                                <!--<description>-->
> +                                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
> +                                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
> +                                    <!--There is a separate version of the application that works with Jetty. -->
> +                                    <!--Please install the version appropriate to your Geronimo distribution.-->
> +                                <!--</description> -->
> +                            <!--</prerequisite>-->
>                          </plugin-artifact>
>                      </instance>
>                  </configuration>
> @@ -141,5 +172,21 @@
>          </plugins>
>      </build>
>      
> +    <profiles>
> +        <profile>
> +            <id>it</id>
> +            <!--<properties>-->
> +                <!--<it-server>tomcat</it-server>-->
> +            <!--</properties>-->
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.geronimo.buildsupport</groupId>
> +                        <artifactId>geronimo-maven-plugin</artifactId>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +        </profile>
> +    </profiles>
>  </project>
>  
> 
> Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml (original)
> +++ geronimo/samples/trunk/samples/CustomerService/CustomerService-tomcat/src/main/plan/plan.xml Tue May 27 09:29:53 2008
> @@ -21,9 +21,4 @@
>  <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
>  <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
>     
> -   <module>
> -        <connector>tranql-connector-ra-1.3.rar</connector>
> -        <alt-dd>CustomerServicePool.xml</alt-dd>
> -   </module>
> -
>  </application>
> 
> Added: geronimo/samples/trunk/samples/SampleDatasource/pom.sample.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/SampleDatasource/pom.sample.xml?rev=660588&view=auto
> ==============================================================================
> --- geronimo/samples/trunk/samples/SampleDatasource/pom.sample.xml (added)
> +++ geronimo/samples/trunk/samples/SampleDatasource/pom.sample.xml Tue May 27 09:29:53 2008
> @@ -0,0 +1,123 @@
> +<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>
> +    <groupId>org.apache.geronimo.samples</groupId>
> +    <artifactId>SampleDatasource</artifactId>
> +    <version>1.0-SNAPSHOT</version>
> +    <packaging>car</packaging>
> +
> +    <properties>
> +        <!-- This property is required by the car:package mojo -->
> +        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
> +
> +        <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/${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/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
> +        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
> +        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
> +        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
> +    </properties>
> +
> +
> +    <dependencies>
> +        <!-- if you are deploying a jee application, use scope provided -->
> +        <!-- other dependencies will normally end up as dependencies in the plan and geronimo-plugin.xml -->
> +        <!-- include dependencies on all deployer modules needed, with scope provided -->
> +
> +    </dependencies>
> +
> +    <build>
> +        <pluginManagement>
> +            <plugins>
> +
> +                <plugin>
> +                    <groupId>org.apache.geronimo.buildsupport</groupId>
> +                    <artifactId>car-maven-plugin</artifactId>
> +                    <version>${geronimoVersion}</version>
> +                    <extensions>true</extensions>
> +                    <configuration>
> +                        <!-- where in plugin catalog this should go -->
> +                        <category>MyCategory</category>
> +                    </configuration>
> +                </plugin>
> +
> +            </plugins>
> +        </pluginManagement>
> +
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.geronimo.buildsupport</groupId>
> +                <artifactId>car-maven-plugin</artifactId>
> +                <configuration>
> +                    <deploymentConfigs>
> +                        <!-- gbean deployer is default.  For jee apps include all deployers your app needs, see properties -->
> +                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
> +                        <!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
> +                        <!--<deploymentConfig>${jetty6Deployer}</deploymentConfig>-->
> +                        <!--<deploymentConfig>${jasperDeployer}</deploymentConfig>-->
> +                        <!--<deploymentConfig>${jpaDeployer}</deploymentConfig>-->
> +                    </deploymentConfigs>
> +                    <!-- if you are deploying a jee app specify it here -->
> +                    <!--
> +                                        <module>
> +                                            <groupId>org.apache.roller</groupId>
> +                                            <artifactId>roller-weblogger-geronimo</artifactId>
> +                                            <type>war</type>
> +                                        </module>
> +                    -->
> +                    <!-- Normally you can use the maven dependencies unaltered.  If you need to specify import scope
> +                     you can list the dependencies here as you want them in the plan.xml -->
> +                    <useMavenDependencies>
> +                        <value>true</value>
> +                        <includeVersion>true</includeVersion>
> +                    </useMavenDependencies>
> +                    <!-- the instance sets up most of the optional geronimo-plugin.xml content -->
> +                    <instance>
> +                        <plugin-artifact>
> +                            <!-- prerequisites prevent your module from being installed unless already present -->
> +                            <!--
> +                                                        <prerequisite>
> +                                                            <id>
> +                                                                <groupId>mysql</groupId>
> +                                                                <artifactId>mysql-connector-java</artifactId>
> +                                                                <version>3.1.12</version>
> +                                                                <type>jar</type>
> +                                                            </id>
> +                                                            <resource-type>Database Connector</resource-type>
> +                                                            <description>
> +                                                                (why this can't be installed as a dependency)
> +                                                            </description>
> +                                                        </prerequisite>
> +                            -->
> +                            <!-- extract stuff from the car to the specified location (good for config info -->
> +                            <!--<copy-file relative-to="server" dest-dir="var/roller-data">themes</copy-file>-->
> +                            <!-- content that should go into var/config/config.xml for module customization -->
> +                            <!-- note the variable ${RollerContextPath} which is further specified in var/config/config-substitutions.properties -->
> +                            <!--
> +                                                        <config-xml-content server="default">
> +                                                            <gbean name="org.apache.geronimo.plugins/roller-jetty/1.0-SNAPSHOT/car">
> +                                                                <attribute name="contextPath">${RollerContextPath}</attribute>
> +                                                            </gbean>
> +                                                        </config-xml-content>
> +                            -->
> +                            <!-- a user-tweakable variable to go into var/config/config-substitutions.properties -->
> +                            <!--<config-substitution key="RollerContextPath">/roller</config-substitution>-->
> +                            <!-- artifact aliases let your module substitute for another one, e.g one db for another -->
> +                            <!--<artifact-alias key="org.apache.geronimo.plugins/roller-derby-database/1.0-SNAPSHOT/car">org.apache.geronimo.plugins/roller-mysql-database/1.0-SNAPSHOT/car</artifact-alias>-->
> +
> +                        </plugin-artifact>
> +                    </instance>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +
> +</project>
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/pom.sample.xml
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/pom.sample.xml
> ------------------------------------------------------------------------------
>     svn:keywords = Date Revision
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/pom.sample.xml
> ------------------------------------------------------------------------------
>     svn:mime-type = text/xml
> 
> Added: geronimo/samples/trunk/samples/SampleDatasource/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/SampleDatasource/pom.xml?rev=660588&view=auto
> ==============================================================================
> --- geronimo/samples/trunk/samples/SampleDatasource/pom.xml (added)
> +++ geronimo/samples/trunk/samples/SampleDatasource/pom.xml Tue May 27 09:29:53 2008
> @@ -0,0 +1,76 @@
> +<?xml version="1.0"?>
> +<project>
> +    <parent>
> +        <artifactId>samples</artifactId>
> +        <groupId>org.apache.geronimo.samples</groupId>
> +        <version>2.2-SNAPSHOT</version>
> +    </parent>
> +    <modelVersion>4.0.0</modelVersion>
> +    <groupId>org.apache.geronimo.samples</groupId>
> +    <artifactId>SampleDatasource</artifactId>
> +    <packaging>car</packaging>
> +    <dependencies>
> +        <dependency>
> +            <groupId>org.tranql</groupId>
> +            <artifactId>tranql-connector-derby-embed-xa</artifactId>
> +            <type>rar</type>
> +            <version>1.4</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>org.apache.geronimo.configs</groupId>
> +            <artifactId>system-database</artifactId>
> +            <type>car</type>
> +            <version>${geronimoVersion}</version>
> +        </dependency>
> +    </dependencies>
> +    <build>
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.geronimo.buildsupport</groupId>
> +                <artifactId>car-maven-plugin</artifactId>
> +                <configuration>
> +                    <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>
> +                    <useMavenDependencies>
> +                        <value>true</value>
> +                        <includeVersion>true</includeVersion>
> +                    </useMavenDependencies>
> +                    <instance>
> +                        <plugin-artifact>
> +                        </plugin-artifact>
> +                    </instance>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +</project>
> \ No newline at end of file
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/pom.xml
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/pom.xml
> ------------------------------------------------------------------------------
>     svn:keywords = Date Revision
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/pom.xml
> ------------------------------------------------------------------------------
>     svn:mime-type = text/xml
> 
> Added: geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml?rev=660588&view=auto
> ==============================================================================
> --- geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml (added)
> +++ geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml Tue May 27 09:29:53 2008
> @@ -0,0 +1,57 @@
> +<?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>SampleTxDatasource</name>
> +                    <config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
> +                    <config-property-setting name="CreateDatabase">true</config-property-setting>
> +                     <connectionmanager>
> +                        <xa-transaction>
> +                            <transaction-caching/>
> +                        </xa-transaction>
> +                        <single-pool>
> +                            <max-size>10</max-size>
> +                            <min-size>0</min-size>
> +                            <select-one-assume-match/>
> +                        </single-pool>
> +                    </connectionmanager>
> +                </connectiondefinition-instance>
> +                <connectiondefinition-instance>
> +                    <name>SampleNoTxDatasource</name>
> +                    <config-property-setting name="DatabaseName">SampleDatabase</config-property-setting>
> +                    <config-property-setting name="CreateDatabase">true</config-property-setting>
> +                     <connectionmanager>
> +                        <no-transaction/>
> +                        <single-pool>
> +                            <max-size>10</max-size>
> +                            <min-size>0</min-size>
> +                            <select-one-assume-match/>
> +                        </single-pool>
> +                    </connectionmanager>
> +                </connectiondefinition-instance>
> +            </connection-definition>
> +        </outbound-resourceadapter>
> +    </resourceadapter>
> +</connector>
> \ No newline at end of file
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml
> ------------------------------------------------------------------------------
>     svn:keywords = Date Revision
> 
> Propchange: geronimo/samples/trunk/samples/SampleDatasource/src/main/plan/plan.xml
> ------------------------------------------------------------------------------
>     svn:mime-type = text/xml
> 
> Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml (original)
> +++ geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/pom.xml Tue May 27 09:29:53 2008
> @@ -43,16 +43,10 @@
>              <artifactId>app-per-port-ear</artifactId>
>              <version>2.2-SNAPSHOT</version>
>              <type>ear</type>
> +            <scope>provided</scope>
>          </dependency>
>          
>          <dependency>
> -            <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>tomcat6</artifactId>
> -            <version>${geronimoVersion}</version>
> -            <type>car</type>
> -        </dependency>
> -
> -        <dependency>
>              <groupId>org.apache.geronimo.framework</groupId>
>              <artifactId>geronimo-gbean-deployer</artifactId>
>              <version>${geronimoVersion}</version>
> @@ -81,7 +75,14 @@
>              <artifactId>jasper</artifactId>
>              <version>${geronimoVersion}</version>
>              <type>car</type>
> -            <scope>provided</scope>
> +            <!--<scope>provided</scope>-->
> +        </dependency>
> +
> +        <dependency>
> +            <groupId>org.apache.geronimo.configs</groupId>
> +            <artifactId>tomcat6</artifactId>
> +            <version>${geronimoVersion}</version>
> +            <type>car</type>
>          </dependency>
>  
>      </dependencies>
> @@ -122,19 +123,19 @@
>                      <category>Sample</category>
>                      <instance>
>                          <plugin-artifact>
> -                            <prerequisite>
> -                                <id>
> -                                    <groupId>org.apache.geronimo.configs</groupId>
> -                                    <artifactId>tomcat6</artifactId>
> -                                </id>
> -                                <resource-type>Web Container</resource-type>
> -                                <description>
> -                                    This version of the application works with the Geronimo/Tomcat distribution. 
> -                                    It is not intended to run in the Geronimo/Jetty distribution. 
> -                                    There is a separate version of the application that works with Jetty. 
> -                                    Please install the version appropriate to your Geronimo distribution.
> -                                </description> 
> -                            </prerequisite>
> +                            <!--<prerequisite>-->
> +                                <!--<id>-->
> +                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
> +                                    <!--<artifactId>tomcat6</artifactId>-->
> +                                <!--</id>-->
> +                                <!--<resource-type>Web Container</resource-type>-->
> +                                <!--<description>-->
> +                                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
> +                                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
> +                                    <!--There is a separate version of the application that works with Jetty. -->
> +                                    <!--Please install the version appropriate to your Geronimo distribution.-->
> +                                <!--</description> -->
> +                            <!--</prerequisite>-->
>                          </plugin-artifact>
>                      </instance>
>                  </configuration>
> @@ -142,5 +143,21 @@
>          </plugins>
>      </build>
>      
> +    <profiles>
> +        <profile>
> +            <id>it</id>
> +            <!--<properties>-->
> +                <!--<it-server>tomcat</it-server>-->
> +            <!--</properties>-->
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.geronimo.buildsupport</groupId>
> +                        <artifactId>geronimo-maven-plugin</artifactId>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +        </profile>
> +    </profiles>
>  </project>
>  
> 
> Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml (original)
> +++ geronimo/samples/trunk/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml Tue May 27 09:29:53 2008
> @@ -23,7 +23,7 @@
>          <web>war1.war</web>
>          <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
>              <web-container>
> -                 <gbean-link>TomcatWebContainer1</gbean-link>
> +                <gbean-link>TomcatWebContainer1</gbean-link>
>              </web-container>
>          </web-app>
>      </module>
> @@ -32,7 +32,7 @@
>          <web>war2.war</web>
>          <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
>              <web-container>
> -                 <gbean-link>TomcatWebContainer2</gbean-link>
> +                <gbean-link>TomcatWebContainer2</gbean-link>
>              </web-container>
>          </web-app>
>      </module>
> @@ -40,43 +40,50 @@
>      <module>
>          <web>connectors.war</web>
>          <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
> -    <gbean name="TomcatWebConnector1" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
> -        <attribute name="name">HTTP</attribute>
> -        <attribute name="host">localhost</attribute>
> -        <attribute name="port">8081</attribute>
> -        <attribute name="maxHttpHeaderSize">8192</attribute>
> -        <attribute name="maxThreads">150</attribute>
> -        <attribute name="minSpareThreads">25</attribute>
> -        <attribute name="maxSpareThreads">75</attribute>
> -        <attribute name="enableLookups">false</attribute>
> -        <attribute name="redirectPort">8453</attribute>
> -        <attribute name="acceptCount">100</attribute>
> -        <attribute name="connectionTimeout">20000</attribute>
> -        <attribute name="disableUploadTimeout">true</attribute>
> -        <reference name="TomcatContainer">
> -            <name>TomcatWebContainer1</name>
> -        </reference>
> -    </gbean>
> -
> -    <gbean name="TomcatWebConnector2" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
> -        <attribute name="name">HTTP</attribute>
> -        <attribute name="host">localhost</attribute>
> -        <attribute name="port">8082</attribute>
> -        <attribute name="maxHttpHeaderSize">8192</attribute>
> -        <attribute name="maxThreads">150</attribute>
> -        <attribute name="minSpareThreads">25</attribute>
> -        <attribute name="maxSpareThreads">75</attribute>
> -        <attribute name="enableLookups">false</attribute>
> -        <attribute name="redirectPort">8453</attribute>
> -        <attribute name="acceptCount">100</attribute>
> -        <attribute name="connectionTimeout">20000</attribute>
> -        <attribute name="disableUploadTimeout">true</attribute>
> -        <reference name="TomcatContainer">
> -            <name>TomcatWebContainer2</name>
> -        </reference>
> -    </gbean>
> +            <gbean name="TomcatWebConnector1" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
> +                <attribute name="name">HTTP</attribute>
> +                <attribute name="host">localhost</attribute>
> +                <attribute name="port">8081</attribute>
> +                <attribute name="maxHttpHeaderSize">8192</attribute>
> +                <attribute name="maxThreads">150</attribute>
> +                <attribute name="minSpareThreads">25</attribute>
> +                <attribute name="maxSpareThreads">75</attribute>
> +                <attribute name="enableLookups">false</attribute>
> +                <attribute name="redirectPort">8453</attribute>
> +                <attribute name="acceptCount">100</attribute>
> +                <attribute name="connectionTimeout">20000</attribute>
> +                <attribute name="disableUploadTimeout">true</attribute>
> +                <reference name="TomcatContainer">
> +                    <name>TomcatWebContainer1</name>
> +                </reference>
> +                <reference name="ServerInfo">
> +                    <name>ServerInfo</name>
> +                </reference>
> +            </gbean>
> +
> +
> +            <gbean name="TomcatWebConnector2" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
> +                <attribute name="name">HTTP</attribute>
> +                <attribute name="host">localhost</attribute>
> +                <attribute name="port">8082</attribute>
> +                <attribute name="maxHttpHeaderSize">8192</attribute>
> +                <attribute name="maxThreads">150</attribute>
> +                <attribute name="minSpareThreads">25</attribute>
> +                <attribute name="maxSpareThreads">75</attribute>
> +                <attribute name="enableLookups">false</attribute>
> +                <attribute name="redirectPort">8453</attribute>
> +                <attribute name="acceptCount">100</attribute>
> +                <attribute name="connectionTimeout">20000</attribute>
> +                <attribute name="disableUploadTimeout">true</attribute>
> +                <reference name="TomcatContainer">
> +                    <name>TomcatWebContainer2</name>
> +                </reference>
> +                <reference name="ServerInfo">
> +                    <name>ServerInfo</name>
> +                </reference>
> +            </gbean>
>  
> -       </web-app>
> +        </web-app>
>      </module>
>  
>  
> 
> Modified: geronimo/samples/trunk/samples/bank/bank-ear/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-ear/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/bank/bank-ear/pom.xml (original)
> +++ geronimo/samples/trunk/samples/bank/bank-ear/pom.xml Tue May 27 09:29:53 2008
> @@ -37,13 +37,7 @@
>      <description>Geronimo Samples. EAR Module</description>
>  
>      <dependencies>
> -        <dependency>
> -            <groupId>org.tranql</groupId>
> -            <artifactId>tranql-connector-ra</artifactId>
> -            <version>1.3</version>
> -            <type>rar</type>
> -        </dependency>
> -                
> +
>          <dependency>
>              <groupId>org.apache.geronimo.samples</groupId>
>              <artifactId>bank-war</artifactId>
> 
> Modified: geronimo/samples/trunk/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml (original)
> +++ geronimo/samples/trunk/samples/bank/bank-ejb/src/main/resources/META-INF/persistence.xml Tue May 27 09:29:53 2008
> @@ -17,19 +17,19 @@
>      specific language governing permissions and limitations
>      under the License.
>  -->
> -<persistence 	xmlns="http://java.sun.com/xml/ns/persistence"
> -				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"
> -				xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
> -	<persistence-unit name="BankPU">
> -		<description>Entity Beans for Bank</description>
> -		<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
> -		<class>org.apache.geronimo.samples.bank.ejb.Account</class>
> -		<class>org.apache.geronimo.samples.bank.ejb.Customer</class>
> -		<class>org.apache.geronimo.samples.bank.ejb.ExchangeRate</class>
> -		<properties>
> -			<property name="openjpa.jdbc.SynchronizeMappings" value="false" />
> -		</properties>
> -		<jta-data-source>BankPool</jta-data-source>
> -		<non-jta-data-source>BankPool</non-jta-data-source>
> -	</persistence-unit>
> +<persistence xmlns="http://java.sun.com/xml/ns/persistence"
> +             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"
> +             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
> +    <persistence-unit name="BankPU">
> +        <description>Entity Beans for Bank</description>
> +        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
> +        <jta-data-source>SampleTxDatasource</jta-data-source>
> +        <non-jta-data-source>SampleNoTxDatasource</non-jta-data-source>
> +        <class>org.apache.geronimo.samples.bank.ejb.Account</class>
> +        <class>org.apache.geronimo.samples.bank.ejb.Customer</class>
> +        <class>org.apache.geronimo.samples.bank.ejb.ExchangeRate</class>
> +        <properties>
> +            <property name="openjpa.jdbc.SynchronizeMappings" value="false"/>
> +        </properties>
> +    </persistence-unit>
>  </persistence>
> 
> Modified: geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml (original)
> +++ geronimo/samples/trunk/samples/bank/bank-jetty/pom.xml Tue May 27 09:29:53 2008
> @@ -43,6 +43,13 @@
>              <artifactId>bank-ear</artifactId>
>              <version>${version}</version>
>              <type>ear</type>
> +            <scope>provided</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.geronimo.samples</groupId>
> +            <artifactId>SampleDatasource</artifactId>
> +            <version>${version}</version>
> +            <type>car</type>
>          </dependency>
>  
>          <dependency>
> @@ -63,7 +70,7 @@
>  
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>jasper</artifactId>
> +            <artifactId>openejb-deployer</artifactId>
>              <version>${geronimoVersion}</version>
>              <type>car</type>
>              <scope>provided</scope>
> @@ -71,7 +78,7 @@
>  
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>openejb-deployer</artifactId>
> +            <artifactId>persistence-jpa10-deployer</artifactId>
>              <version>${geronimoVersion}</version>
>              <type>car</type>
>              <scope>provided</scope>
> @@ -79,11 +86,30 @@
>  
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>persistence-jpa10-deployer</artifactId>
> +            <artifactId>jetty6</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>openjpa</artifactId>
> +            <version>${geronimoVersion}</version>
> +            <type>car</type>
> +        </dependency>
> +
>      </dependencies>
>  
>      <build>
> @@ -120,19 +146,19 @@
>                      <category>Sample</category>
>                      <instance>
>                          <plugin-artifact>
> -                            <prerequisite>
> -                                <id>
> -                                    <groupId>org.apache.geronimo.configs</groupId>
> -                                    <artifactId>jetty6</artifactId>
> -                                </id>
> -                                <resource-type>Web Container</resource-type>
> -                                <description>
> -                                    This version of the application works with the Geronimo/Jetty distribution. 
> -                                    It is not intended to run in the Geronimo/Tomcat distribution. 
> -                                    There is a separate version of the application that works with Tomcat. 
> -                                    Please install the version appropriate to your Geronimo distribution.
> -                                </description> 
> -                            </prerequisite>
> +                            <!--<prerequisite>-->
> +                                <!--<id>-->
> +                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
> +                                    <!--<artifactId>jetty6</artifactId>-->
> +                                <!--</id>-->
> +                                <!--<resource-type>Web Container</resource-type>-->
> +                                <!--<description>-->
> +                                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
> +                                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
> +                                    <!--There is a separate version of the application that works with Tomcat. -->
> +                                    <!--Please install the version appropriate to your Geronimo distribution.-->
> +                                <!--</description> -->
> +                            <!--</prerequisite>-->
>                          </plugin-artifact>
>                      </instance>
>                  </configuration>
> @@ -140,5 +166,21 @@
>          </plugins>
>      </build>
>  
> +    <profiles>
> +        <profile>
> +            <id>it</id>
> +            <!--<properties>-->
> +                <!--<it-server>jetty</it-server>-->
> +            <!--</properties>-->
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.geronimo.buildsupport</groupId>
> +                        <artifactId>geronimo-maven-plugin</artifactId>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +        </profile>
> +    </profiles>
>  </project>
>  
> 
> Modified: geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml (original)
> +++ geronimo/samples/trunk/samples/bank/bank-jetty/src/main/plan/plan.xml Tue May 27 09:29:53 2008
> @@ -21,9 +21,4 @@
>  <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
>  <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
>  
> -   <module>
> -      <connector>tranql-connector-ra-1.3.rar</connector>
> -      <alt-dd>BankPool.xml</alt-dd>
> -   </module>
> -
>  </application>
> 
> Modified: geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml (original)
> +++ geronimo/samples/trunk/samples/bank/bank-tomcat/pom.xml Tue May 27 09:29:53 2008
> @@ -43,8 +43,15 @@
>              <artifactId>bank-ear</artifactId>
>              <version>${version}</version>
>              <type>ear</type>
> +            <scope>provided</scope>
>          </dependency>
> -        
> +        <dependency>
> +            <groupId>org.apache.geronimo.samples</groupId>
> +            <artifactId>SampleDatasource</artifactId>
> +            <version>${version}</version>
> +            <type>car</type>
> +        </dependency>
> +
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
>              <artifactId>tomcat6-deployer</artifactId>
> @@ -63,7 +70,7 @@
>  
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>jasper</artifactId>
> +            <artifactId>openejb-deployer</artifactId>
>              <version>${geronimoVersion}</version>
>              <type>car</type>
>              <scope>provided</scope>
> @@ -71,7 +78,7 @@
>  
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>openejb-deployer</artifactId>
> +            <artifactId>persistence-jpa10-deployer</artifactId>
>              <version>${geronimoVersion}</version>
>              <type>car</type>
>              <scope>provided</scope>
> @@ -79,11 +86,30 @@
>  
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>persistence-jpa10-deployer</artifactId>
> +            <artifactId>tomcat6</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>openjpa</artifactId>
> +            <version>${geronimoVersion}</version>
> +            <type>car</type>
> +        </dependency>
> +
>      </dependencies>
>  
>      <build>
> @@ -120,19 +146,19 @@
>                      <category>Sample</category>
>                      <instance>
>                          <plugin-artifact>
> -                            <prerequisite>
> -                                <id>
> -                                    <groupId>org.apache.geronimo.configs</groupId>
> -                                    <artifactId>tomcat6</artifactId>
> -                                </id>
> -                                <resource-type>Web Container</resource-type>
> -                                <description>
> -                                    This version of the application works with the Geronimo/Tomcat distribution. 
> -                                    It is not intended to run in the Geronimo/Jetty distribution. 
> -                                    There is a separate version of the application that works with Jetty. 
> -                                    Please install the version appropriate to your Geronimo distribution.
> -                                </description> 
> -                            </prerequisite>
> +                            <!--<prerequisite>-->
> +                                <!--<id>-->
> +                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
> +                                    <!--<artifactId>tomcat6</artifactId>-->
> +                                <!--</id>-->
> +                                <!--<resource-type>Web Container</resource-type>-->
> +                                <!--<description>-->
> +                                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
> +                                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
> +                                    <!--There is a separate version of the application that works with Jetty. -->
> +                                    <!--Please install the version appropriate to your Geronimo distribution.-->
> +                                <!--</description> -->
> +                            <!--</prerequisite>-->
>                          </plugin-artifact>
>                      </instance>
>                  </configuration>
> @@ -140,5 +166,21 @@
>          </plugins>
>      </build>
>      
> +    <profiles>
> +        <profile>
> +            <id>it</id>
> +            <!--<properties>-->
> +                <!--<it-server>tomcat</it-server>-->
> +            <!--</properties>-->
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.geronimo.buildsupport</groupId>
> +                        <artifactId>geronimo-maven-plugin</artifactId>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +        </profile>
> +    </profiles>
>  </project>
>  
> 
> Modified: geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml (original)
> +++ geronimo/samples/trunk/samples/bank/bank-tomcat/src/main/plan/plan.xml Tue May 27 09:29:53 2008
> @@ -21,9 +21,4 @@
>  <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
>  <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
>  
> -   <module>
> -      <connector>tranql-connector-ra-1.3.rar</connector>
> -      <alt-dd>BankPool.xml</alt-dd>
> -   </module>
> -
>  </application>
> 
> Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml (original)
> +++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml Tue May 27 09:29:53 2008
> @@ -43,6 +43,7 @@
>              <artifactId>calculator-stateless-ear</artifactId>
>              <version>${version}</version>
>              <type>ear</type>
> +            <scope>provided</scope>
>          </dependency>
>  
>          <dependency>
> @@ -63,14 +64,6 @@
>  
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>jasper</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>
> @@ -84,6 +77,31 @@
>              <type>car</type>
>              <scope>provided</scope>
>          </dependency>
> +        <dependency>
> +             <groupId>org.apache.geronimo.configs</groupId>
> +             <artifactId>jetty6</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>
> +         <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>openjpa</artifactId>
> +             <version>${geronimoVersion}</version>
> +             <type>car</type>
> +         </dependency>
>      </dependencies>
>  
>      <build>
> @@ -120,19 +138,19 @@
>                      <category>Sample</category>
>                      <instance>
>                          <plugin-artifact>
> -                            <prerequisite>
> -                                <id>
> -                                    <groupId>org.apache.geronimo.configs</groupId>
> -                                    <artifactId>jetty6</artifactId>
> -                                </id>
> -                                <resource-type>Web Container</resource-type>
> -                                <description>
> -                                    This version of the application works with the Geronimo/Jetty distribution. 
> -                                    It is not intended to run in the Geronimo/Tomcat distribution. 
> -                                    There is a separate version of the application that works with Tomcat. 
> -                                    Please install the version appropriate to your Geronimo distribution.
> -                                </description> 
> -                            </prerequisite>
> +                            <!--<prerequisite>-->
> +                                <!--<id>-->
> +                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
> +                                    <!--<artifactId>jetty6</artifactId>-->
> +                                <!--</id>-->
> +                                <!--<resource-type>Web Container</resource-type>-->
> +                                <!--<description>-->
> +                                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
> +                                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
> +                                    <!--There is a separate version of the application that works with Tomcat. -->
> +                                    <!--Please install the version appropriate to your Geronimo distribution.-->
> +                                <!--</description> -->
> +                            <!--</prerequisite>-->
>                          </plugin-artifact>
>                      </instance>
>                  </configuration>
> @@ -140,5 +158,21 @@
>          </plugins>
>      </build>
>  
> +    <profiles>
> +        <profile>
> +            <id>it</id>
> +            <!--<properties>-->
> +                <!--<it-server>jetty</it-server>-->
> +            <!--</properties>-->
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.geronimo.buildsupport</groupId>
> +                        <artifactId>geronimo-maven-plugin</artifactId>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +        </profile>
> +    </profiles>
>  </project>
>  
> 
> Modified: geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml (original)
> +++ geronimo/samples/trunk/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml Tue May 27 09:29:53 2008
> @@ -43,6 +43,7 @@
>              <artifactId>calculator-stateless-ear</artifactId>
>              <version>${version}</version>
>              <type>ear</type>
> +            <scope>provided</scope>
>          </dependency>
>          
>          <dependency>
> @@ -63,14 +64,6 @@
>  
>          <dependency>
>              <groupId>org.apache.geronimo.configs</groupId>
> -            <artifactId>jasper</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>
> @@ -84,6 +77,31 @@
>              <type>car</type>
>              <scope>provided</scope>
>          </dependency>
> +        <dependency>
> +             <groupId>org.apache.geronimo.configs</groupId>
> +             <artifactId>tomcat6</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>
> +         <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>openjpa</artifactId>
> +             <version>${geronimoVersion}</version>
> +             <type>car</type>
> +         </dependency>
>      </dependencies>
>  
>      <build>
> @@ -120,19 +138,19 @@
>                      <category>Sample</category>
>                      <instance>
>                          <plugin-artifact>
> -                            <prerequisite>
> -                                <id>
> -                                    <groupId>org.apache.geronimo.configs</groupId>
> -                                    <artifactId>tomcat6</artifactId>
> -                                </id>
> -                                <resource-type>Web Container</resource-type>
> -                                <description>
> -                                    This version of the application works with the Geronimo/Tomcat distribution. 
> -                                    It is not intended to run in the Geronimo/Jetty distribution. 
> -                                    There is a separate version of the application that works with Jetty. 
> -                                    Please install the version appropriate to your Geronimo distribution.
> -                                </description> 
> -                            </prerequisite>
> +                            <!--<prerequisite>-->
> +                                <!--<id>-->
> +                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
> +                                    <!--<artifactId>tomcat6</artifactId>-->
> +                                <!--</id>-->
> +                                <!--<resource-type>Web Container</resource-type>-->
> +                                <!--<description>-->
> +                                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
> +                                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
> +                                    <!--There is a separate version of the application that works with Jetty. -->
> +                                    <!--Please install the version appropriate to your Geronimo distribution.-->
> +                                <!--</description> -->
> +                            <!--</prerequisite>-->
>                          </plugin-artifact>
>                      </instance>
>                  </configuration>
> @@ -140,5 +158,21 @@
>          </plugins>
>      </build>
>      
> +    <profiles>
> +        <profile>
> +            <id>it</id>
> +            <!--<properties>-->
> +                <!--<it-server>tomcat</it-server>-->
> +            <!--</properties>-->
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.geronimo.buildsupport</groupId>
> +                        <artifactId>geronimo-maven-plugin</artifactId>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +        </profile>
> +    </profiles>
>  </project>
>  
> 
> Modified: geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml (original)
> +++ geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml Tue May 27 09:29:53 2008
> @@ -43,6 +43,7 @@
>              <artifactId>dbtester-war</artifactId>
>              <version>${version}</version>
>              <type>war</type>
> +            <scope>provided</scope>
>          </dependency>
>  
>          <dependency>
> @@ -66,7 +67,12 @@
>              <artifactId>jasper</artifactId>
>              <version>${geronimoVersion}</version>
>              <type>car</type>
> -            <scope>provided</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.geronimo.configs</groupId>
> +            <artifactId>jetty6</artifactId>
> +            <version>${geronimoVersion}</version>
> +            <type>car</type>
>          </dependency>
>      </dependencies>
>  
> @@ -122,5 +128,21 @@
>          </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>
>  
> 
> Modified: geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml (original)
> +++ geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml Tue May 27 09:29:53 2008
> @@ -43,6 +43,7 @@
>              <artifactId>dbtester-war</artifactId>
>              <version>${version}</version>
>              <type>war</type>
> +            <scope>provided</scope>
>          </dependency>
>          
>          <dependency>
> @@ -66,7 +67,12 @@
>              <artifactId>jasper</artifactId>
>              <version>${geronimoVersion}</version>
>              <type>car</type>
> -            <scope>provided</scope>
> +        </dependency>
> +        <dependency>
> +            <groupId>org.apache.geronimo.configs</groupId>
> +            <artifactId>tomcat6</artifactId>
> +            <version>${geronimoVersion}</version>
> +            <type>car</type>
>          </dependency>
>      </dependencies>
>  
> @@ -122,5 +128,21 @@
>          </plugins>
>      </build>
>      
> +    <profiles>
> +        <profile>
> +            <id>it</id>
> +            <!--<properties>-->
> +                <!--<it-server>tomcat-minimal</it-server>-->
> +            <!--</properties>-->
> +            <build>
> +                <plugins>
> +                    <plugin>
> +                        <groupId>org.apache.geronimo.buildsupport</groupId>
> +                        <artifactId>geronimo-maven-plugin</artifactId>
> +                    </plugin>
> +                </plugins>
> +            </build>
> +        </profile>
> +    </profiles>
>  </project>
>  
> 
> Modified: geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml?rev=660588&r1=660587&r2=660588&view=diff
> ==============================================================================
> --- geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml (original)
> +++ geronimo/samples/trunk/samples/inventory/inventory-ear/pom.xml Tue May 27 09:29:53 2008
> @@ -38,12 +38,6 @@
>  
>      <dependencies>
>          <dependency>
> -            <groupId>org.tranql</groupId>
> -            <artifactId>tranql-connector-ra</artifactId>
> -            <version>1.3</version>
> -            <type>rar</type>
> -        </dependency>
> -        <dependency>
>              <groupId>org.apache.geronimo.samples</groupId>
>              <artifactId>inventory-war</artifactId>
>              <version>${version}</version>
> 
> 
> 


Mime
View raw message