svn commit: r668799 [1/2] - in /geronimo/server/branches/2.1: testsuite/ testsuite/commands-testsuite/ testsuite/commands-testsuite/deploy/ testsuite/commands-testsuite/deploy/src/ testsuite/commands-testsuite/deploy/src/test/ testsuite/commands-testsu...

[dw...@apache.org]

Author: dwoods
Date: Tue Jun 17 12:11:32 2008
New Revision: 668799

URL: http://svn.apache.org/viewvc?rev=668799&view=rev
Log:
GERONIMO-4074 Testsuite for commands.  Patch from YunFeng.  Merged over from r666781 in trunk and updated for 2.1.2.

Added:
    geronimo/server/branches/2.1/testsuite/commands-testsuite/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/LICENSE.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/NOTICE.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/LICENSE.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/NOTICE.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/goals.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/resources/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/resources/testng.xml   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/LICENSE.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/NOTICE.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/goals.txt   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/resources/
    geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml   (with props)
    geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml   (with props)
    geronimo/server/branches/2.1/testsupport/testsupport-commands/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/LICENSE.txt   (with props)
    geronimo/server/branches/2.1/testsupport/testsupport-commands/NOTICE.txt   (with props)
    geronimo/server/branches/2.1/testsupport/testsupport-commands/pom.xml   (with props)
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/main/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/main/java/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/main/java/org/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/main/java/org/apache/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/testsupport/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/testsupport/commands/
    geronimo/server/branches/2.1/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/testsupport/commands/CommandTestSupport.java   (with props)
