geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r640490 [1/2] - in /geronimo/samples/trunk/samples: jaxws-calculator/ jaxws-calculator/jaxws-calculator-ear/ jaxws-calculator/jaxws-calculator-ejb/ jaxws-calculator/jaxws-calculator-jetty/ jaxws-calculator/jaxws-calculator-jetty/src/ jaxws-...
Date Mon, 24 Mar 2008 18:12:09 GMT
Author: gawor
Date: Mon Mar 24 11:12:04 2008
New Revision: 640490

URL: http://svn.apache.org/viewvc?rev=640490&view=rev
Log:
add plugins for rest of the samples

Added:
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt   (with props)
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt   (with props)
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml   (with props)
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt   (with props)
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt   (with props)
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml   (with props)
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/LICENSE.txt   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/NOTICE.txt   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml   (with props)
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/LICENSE.txt   (with props)
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/NOTICE.txt   (with props)
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/pom.xml   (with props)
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/plan/
    geronimo/samples/trunk/samples/sendmail/sendmail-jetty/src/main/plan/plan.xml   (with props)
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/LICENSE.txt   (with props)
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/NOTICE.txt   (with props)
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/pom.xml   (with props)
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/
    geronimo/samples/trunk/samples/sendmail/sendmail-tomcat/src/main/plan/plan.xml   (with props)
Removed:
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ejb/
Modified:
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/pom.xml
    geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/trunk/samples/jms-mdb-sample/pom.xml
    geronimo/samples/trunk/samples/sendmail/pom.xml

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml?rev=640490&r1=640489&r2=640490&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml Mon Mar 24 11:12:04 2008
@@ -44,13 +44,6 @@
             <version>${version}</version>
             <type>war</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jaxws-calculator-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
     </dependencies>
 
     <build>
@@ -62,12 +55,6 @@
                     <description>Geronimo Sample EAR for jaxws-calculator</description>
                     <version>5</version>
                     <modules>
-                      <ejbModule>
-                            <groupId>org.apache.geronimo.samples</groupId>
-                            <artifactId>jaxws-calculator-ejb</artifactId>
-                            <bundleFileName>jaxws-calculator-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-
                         <webModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>jaxws-calculator-war</artifactId>

