You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/05/10 00:34:39 UTC

svn commit: r654965 [1/2] - in /geronimo/samples/branches/2.1: ./ geronimo-samples-archetype/ geronimo-samples-archetype/src/main/resources/archetype-resources/ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/ geronimo-samp...

Author: jbohn
Date: Fri May  9 15:34:35 2008
New Revision: 654965

URL: http://svn.apache.org/viewvc?rev=654965&view=rev
Log:
merge r653967 from trunk - update samples to genesis 1.4 and setup for genesis/legal processing

Added:
    geronimo/samples/branches/2.1/LICENSE
    geronimo/samples/branches/2.1/NOTICE
Removed:
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/LICENSE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/NOTICE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/async-http/http-local-app/LICENSE.txt
    geronimo/samples/branches/2.1/samples/async-http/http-local-app/NOTICE.txt
    geronimo/samples/branches/2.1/samples/async-http/http-remote-app/LICENSE.txt
    geronimo/samples/branches/2.1/samples/async-http/http-remote-app/NOTICE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-client/LICENSE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-client/NOTICE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-ejb/LICENSE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-ejb/NOTICE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/bank/bank-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ejb/LICENSE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ejb/NOTICE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/inventory/inventory-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/inventory/inventory-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/inventory/inventory-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/inventory/inventory-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/LICENSE.txt
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/NOTICE.txt
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/LICENSE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/NOTICE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-ejb/LICENSE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-ejb/NOTICE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/mytime/mytime-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/NOTICE.txt
    geronimo/samples/branches/2.1/samples/timereport/timereport-ear/LICENSE.txt
    geronimo/samples/branches/2.1/samples/timereport/timereport-ear/NOTICE.txt
    geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/LICENSE.txt
    geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/NOTICE.txt
    geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/LICENSE.txt
    geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/NOTICE.txt
    geronimo/samples/branches/2.1/samples/timereport/timereport-war/LICENSE.txt
    geronimo/samples/branches/2.1/samples/timereport/timereport-war/NOTICE.txt
Modified:
    geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
    geronimo/samples/branches/2.1/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-war/pom.xml
    geronimo/samples/branches/2.1/samples/CustomerService/pom.xml
    geronimo/samples/branches/2.1/samples/async-http/http-local-app/pom.xml
    geronimo/samples/branches/2.1/samples/async-http/http-remote-app/pom.xml
    geronimo/samples/branches/2.1/samples/async-http/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml
    geronimo/samples/branches/2.1/samples/bank/pom.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml
    geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml
    geronimo/samples/branches/2.1/samples/dbtester/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml
    geronimo/samples/branches/2.1/samples/inventory/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml
    geronimo/samples/branches/2.1/samples/jsp-examples/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml
    geronimo/samples/branches/2.1/samples/myphonebook/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-ejb/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml
    geronimo/samples/branches/2.1/samples/mytime/pom.xml
    geronimo/samples/branches/2.1/samples/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-ear/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/pom.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/pom.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-ear/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml

Added: geronimo/samples/branches/2.1/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/LICENSE?rev=654965&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/LICENSE (added)
+++ geronimo/samples/branches/2.1/LICENSE Fri May  9 15:34:35 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.
+

Added: geronimo/samples/branches/2.1/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/NOTICE?rev=654965&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/NOTICE (added)
+++ geronimo/samples/branches/2.1/NOTICE Fri May  9 15:34:35 2008
@@ -0,0 +1,6 @@
+Apache Geronimo 
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/pom.xml Fri May  9 15:34:35 2008
@@ -29,7 +29,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples-parent</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-samples-archetype</artifactId>

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>${artifactId}</artifactId>

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>${artifactId}-ear</artifactId>

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>${artifactId}-ejb</artifactId>

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>${artifactId}</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>${artifactId}-war</artifactId>

Modified: geronimo/samples/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/pom.xml (original)
+++ geronimo/samples/branches/2.1/pom.xml Fri May  9 15:34:35 2008
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.3</version>
+        <version>1.4</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ear/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>CustomerService</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>CustomerService-ear</artifactId>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-ejb/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>CustomerService</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>CustomerService-ejb</artifactId>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>CustomerService</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>CustomerService</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/CustomerService-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>CustomerService</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>CustomerService-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/CustomerService/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/CustomerService/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/CustomerService/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/CustomerService/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>CustomerService</artifactId>