Modified:
    geronimo/server/branches/2.1/testsuite/pom.xml
    geronimo/server/branches/2.1/testsupport/pom.xml

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/LICENSE.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/LICENSE.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/LICENSE.txt Tue Jun 17 12:11:32 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/server/branches/2.1/testsuite/commands-testsuite/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/NOTICE.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/NOTICE.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/NOTICE.txt Tue Jun 17 12:11:32 2008
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/LICENSE.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/LICENSE.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/LICENSE.txt Tue Jun 17 12:11:32 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/server/branches/2.1/testsuite/commands-testsuite/deploy/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/NOTICE.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/NOTICE.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/NOTICE.txt Tue Jun 17 12:11:32 2008
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/goals.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/goals.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/goals.txt Tue Jun 17 12:11:32 2008
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml Tue Jun 17 12:11:32 2008
@@ -0,0 +1,66 @@
+<?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: 648363 $ $Date: 2008-04-15 14:27:48 -0400 (Tue, 15 Apr 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.testsuite</groupId>
+        <artifactId>commands-testsuite</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>deployer-testsuite</artifactId>
+    <name>Geronimo TestSuite :: Commands Testsuite :: Deployer</name>
+
+    <description>
+        Test for the deploy.bat/sh
+    </description>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java Tue Jun 17 12:11:32 2008
@@ -0,0 +1,45 @@
+/**
+ *  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.
+ */
+
+package org.apache.geronimo.testsuite.deploy;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.geronimo.testsupport.commands.CommandTestSupport;
+import org.testng.annotations.Test;
+
+@Test
+public class DeployerOfflineTest extends DeployerTest {
+
+    @Override
+    protected String execute(String[] args) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        List<String> cmd = new ArrayList<String>();
+        cmd.addAll(Arrays.asList("--offline"));
+        if (args != null) {
+            cmd.addAll(Arrays.asList(args));
+        }
+        execute(CommandTestSupport.DEPLOY, cmd, null, baos);
+        return baos.toString();
+    }
+        
+}

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java Tue Jun 17 12:11:32 2008
@@ -0,0 +1,89 @@
+/**
+ *  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.
+ */
+
+package org.apache.geronimo.testsuite.deploy;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.geronimo.testsupport.commands.CommandTestSupport;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+@Test
+public class DeployerTest extends CommandTestSupport {
+
+    protected String execute(String[] args) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        List<String> cmd = new ArrayList<String>();
+        cmd.addAll(Arrays.asList("--user", "system", "--password", "manager"));
+        if (args != null) {
+            cmd.addAll(Arrays.asList(args));
+        }
+        execute(CommandTestSupport.DEPLOY, cmd, null, baos);
+        return baos.toString();
+    }
+        
+    @Test
+    public void testListAllModules() throws Exception {
+        String[] args = new String[]{ "list-modules" };
+ 
+        String output = execute(args);
+     
+        if (output.indexOf("org.apache.geronimo.configs/j2ee-deployer") < 0) {
+            Assert.fail("list-modules failed : " + output);
+        }
+    }
+    
+    @Test
+    public void testListStartedModules() throws Exception {
+        String[] args = new String[]{ "list-modules", "--started" };
+ 
+        String output = execute(args);
+
+        if (output.indexOf("org.apache.geronimo.configs/j2ee-deployer") < 0) {
+            Assert.fail("list-modules failed : " + output);
+        }
+    }
+    
+    @Test
+    public void testListStoppedModules() throws Exception {
+        String[] args = new String[]{ "list-modules", "--stopped" };
+ 
+        String output = execute(args);
+
+        if (output.indexOf("org.apache.geronimo.configs/j2ee-deployer") > 0) {
+            Assert.fail("list-modules failed : " + output);
+        }
+    }
+    
+    @Test
+    public void testListTargets() throws Exception {
+        String[] args = new String[]{ "list-targets" };
+ 
+        String output = execute(args);
+
+        if (output.indexOf("j2eeType=ConfigurationStore,name=Local") < 0) {
+            Assert.fail("deploy/list-targets failed : " + output);
+        }
+    }
+        
+}

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/resources/testng.xml?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/resources/testng.xml (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/resources/testng.xml Tue Jun 17 12:11:32 2008
@@ -0,0 +1,32 @@
+<?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: 514087 $ $Date: 2007-03-03 14:13:40 +0800 (Sat, 03 Mar 2007) $ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="commands-testsuite.deploy">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.deploy"/>
+        </packages>
+    </test>
+</suite>
+

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/LICENSE.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/LICENSE.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/LICENSE.txt Tue Jun 17 12:11:32 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/server/branches/2.1/testsuite/commands-testsuite/gshell/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/NOTICE.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/NOTICE.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/NOTICE.txt Tue Jun 17 12:11:32 2008
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/goals.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/goals.txt (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/goals.txt Tue Jun 17 12:11:32 2008
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml Tue Jun 17 12:11:32 2008
@@ -0,0 +1,65 @@
+<?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: 648363 $ $Date: 2008-04-15 14:27:48 -0400 (Tue, 15 Apr 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.testsuite</groupId>
+        <artifactId>commands-testsuite</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>gshell-testsuite</artifactId>
+    <name>Geronimo TestSuite :: Commands Testsuite :: GShell</name>
+
+    <description>
+        Test for the gsh.bat/sh
+    </description>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                        </configuration>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java Tue Jun 17 12:11:32 2008
@@ -0,0 +1,100 @@
+/**
+ *  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.
+ */
+
+package org.apache.geronimo.testsuite.gshell.deploy;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.geronimo.testsupport.commands.CommandTestSupport;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+@Test
+public class DeployTest extends CommandTestSupport {
+        
+    private static final String UP = "-u system -w manager";
+    
+    protected String execute(String[] args) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        List<String> cmd = new ArrayList<String>();    
+        cmd.addAll(Arrays.asList("-c"));
+        if (args != null) {
+            cmd.addAll(Arrays.asList(args));
+        }
+        execute(CommandTestSupport.GSH, cmd, null, baos);
+        return baos.toString();
+    }
+    
+    @Test
+    public void testListAllModules() throws Exception {
+        String[] args = new String[]{ "deploy/list-modules " + UP };
+ 
+        String output = execute(args);
+
+        if (output.indexOf("org.apache.geronimo.configs/activemq-broker") < 0) {
+            Assert.fail("deploy/list-modules failed : " + output);
+        }
+    }
+    
+    @Test
+    public void testListStartedModules() throws Exception {
+        String[] args = new String[]{ "deploy/list-modules " + UP + " --started" };
+ 
+        String output = execute(args);
+
+        if (output.indexOf("org.apache.geronimo.configs/activemq-broker") < 0) {
+            Assert.fail("deploy/list-modules failed : " + output);
+        }
+        if (output.indexOf("org.apache.geronimo.configs/client-corba-yoko") > 0) {
+            Assert.fail("deploy/list-modules failed : " + output);
+        }
+    }
+    
+    @Test
+    public void testListStoppedModules() throws Exception {
+        String[] args = new String[]{ "deploy/list-modules " + UP + " --stopped" };
+ 
+        String output = execute(args);
+
+        if (output.indexOf("org.apache.geronimo.configs/activemq-broker") > 0) {
+            Assert.fail("deploy/list-modules failed : " + output);
+        }
+        if (output.indexOf("org.apache.geronimo.configs/client-corba-yoko") < 0) {
+            Assert.fail("deploy/list-modules failed : " + output);
+        }
+    }
+    
+    public void testListAllPlugins() throws Exception {
+        //todo this testcase fails
+        /*
+        String[] args = new String[]{ "-c", "deploy/list-plugins -u system -w manager" };
+ 
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        execute( command, args, null, baos );
+
+        if (baos.toString().indexOf("org.apache.geronimo.configs/activemq-broker") < 0) {
+                Assert.fail("deploy/list-modules failed : " + baos.toString());
+        }
+        */
+    }
+
+}

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml Tue Jun 17 12:11:32 2008
@@ -0,0 +1,32 @@
+<?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: 514087 $ $Date: 2007-03-03 14:13:40 +0800 (Sat, 03 Mar 2007) $ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="commands-testsuite.gshell">
+        <packages>
+            <package name="org.apache.geronimo.testsuite.gshell.deploy"/>
+        </packages>
+    </test>
+</suite>
+

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml (added)
+++ geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml Tue Jun 17 12:11:32 2008
@@ -0,0 +1,118 @@
+<?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: 648363 $ $Date: 2008-04-15 14:27:48 -0400 (Tue, 15 Apr 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.testsuite</groupId>
+        <artifactId>testsuite</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>commands-testsuite</artifactId>
+    <name>Geronimo TestSuite :: Commands TestSuite</name>
+    <packaging>pom</packaging>
+
+    <description>
+        Test Geronimo Commands Functions
+    </description>
+     
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-commands</artifactId>
+            <version>${version}</version>
+        </dependency>
+    </dependencies> 
+    
+    <build>
+        <plugins>
+            <plugin>
+                <!-- This plugin is needed for all suite poms. -->
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <!--
+                          One of the pom that this invokes using m-m-p has packaging set to "pom".
+                          That expects it's parent (this pom) to be installed already.
+                          So installing it ahead before we invoke it in the integration-test phase
+                        -->
+                        <artifactId>maven-install-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>install-ahead</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>install</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+                    
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                        <artifactId>maven-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>child</id>
+        </profile>
+    </profiles>
+    
+</project>

Propchange: geronimo/server/branches/2.1/testsuite/commands-testsuite/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/branches/2.1/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/pom.xml?rev=668799&r1=668798&r2=668799&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/pom.xml Tue Jun 17 12:11:32 2008
@@ -67,6 +67,7 @@
     </dependencies>
 
     <modules>
+        <module>commands-testsuite</module>
         <module>console-testsuite</module>
         <module>corba-testsuite</module>
         <module>deployment-testsuite</module>

Modified: geronimo/server/branches/2.1/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsupport/pom.xml?rev=668799&r1=668798&r2=668799&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsupport/pom.xml (original)
+++ geronimo/server/branches/2.1/testsupport/pom.xml Tue Jun 17 12:11:32 2008
@@ -42,6 +42,7 @@
     <modules>
         <module>testsupport-common</module>
         <module>testsupport-selenium</module>
+        <module>testsupport-commands</module>
         <module>test-deployment-j2ee_1.3</module>
         <module>test-deployment-j2ee_1.4</module>
         <module>test-deployment-javaee_5</module>

Added: geronimo/server/branches/2.1/testsupport/testsupport-commands/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsupport/testsupport-commands/LICENSE.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsupport/testsupport-commands/LICENSE.txt (added)
+++ geronimo/server/branches/2.1/testsupport/testsupport-commands/LICENSE.txt Tue Jun 17 12:11:32 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/server/branches/2.1/testsupport/testsupport-commands/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/2.1/testsupport/testsupport-commands/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsupport/testsupport-commands/NOTICE.txt?rev=668799&view=auto
==============================================================================
--- geronimo/server/branches/2.1/testsupport/testsupport-commands/NOTICE.txt (added)
+++ geronimo/server/branches/2.1/testsupport/testsupport-commands/NOTICE.txt Tue Jun 17 12:11:32 2008
@@ -0,0 +1,5 @@
+Apache Geronimo
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/server/branches/2.1/testsupport/testsupport-commands/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native