Added: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt (added)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt Mon Mar 24 11:12:04 2008
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Propchange: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt (added)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt Mon Mar 24 11:12:04 2008
@@ -0,0 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (added)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Mon Mar 24 11:12:04 2008
@@ -0,0 +1,136 @@
+<?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: 639460 $ $Date: 2008-03-20 17:12:27 -0400 (Thu, 20 Mar 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>jaxws-calculator</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>jaxws-calculator-jetty</artifactId>
+    <name>Geronimo Samples :: jaxws-calculator Plugin for Jetty</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. jaxws-calculator Plugin for Jetty</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>jaxws-calculator-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${cxfDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>jaxws-calculator-ear</artifactId>
+                        <version>${version}</version>
+                        <type>ear</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <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>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Propchange: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml Mon Mar 24 11:12:04 2008
@@ -0,0 +1,34 @@
+<?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: 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">
+
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+         <dep:groupId>${pom.groupId}</dep:groupId>
+         <dep:artifactId>${pom.artifactId}</dep:artifactId>
+         <dep:version>${version}</dep:version>
+         <dep:type>car</dep:type>
+      </dep:moduleId>
+
+   </dep:environment>
+   
+</application>

Propchange: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt (added)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt Mon Mar 24 11:12:04 2008
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Propchange: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt (added)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt Mon Mar 24 11:12:04 2008
@@ -0,0 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (added)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Mon Mar 24 11:12:04 2008
@@ -0,0 +1,136 @@
+<?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: 639460 $ $Date: 2008-03-20 17:12:27 -0400 (Thu, 20 Mar 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>jaxws-calculator</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>jaxws-calculator-tomcat</artifactId>
+    <name>Geronimo Samples :: jaxws-calculator Plugin for Tomcat</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. jaxws-calculator Plugin for Tomcat</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>jaxws-calculator-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${axis2Deployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>jaxws-calculator-ear</artifactId>
+                        <version>${version}</version>
+                        <type>ear</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <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>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
+

Propchange: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml Mon Mar 24 11:12:04 2008
@@ -0,0 +1,34 @@
+<?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: 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">
+
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+         <dep:groupId>${pom.groupId}</dep:groupId>
+         <dep:artifactId>${pom.artifactId}</dep:artifactId>
+         <dep:version>${version}</dep:version>
+         <dep:type>car</dep:type>
+      </dep:moduleId>
+
+   </dep:environment>
+   
+</application>

Propchange: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/samples/trunk/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/pom.xml?rev=640490&r1=640489&r2=640490&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/pom.xml Mon Mar 24 11:12:04 2008
@@ -40,9 +40,10 @@
     </description>
     
    <modules>
-        <module>jaxws-calculator-ejb</module>
         <module>jaxws-calculator-war</module>
         <module>jaxws-calculator-ear</module>
+        <module>jaxws-calculator-jetty</module>
+        <module>jaxws-calculator-tomcat</module>
     </modules>
 
    <build>

Modified: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml?rev=640490&r1=640489&r2=640490&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml Mon Mar 24 11:12:04 2008
@@ -31,60 +31,6 @@
     </environment>
     <module>
        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-            <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <dep:moduleId>
-                    <dep:groupId>${pom.groupId}</dep:groupId>
-                    <dep:artifactId>jms-resources</dep:artifactId>
-                    <dep:version>${version}</dep:version>
-                    <dep:type>rar</dep:type>
-                </dep:moduleId>
-                <dep:dependencies>
-                    <dep:dependency>
-                        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>activemq-broker</dep:artifactId>
-                        <dep:type>car</dep:type>
-                    </dep:dependency>
-                </dep:dependencies>
-            </dep:environment>
-            <resourceadapter>
-                <resourceadapter-instance>
-                    <resourceadapter-name>jms-resources</resourceadapter-name>
-                    <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
-                        <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
-                    </nam:workmanager>
-                </resourceadapter-instance>
-                <outbound-resourceadapter>
-                    <connection-definition>
-                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                        <connectiondefinition-instance>
-                            <name>OrderConnectionFactory</name>
-                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-                            <connectionmanager>
-                                <xa-transaction>
-                                    <transaction-caching/>
-                                </xa-transaction>
-                                <single-pool>
-                                    <match-one/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                    </connection-definition>
-                </outbound-resourceadapter>
-            </resourceadapter>
-            <adminobject>
-                <adminobject-interface>javax.jms.Queue</adminobject-interface>
-                <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>OrderQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-            <adminobject>
-                <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
-            </adminobject>
-        </connector>
+       <alt-dd>jms-resources.xml</alt-dd>
     </module>
 </application>

Added: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml (added)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml Mon Mar 24 11:12:04 2008
@@ -0,0 +1,74 @@
+<?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.
+-->
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+            <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <dep:moduleId>
+                    <dep:groupId>${pom.groupId}</dep:groupId>
+                    <dep:artifactId>jms-resources</dep:artifactId>
+                    <dep:version>${version}</dep:version>
+                    <dep:type>rar</dep:type>
+                </dep:moduleId>
+                <dep:dependencies>
+                    <dep:dependency>
+                        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+                        <dep:artifactId>activemq-broker</dep:artifactId>
+                        <dep:type>car</dep:type>
+                    </dep:dependency>
+                </dep:dependencies>
+            </dep:environment>
+            <resourceadapter>
+                <resourceadapter-instance>
+                    <resourceadapter-name>jms-resources</resourceadapter-name>
+                    <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
+                        <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
+                    </nam:workmanager>
+                </resourceadapter-instance>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>OrderConnectionFactory</name>
+                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <single-pool>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+            <adminobject>
+                <adminobject-interface>javax.jms.Queue</adminobject-interface>
+                <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+                <adminobject-instance>
+                    <message-destination-name>OrderQueue</message-destination-name>
+                    <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
+                </adminobject-instance>
+            </adminobject>
+            <adminobject>
+                <adminobject-interface>javax.jms.Topic</adminobject-interface>
+                <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
+            </adminobject>
+ </connector>

Propchange: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt (added)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt Mon Mar 24 11:12:04 2008
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Propchange: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt (added)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt Mon Mar 24 11:12:04 2008
@@ -0,0 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml (added)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml Mon Mar 24 11:12:04 2008
@@ -0,0 +1,145 @@
+<?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: 639460 $ $Date: 2008-03-20 17:12:27 -0400 (Thu, 20 Mar 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>jms-mdb-sample</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>jms-mdb-sample-jetty</artifactId>
+    <name>Geronimo Samples :: jms-mdb-sample Plugin for Jetty</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo Samples. jms-mdb-sample Plugin for Jetty</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>jms-mdb-sample-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>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>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>persistence-jpa10-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
+                        <deploymentConfig>${jpaDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.samples</groupId>
+                        <artifactId>jms-mdb-sample-ear</artifactId>
+                        <version>${version}</version>
+                        <type>ear</type>
+                    </module>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <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>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Propchange: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml?rev=640490&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml (added)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml Mon Mar 24 11:12:04 2008
@@ -0,0 +1,39 @@
+<?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: 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">
+
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+         <dep:groupId>${pom.groupId}</dep:groupId>
+         <dep:artifactId>${pom.artifactId}</dep:artifactId>
+         <dep:version>${version}</dep:version>
+         <dep:type>car</dep:type>
+      </dep:moduleId>
+
+   </dep:environment>
+
+    <module>
+       <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
+       <alt-dd>jms-resources.xml</alt-dd>
+    </module>
+   
+</application>

Propchange: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message