Modified: geronimo/samples/branches/2.1/samples/async-http/http-local-app/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/async-http/http-local-app/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/async-http/http-local-app/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/async-http/http-local-app/pom.xml Fri May  9 15:34:35 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>async-http</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>http-local-app</artifactId>
     <name>Geronimo Samples :: Asynchronous HTTP :: Local App</name>

Modified: geronimo/samples/branches/2.1/samples/async-http/http-remote-app/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/async-http/http-remote-app/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/async-http/http-remote-app/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/async-http/http-remote-app/pom.xml Fri May  9 15:34:35 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>async-http</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>http-remote-app</artifactId>
     <name>Geronimo Samples :: Asynchronous HTTP :: Remote App</name>

Modified: geronimo/samples/branches/2.1/samples/async-http/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/async-http/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/async-http/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/async-http/pom.xml Fri May  9 15:34:35 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>async-http</artifactId>
     <name>Geronimo Samples :: Asynchronous HTTP:: Parent</name>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>bank</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>bank-client</artifactId>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-ear/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>bank</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>bank-ear</artifactId>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>bank</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>bank-ejb</artifactId>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>bank</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>bank</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>bank</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>bank-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/bank/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>bank</artifactId>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ear/pom.xml Fri May  9 15:34:35 2008
@@ -27,7 +27,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>calculator-stateless-pojo</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>calculator-stateless-ear</artifactId>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-ejb/pom.xml Fri May  9 15:34:35 2008
@@ -23,7 +23,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>calculator-stateless-pojo</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>calculator-stateless-ejb</artifactId>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>calculator-stateless-pojo</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>calculator-stateless-pojo</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/calculator-stateless-war/pom.xml Fri May  9 15:34:35 2008
@@ -24,7 +24,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>calculator-stateless-pojo</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>calculator-stateless-war</artifactId>
     <name>Geronimo Samples :: Stateless Session :: Calculator WAR</name>

Modified: geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/calculator-stateless-pojo/pom.xml Fri May  9 15:34:35 2008
@@ -25,7 +25,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>calculator-stateless-pojo</artifactId>
     <name>Geronimo Samples :: Stateless Session :: Calculator</name>

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>dbtester</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>dbtester</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>dbtester</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>dbtester-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/dbtester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>dbtester</artifactId>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-ear/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>inventory</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>inventory-ear</artifactId>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>inventory</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>inventory</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>inventory</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>inventory-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/inventory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>inventory</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jaxws-calculator</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jaxws-calculator-ear</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jaxws-calculator</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jaxws-calculator</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jaxws-calculator</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jaxws-calculator-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>jaxws-calculator</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jms-mdb-sample</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jms-mdb-sample-ear</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jms-mdb-sample</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jms-mdb-sample-ejb</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jms-mdb-sample</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jms-mdb-sample</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jms-mdb-sample</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jms-mdb-sample-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>jms-mdb-sample</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jsp-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jsp-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/pom.xml Fri May  9 15:34:35 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>jsp-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jsp-examples-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>jsp-examples</artifactId>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>ldap-sample-app</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml Fri May  9 15:34:35 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>ldap-sample-app</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>ldap-sample-app-realm</artifactId>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -26,7 +26,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>ldap-sample-app</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>ldap-sample-app</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>ldap-sample-app-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>ldap-sample-app</artifactId>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>myphonebook</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>myphonebook-ear</artifactId>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ejb/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>myphonebook</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>myphonebook-ejb</artifactId>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>myphonebook</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>myphonebook</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>myphonebook</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>myphonebook-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>myphonebook</artifactId>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-ear/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>mytime</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>mytime-ear</artifactId>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-ejb/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-ejb/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>mytime</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>mytime-ejb</artifactId>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-jetty/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>mytime</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-tomcat/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>mytime</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/mytime-war/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>mytime</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>mytime-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/mytime/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/mytime/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/mytime/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>mytime</artifactId>

Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Fri May  9 15:34:35 2008
@@ -23,7 +23,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples-parent</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>samples</artifactId>
     <name>Geronimo Samples :: Samples</name>
@@ -149,7 +148,7 @@
         </pluginManagement>
 
         <plugins>
-            <plugin>
+            <plugin> 
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
 
@@ -158,18 +157,6 @@
 
                 <executions>
                     <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were copied -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
                         <id>verify-legal-files</id>
                         <phase>verify</phase>
                         <goals>

Modified: geronimo/samples/branches/2.1/samples/sendmail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/sendmail/pom.xml?rev=654965&r1=654964&r2=654965&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/sendmail/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/sendmail/pom.xml Fri May  9 15:34:35 2008
@@ -28,7 +28,6 @@
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     
     <artifactId>sendmail</artifactId>