geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r356022 [19/22] - in /geronimo/branches/1.0: ./ applications/ applications/daytrader/ applications/daytrader/bin/ applications/daytrader/core/ applications/daytrader/derby/ applications/daytrader/ear/ applications/daytrader/ear/src/applicat...
Date Sun, 11 Dec 2005 21:06:19 GMT
Modified: geronimo/branches/1.0/modules/management/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/management/LICENSE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/management/LICENSE.txt (original)
+++ geronimo/branches/1.0/modules/management/LICENSE.txt Sun Dec 11 12:58:34 2005
@@ -1,203 +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.
-
+
+                                 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/branches/1.0/modules/management/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/management/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/management/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/management/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/management/NOTICE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/management/NOTICE.txt (original)
+++ geronimo/branches/1.0/modules/management/NOTICE.txt Sun Dec 11 12:58:34 2005
@@ -1,3 +1,3 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/branches/1.0/modules/management/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/management/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/management/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/management/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/management/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/management/project.properties (original)
+++ geronimo/branches/1.0/modules/management/project.properties Sun Dec 11 12:58:34 2005
@@ -1,4 +1,4 @@
 ##
-## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
+## $Rev$ $Date$
 ##
 

Propchange: geronimo/branches/1.0/modules/management/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/management/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/management/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/naming-builder/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/naming-builder/LICENSE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/naming-builder/LICENSE.txt (original)
+++ geronimo/branches/1.0/modules/naming-builder/LICENSE.txt Sun Dec 11 12:58:34 2005
@@ -1,203 +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.
-
+
+                                 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/branches/1.0/modules/naming-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/naming-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/naming-builder/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/naming-builder/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/naming-builder/NOTICE.txt?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/naming-builder/NOTICE.txt (original)
+++ geronimo/branches/1.0/modules/naming-builder/NOTICE.txt Sun Dec 11 12:58:34 2005
@@ -1,3 +1,3 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/branches/1.0/modules/naming-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/naming-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/naming-builder/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/naming-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/naming-builder/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/naming-builder/project.properties (original)
+++ geronimo/branches/1.0/modules/naming-builder/project.properties Sun Dec 11 12:58:34 2005
@@ -1,5 +1,5 @@
 ##
-## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
+## $Rev$ $Date$
 ##
 maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
 maven.idea.generated.source=xmlbeans

Propchange: geronimo/branches/1.0/modules/naming-builder/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/naming-builder/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/naming-builder/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/branches/1.0/modules/naming/LICENSE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/naming/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/naming/NOTICE.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-author date id rev
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/naming/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/naming/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/naming/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/naming/project.properties (original)
+++ geronimo/branches/1.0/modules/naming/project.properties Sun Dec 11 12:58:34 2005
@@ -1,3 +1,3 @@
 ##
-## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
+## $Rev$ $Date$
 ##

Propchange: geronimo/branches/1.0/modules/naming/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/naming/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/naming/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/project.properties?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/project.properties (original)
+++ geronimo/branches/1.0/modules/project.properties Sun Dec 11 12:58:34 2005
@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 ##
-## $Rev: 158645 $ $Date: 2005-03-22 11:39:44 -0800 (Tue, 22 Mar 2005) $
+## $Rev$ $Date$
 ##
 
 

Propchange: geronimo/branches/1.0/modules/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/branches/1.0/modules/project.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/project.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat Sun Dec 11 12:58:34 2005
@@ -1,78 +1,78 @@
-@rem
-@rem  Copyright 2005 The Apache Software Foundation
-@rem
-@rem   Licensed under the Apache License, Version 2.0 (the "License");
-@rem   you may not use this file except in compliance with the License.
-@rem   You may obtain a copy of the License at
-@rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem   Unless required by applicable law or agreed to in writing, software
-@rem   distributed under the License is distributed on an "AS IS" BASIS,
-@rem   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem   See the License for the specific language governing permissions and
-@rem   limitations under the License.
-@rem
-@rem --------------------------------------------------------------------
-@rem $Rev$ $Date$
-@rem --------------------------------------------------------------------
-@echo off
-
-@rem Verify we are running on Windows XP or Server
-if not "%OS%"=="Windows_NT" goto FailOS
-setlocal
-goto Init
-
-:FailOS
-echo Error - Unrecognized OS type.
-echo.
-set ERRORLEVEL=1
-goto End
-
-:Init
-@rem Capture any passed in arguments
-set ARGS=%*
-@rem Capture the current dir the script was started in
-set CUR_DIR="%cd%"
-for %%z in (%CUR_DIR%) do set CUR_DIR=%%~sz
-
-@rem Set the path to the deployer.jar
-set DEPLOYER_JAR="%~dp0deployer.jar"
-for %%z in (%DEPLOYER_JAR%) do set DEPLOYER_JAR=%%~sz
-
-:CheckDeployerJar
-@rem Verify the deployer.jar exists:
-if exist "%DEPLOYER_JAR%" goto CheckJavaHome
-echo Error - Unable to locate the deployer jar file.
-echo.
-set ERRORLEVEL=1
-goto End
-
-:CheckJavaHome
-for %%z in ("%JAVA_HOME%") do set JAVA_HOME=%%~sz
-if not "%JAVA_HOME%"=="" goto CheckJavaExe
-echo Error - The JAVA_HOME env variable MUST be set.
-echo.
-set ERRORLEVEL=1
-goto End
-
-:CheckJavaExe
-if not exist "%JAVA_HOME%\bin" goto FailJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto FailJavaHome
-set JAVA="%JAVA_HOME%\bin\java.exe"
-goto StartDeployer
-
-:FailJavaHome
-echo Error - Unable to locate Java binary under the JAVA_HOME:
-echo   JAVA_HOME: [ %JAVA_HOME%\bin\java.exe ]
-echo.
-set ERRORLEVEL=1
-goto End
-
-:StartDeployer
-%JAVA% -jar %DEPLOYER_JAR% %ARGS%
-
-:End
-echo.
-@endlocal
-
+@rem
+@rem  Copyright 2005 The Apache Software Foundation
+@rem
+@rem   Licensed under the Apache License, Version 2.0 (the "License");
+@rem   you may not use this file except in compliance with the License.
+@rem   You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem   Unless required by applicable law or agreed to in writing, software
+@rem   distributed under the License is distributed on an "AS IS" BASIS,
+@rem   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem   See the License for the specific language governing permissions and
+@rem   limitations under the License.
+@rem
+@rem --------------------------------------------------------------------
+@rem $Rev$ $Date$
+@rem --------------------------------------------------------------------
+@echo off
+
+@rem Verify we are running on Windows XP or Server
+if not "%OS%"=="Windows_NT" goto FailOS
+setlocal
+goto Init
+
+:FailOS
+echo Error - Unrecognized OS type.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:Init
+@rem Capture any passed in arguments
+set ARGS=%*
+@rem Capture the current dir the script was started in
+set CUR_DIR="%cd%"
+for %%z in (%CUR_DIR%) do set CUR_DIR=%%~sz
+
+@rem Set the path to the deployer.jar
+set DEPLOYER_JAR="%~dp0deployer.jar"
+for %%z in (%DEPLOYER_JAR%) do set DEPLOYER_JAR=%%~sz
+
+:CheckDeployerJar
+@rem Verify the deployer.jar exists:
+if exist "%DEPLOYER_JAR%" goto CheckJavaHome
+echo Error - Unable to locate the deployer jar file.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:CheckJavaHome
+for %%z in ("%JAVA_HOME%") do set JAVA_HOME=%%~sz
+if not "%JAVA_HOME%"=="" goto CheckJavaExe
+echo Error - The JAVA_HOME env variable MUST be set.
+echo.
+set ERRORLEVEL=1
+goto End
+
+:CheckJavaExe
+if not exist "%JAVA_HOME%\bin" goto FailJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto FailJavaHome
+set JAVA="%JAVA_HOME%\bin\java.exe"
+goto StartDeployer
+
+:FailJavaHome
+echo Error - Unable to locate Java binary under the JAVA_HOME:
+echo   JAVA_HOME: [ %JAVA_HOME%\bin\java.exe ]
+echo.
+set ERRORLEVEL=1
+goto End
+
+:StartDeployer
+%JAVA% -jar %DEPLOYER_JAR% %ARGS%
+
+:End
+echo.
+@endlocal
+

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-native
+CRLF

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.sh
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat?rev=356022&r1=356021&r2=356022&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat (original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat Sun Dec 11 12:58:34 2005
@@ -1,266 +1,266 @@
-@REM
-@REM  Copyright 2005 The Apache Software Foundation
-@REM
-@REM   Licensed under the Apache License, Version 2.0 (the "License");
-@REM   you may not use this file except in compliance with the License.
-@REM   You may obtain a copy of the License at
-@REM
-@REM      http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM   Unless required by applicable law or agreed to in writing, software
-@REM   distributed under the License is distributed on an "AS IS" BASIS,
-@REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM   See the License for the specific language governing permissions and
-@REM   limitations under the License.
-
-@REM --------------------------------------------------------------------
-@REM $Rev$ $Date$
-@REM --------------------------------------------------------------------
-
-@REM ---------------------------------------------------------------------------
-@REM Start/Stop Batch file for Geronimo
-@REM
-@REM For usage information, just run geronimo.bat without any arguments.
-@REM 
-@REM This script is based upon Tomcat's catalina.sh file to enable
-@REM those familiar with Tomcat to quickly get started with Geronimo.
-@REM
-@REM Environment Variable Prequisites
-@REM 
-@REM   GERONIMO_HOME   May point at your Geronimo top-level directory.
-@REM                   If not specified, this batch file will attempt to
-@REM                   discover it relative to the location of this file.
-@REM
-@REM   GERONIMO_BASE   (Optional) Base directory for resolving dynamic portions
-@REM                   of a Geronimo installation.  If not present, resolves to
-@REM                   the same directory that GERONIMO_HOME points to.
-@REM
-@REM   GERONIMO_OPTS   (Optional) Java runtime options (in addition to
-@REM                   those set in JAVA_OPTS) used when the "start",
-@REM                   "stop", or "run" command is executed.
-@REM
-@REM   GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
-@REM                   the JVM should use (java.io.tmpdir).  Defaults to
-@REM                   %GERONIMO_BASE%\var\temp.
-@REM
-@REM   JAVA_HOME       Points to your Java Development Kit installation.
-@REM                   JAVA_HOME doesn't need to be set if JRE_HOME is set
-@REM                   unless you use the "debug" command.
-@REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
-@REM
-@REM   JRE_HOME        (Optional) Points to your Java Runtime Environment
-@REM                   Set this if you wish to run Geronimo using the JRE 
-@REM                   instead of the JDK (except for the "debug" command).
-@REM                   Defaults to JAVA_HOME if empty.
-@REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
-@REM
-@REM   JAVA_OPTS       (Optional) Java runtime options used when the "start",
-@REM                   "stop", or "run" command is executed.
-@REM                   Also see the GERONIMO_OPTS environment variable.
-@REM
-@REM   JDB_SRCPATH     (Optional) The Source Path to be used by jdb debugger.
-@REM                   Defaults to %GERONIMO_HOME%\src
-@REM
-@REM   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
-@REM                   command is executed. The default is "dt_shmem".
-@REM
-@REM   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
-@REM                   command is executed. The default is "jdbconn".
-@REM
-@REM Troubleshooting execution of this batch file:
-@REM
-@REM   GERONIMO_BATCH_ECHO (Optional) Environment variable that when set to
-@REM                       "on" results in batch commands being echoed.
-@REM
-@REM   GERONIMO_BATCH_PAUSE (Optional) Environment variable that when set to
-@REM                        "on" results in each batch file to pause at the
-@REM                        end of execution
-@REM
-@REM Batch files called by this batch file:
-@REM 
-@REM   %GERONIMO_HOME%\bin\setenv.bat
-@REM                   (Optional) This batch file is called if it is present.
-@REM                   Its contents may set one or more of the above environment
-@REM                   variables.
-@REM
-@REM   %GERONIMO_HOME%\bin\setjavaenv.bat
-@REM                   This batch file is called to set environment variables
-@REM                   relating to the java or jdb exe file to call.
-@REM                   This file should not need to be modified.
-@REM
-@REM Exit Codes:
-@REM
-@REM  0 - Success
-@REM  1 - Error
-@REM ---------------------------------------------------------------------------
-
-@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
-@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
-
-if "%OS%" == "Windows_NT" goto okOsCheck
-echo Cannot process Geronimo command - you are running an unsupported operating system.
-set ERRORLEVEL=1
-goto end
-
-:okOsCheck
-setlocal
-
-if not "%GERONIMO_HOME%" == "" goto gotHome
-set CURRENT_DIR=%cd%
-@REM %~dp0 is expanded pathname of the current script
-cd %~dp0..
-@REM reference %cd% to resolve ..
-set GERONIMO_HOME=%cd%
-cd %CURRENT_DIR%
-
-:gotHome
-if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
-echo The GERONIMO_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-set ERRORLEVEL=1
-goto end
-:okHome
-
-@REM Get standard environment variables
-@REM Users can optionally create this file to set environment variables.
-if exist "%GERONIMO_HOME%\bin\setenv.bat" call "%GERONIMO_HOME%\bin\setenv.bat"
-if not %errorlevel% == 0 goto end
-
-@REM Get standard Java environment variables (based upon Tomcat's setclasspath.bat
-@REM but renamed since Geronimo's classpath is set in the JAR manifest)
-if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
-echo Cannot find %GERONIMO_HOME%\bin\setclasspath.bat
-echo This file is needed to run this program
-set ERRORLEVEL=1
-goto end
-:okSetJavaEnv
-set BASEDIR=%GERONIMO_HOME%
-call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
-if not %errorlevel% == 0 goto end
-
-if not "%GERONIMO_BASE%" == "" goto gotBase
-set GERONIMO_BASE=%GERONIMO_HOME%
-:gotBase
-
-if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
-set GERONIMO_TMPDIR=%GERONIMO_BASE%\var\temp
-:gotTmpdir
-
-@REM ----- Execute The Requested Command ---------------------------------------
-
-echo Using GERONIMO_BASE:   %GERONIMO_BASE%
-echo Using GERONIMO_HOME:   %GERONIMO_HOME%
-echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
-if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME:       %JAVA_HOME%
-if "%_REQUIRE_JDK%" == "0" echo Using JRE_HOME:        %JRE_HOME%
-
-set _EXECJAVA=%_RUNJAVA%
-@REM MAINCLASS required for jdb debugger as it requires the mainclass
-@REM parameter. For other commands, the main class is obtained from
-@REM the JAR manifest.
-set MAINCLASS=org.apache.geronimo.system.main.Daemon
-set JPDA=
-set _JARFILE="%GERONIMO_HOME%"\bin\server.jar
-
-if not ""%1"" == ""jpda"" goto noJpda
-set JPDA=jpda
-if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
-set JPDA_TRANSPORT=dt_shmem
-:gotJpdaTransport
-if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
-set JPDA_ADDRESS=jdbconn
-:gotJpdaAddress
-shift
-:noJpda
-
-if ""%1"" == ""debug"" goto doDebug
-if ""%1"" == ""run"" goto doRun
-if ""%1"" == ""start"" goto doStart
-if ""%1"" == ""stop"" goto doStop
-
-echo Usage:  geronimo command [args]
-echo commands:
-echo   debug             Debug Geronimo in jdb debugger
-echo   jpda start        Start Geronimo under JPDA debugger
-echo   run               Start Geronimo in the current window
-echo   start             Start Geronimo in a separate window
-echo   stop              Stop Geronimo
-echo. 
-echo args for debug, jpda start, run and start commands:
-echo        --quiet       No startup progress
-echo        --long        Long startup progress
-echo   -v   --verbose     INFO log level
-echo   -vv  --veryverbose DEBUG log level
-echo        --override    Override configurations. USE WITH CAUTION!
-echo        --help        Detailed help.
-echo. 
-echo args for stop command:
-echo        --user        Admin user
-echo        --password    Admin password
-echo        --port        RMI port to connect to
-goto end
-
-:doDebug
-shift
-set _EXECJAVA=%_RUNJDB%
-if not "%JDB_OPTS%" == "" goto gotJdbOpts
-set JDB=jdb
-if not "%JDB_SRCPATH%" == "" goto gotJdbSrcPath
-set JDB_SRCPATH=%GERONIMO_HOME%\src
-:gotJdbSrcPath
-echo Note: The jdb debugger will start Geronimo in another process and connect to it.
-echo       To terminate Geronimo when running under jdb, run the "geronimo stop" command
-echo       in another window.  Do not use Ctrl-C as that will terminate the jdb client
-echo       (the debugger itself) but will not stop the Geronimo process. 
-goto execCmd
-
-:doRun
-shift
-goto execCmd
-
-:doStart
-shift
-@REM use long format of startup progress to be consistent with 
-@REM the unix version of the start processing
-set _LONG_OPT=--long
-
-if not "%OS%" == "Windows_NT" goto noTitle
-set _EXECJAVA=start "Geronimo" %_RUNJAVA%
-goto gotTitle
-:noTitle
-set _EXECJAVA=start %_RUNJAVA%
-:gotTitle
-goto execCmd
-
-:doStop
-shift
-set _JARFILE="%GERONIMO_HOME%"\bin\shutdown.jar
-goto execCmd
-
-:execCmd
-@REM Get remaining unshifted command line arguments and save them in the
-set CMD_LINE_ARGS=
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
-:doneSetArgs
-
-@REM Execute Java with the applicable properties
-if not "%JDB%" == "" goto doJDB
-if not "%JPDA%" == "" goto doJpda
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
-goto end
-
-:doJDB
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS% %CMD_LINE_ARGS%
-goto end
-
-:doJpda
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
-goto end
-
-:end
-@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
-if "%GERONIMO_BATCH_PAUSE%" == "on" pause
+@REM
+@REM  Copyright 2005 The Apache Software Foundation
+@REM
+@REM   Licensed under the Apache License, Version 2.0 (the "License");
+@REM   you may not use this file except in compliance with the License.
+@REM   You may obtain a copy of the License at
+@REM
+@REM      http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM   Unless required by applicable law or agreed to in writing, software
+@REM   distributed under the License is distributed on an "AS IS" BASIS,
+@REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM   See the License for the specific language governing permissions and
+@REM   limitations under the License.
+
+@REM --------------------------------------------------------------------
+@REM $Rev$ $Date$
+@REM --------------------------------------------------------------------
+
+@REM ---------------------------------------------------------------------------
+@REM Start/Stop Batch file for Geronimo
+@REM
+@REM For usage information, just run geronimo.bat without any arguments.
+@REM 
+@REM This script is based upon Tomcat's catalina.sh file to enable
+@REM those familiar with Tomcat to quickly get started with Geronimo.
+@REM
+@REM Environment Variable Prequisites
+@REM 
+@REM   GERONIMO_HOME   May point at your Geronimo top-level directory.
+@REM                   If not specified, this batch file will attempt to
+@REM                   discover it relative to the location of this file.
+@REM
+@REM   GERONIMO_BASE   (Optional) Base directory for resolving dynamic portions
+@REM                   of a Geronimo installation.  If not present, resolves to
+@REM                   the same directory that GERONIMO_HOME points to.
+@REM
+@REM   GERONIMO_OPTS   (Optional) Java runtime options (in addition to
+@REM                   those set in JAVA_OPTS) used when the "start",
+@REM                   "stop", or "run" command is executed.
+@REM
+@REM   GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
+@REM                   the JVM should use (java.io.tmpdir).  Defaults to
+@REM                   %GERONIMO_BASE%\var\temp.
+@REM
+@REM   JAVA_HOME       Points to your Java Development Kit installation.
+@REM                   JAVA_HOME doesn't need to be set if JRE_HOME is set
+@REM                   unless you use the "debug" command.
+@REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
+@REM
+@REM   JRE_HOME        (Optional) Points to your Java Runtime Environment
+@REM                   Set this if you wish to run Geronimo using the JRE 
+@REM                   instead of the JDK (except for the "debug" command).
+@REM                   Defaults to JAVA_HOME if empty.
+@REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
+@REM
+@REM   JAVA_OPTS       (Optional) Java runtime options used when the "start",
+@REM                   "stop", or "run" command is executed.
+@REM                   Also see the GERONIMO_OPTS environment variable.
+@REM
+@REM   JDB_SRCPATH     (Optional) The Source Path to be used by jdb debugger.
+@REM                   Defaults to %GERONIMO_HOME%\src
+@REM
+@REM   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
+@REM                   command is executed. The default is "dt_shmem".
+@REM
+@REM   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
+@REM                   command is executed. The default is "jdbconn".
+@REM
+@REM Troubleshooting execution of this batch file:
+@REM
+@REM   GERONIMO_BATCH_ECHO (Optional) Environment variable that when set to
+@REM                       "on" results in batch commands being echoed.
+@REM
+@REM   GERONIMO_BATCH_PAUSE (Optional) Environment variable that when set to
+@REM                        "on" results in each batch file to pause at the
+@REM                        end of execution
+@REM
+@REM Batch files called by this batch file:
+@REM 
+@REM   %GERONIMO_HOME%\bin\setenv.bat
+@REM                   (Optional) This batch file is called if it is present.
+@REM                   Its contents may set one or more of the above environment
+@REM                   variables.
+@REM
+@REM   %GERONIMO_HOME%\bin\setjavaenv.bat
+@REM                   This batch file is called to set environment variables
+@REM                   relating to the java or jdb exe file to call.
+@REM                   This file should not need to be modified.
+@REM
+@REM Exit Codes:
+@REM
+@REM  0 - Success
+@REM  1 - Error
+@REM ---------------------------------------------------------------------------
+
+@if "%GERONIMO_BATCH_ECHO%" == "on"  echo on
+@if not "%GERONIMO_BATCH_ECHO%" == "on"  echo off
+
+if "%OS%" == "Windows_NT" goto okOsCheck
+echo Cannot process Geronimo command - you are running an unsupported operating system.
+set ERRORLEVEL=1
+goto end
+
+:okOsCheck
+setlocal
+
+if not "%GERONIMO_HOME%" == "" goto gotHome
+set CURRENT_DIR=%cd%
+@REM %~dp0 is expanded pathname of the current script
+cd %~dp0..
+@REM reference %cd% to resolve ..
+set GERONIMO_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if exist "%GERONIMO_HOME%\bin\geronimo.bat" goto okHome
+echo The GERONIMO_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+set ERRORLEVEL=1
+goto end
+:okHome
+
+@REM Get standard environment variables
+@REM Users can optionally create this file to set environment variables.
+if exist "%GERONIMO_HOME%\bin\setenv.bat" call "%GERONIMO_HOME%\bin\setenv.bat"
+if not %errorlevel% == 0 goto end
+
+@REM Get standard Java environment variables (based upon Tomcat's setclasspath.bat
+@REM but renamed since Geronimo's classpath is set in the JAR manifest)
+if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
+echo Cannot find %GERONIMO_HOME%\bin\setclasspath.bat
+echo This file is needed to run this program
+set ERRORLEVEL=1
+goto end
+:okSetJavaEnv
+set BASEDIR=%GERONIMO_HOME%
+call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
+if not %errorlevel% == 0 goto end
+
+if not "%GERONIMO_BASE%" == "" goto gotBase
+set GERONIMO_BASE=%GERONIMO_HOME%
+:gotBase
+
+if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
+set GERONIMO_TMPDIR=%GERONIMO_BASE%\var\temp
+:gotTmpdir
+
+@REM ----- Execute The Requested Command ---------------------------------------
+
+echo Using GERONIMO_BASE:   %GERONIMO_BASE%
+echo Using GERONIMO_HOME:   %GERONIMO_HOME%
+echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
+if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME:       %JAVA_HOME%
+if "%_REQUIRE_JDK%" == "0" echo Using JRE_HOME:        %JRE_HOME%
+
+set _EXECJAVA=%_RUNJAVA%
+@REM MAINCLASS required for jdb debugger as it requires the mainclass
+@REM parameter. For other commands, the main class is obtained from
+@REM the JAR manifest.
+set MAINCLASS=org.apache.geronimo.system.main.Daemon
+set JPDA=
+set _JARFILE="%GERONIMO_HOME%"\bin\server.jar
+
+if not ""%1"" == ""jpda"" goto noJpda
+set JPDA=jpda
+if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
+set JPDA_TRANSPORT=dt_shmem
+:gotJpdaTransport
+if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
+set JPDA_ADDRESS=jdbconn
+:gotJpdaAddress
+shift
+:noJpda
+
+if ""%1"" == ""debug"" goto doDebug
+if ""%1"" == ""run"" goto doRun
+if ""%1"" == ""start"" goto doStart
+if ""%1"" == ""stop"" goto doStop
+
+echo Usage:  geronimo command [args]
+echo commands:
+echo   debug             Debug Geronimo in jdb debugger
+echo   jpda start        Start Geronimo under JPDA debugger
+echo   run               Start Geronimo in the current window
+echo   start             Start Geronimo in a separate window
+echo   stop              Stop Geronimo
+echo. 
+echo args for debug, jpda start, run and start commands:
+echo        --quiet       No startup progress
+echo        --long        Long startup progress
+echo   -v   --verbose     INFO log level
+echo   -vv  --veryverbose DEBUG log level
+echo        --override    Override configurations. USE WITH CAUTION!
+echo        --help        Detailed help.
+echo. 
+echo args for stop command:
+echo        --user        Admin user
+echo        --password    Admin password
+echo        --port        RMI port to connect to
+goto end
+
+:doDebug
+shift
+set _EXECJAVA=%_RUNJDB%
+if not "%JDB_OPTS%" == "" goto gotJdbOpts
+set JDB=jdb
+if not "%JDB_SRCPATH%" == "" goto gotJdbSrcPath
+set JDB_SRCPATH=%GERONIMO_HOME%\src
+:gotJdbSrcPath
+echo Note: The jdb debugger will start Geronimo in another process and connect to it.
+echo       To terminate Geronimo when running under jdb, run the "geronimo stop" command
+echo       in another window.  Do not use Ctrl-C as that will terminate the jdb client
+echo       (the debugger itself) but will not stop the Geronimo process. 
+goto execCmd
+
+:doRun
+shift
+goto execCmd
+
+:doStart
+shift
+@REM use long format of startup progress to be consistent with 
+@REM the unix version of the start processing
+set _LONG_OPT=--long
+
+if not "%OS%" == "Windows_NT" goto noTitle
+set _EXECJAVA=start "Geronimo" %_RUNJAVA%
+goto gotTitle
+:noTitle
+set _EXECJAVA=start %_RUNJAVA%
+:gotTitle
+goto execCmd
+
+:doStop
+shift
+set _JARFILE="%GERONIMO_HOME%"\bin\shutdown.jar
+goto execCmd
+
+:execCmd
+@REM Get remaining unshifted command line arguments and save them in the
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+@REM Execute Java with the applicable properties
+if not "%JDB%" == "" goto doJDB
+if not "%JPDA%" == "" goto doJpda
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
+goto end
+
+:doJDB
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS% %CMD_LINE_ARGS%
+goto end
+
+:doJpda
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
+goto end
+
+:end
+@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
+if "%GERONIMO_BATCH_PAUSE%" == "on" pause

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-native
+CRLF

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Dec 11 12:58:34 2005
@@ -1 +1 @@
-Author Date Id Revision
+Date Author Id Revision HeadURL

Propchange: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message