diff --git a/CHANGES.txt b/CHANGES.txt index c673267f11..4b020e068b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -30,6 +30,8 @@ * Make reloading the compaction strategy safe (CASSANDRA-3409) * ignore 0.8 hints even if compaction begins before we try to purge them (CASSANDRA-3385) + * remove procrun (bin\daemon) from Cassandra source tree and + artifacts (CASSANDRA-3331) Merged from 0.8: * (CQL) update grammar to require key clause in DELETE statement (CASSANDRA-3349) diff --git a/README.txt b/README.txt index 3aab0c5250..ec568a1dc1 100644 --- a/README.txt +++ b/README.txt @@ -38,10 +38,15 @@ Now that we're ready, let's start it up! * bin/cassandra -f -(Running the startup script with the -f argument will cause Cassandra to -remain in the foreground and log to standard out. On windows, running -it with the 'install' argument instead will install Cassandra as a -Windows Service, and 'uninstall' will remove it.) +Unix: Running the startup script with the -f argument will cause +Cassandra to remain in the foreground and log to standard out. + +Windows: bin\cassandra.bat runs in the foreground by default. To +install Cassandra as a Windows service, download Procrun from +http://commons.apache.org/daemon/procrun.html, set the PRUNSRV +environment variable to the full path of prunsrv (e.g., +C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install". +Similarly, "uninstall" will remove the service. Now let's try to read and write some data using the command line client. diff --git a/bin/daemon/LICENSE.txt b/bin/daemon/LICENSE.txt deleted file mode 100644 index d645695673..0000000000 --- a/bin/daemon/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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. diff --git a/bin/daemon/NOTICE.txt b/bin/daemon/NOTICE.txt deleted file mode 100644 index 8dc87b0b9f..0000000000 --- a/bin/daemon/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Commons Daemon -Copyright 1999-2011 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). diff --git a/bin/daemon/RELEASE-NOTES.txt b/bin/daemon/RELEASE-NOTES.txt deleted file mode 100644 index 76f8a53766..0000000000 --- a/bin/daemon/RELEASE-NOTES.txt +++ /dev/null @@ -1,116 +0,0 @@ -$Id: RELEASE-NOTES.txt 1153024 2011-08-02 04:27:12Z mturk $ - - Commons Daemon Package - Version 1.0.7 - Release Notes - - -INTRODUCTION: - -Commons Daemon is a set of utilities and Java support classes for running -Java applications as server processes. -Commonly known as 'daemon' processes in Unix terminology (hence the name), -on Windows they are called 'services'. - -This document contains the release notes for this version of the Commons -Daemon package, and highlights changes since the previous version. The -current release adds new features and bug fixes, and is being done now to -follow the release early/release often mentality. - - -Compatibility with 1.0.3 ------------------------- -Binary compatible - Yes - -Source compatible - Yes - -Semantic compatible - Yes - -Commons DAEMON 1.0.3 requires a minimum of JDK 1.3 - - -NEW FEATURES: - -* DAEMON-209: Add --LibraryPath to procrun for setting the - LoadLibrary search paths (1.0.6) -* DAEMON-208: Add -server and -client -jvm synonyms (1.0.6) -* DAEMON-205: Add support for building on ARM processors (1.0.6) -* DAEMON-204: Add DaemonSignal interface that allows catching SIGUSR2 - signals and creating custom callbacks (1.0.6) -* DAEMON-202: Allow JSVC_OPTS environment variable to be used in - the example Tomcat scripts (1.0.6) -* DAEMON-180: Add DaemonWrapper to allow running standard applications - as daemons. (1.0.4) -* DAEMON-179: Allow procrun to use java/lang/System as --ShutdownClass. (1.0.4) -* DAEMON-178: Allow jsvc umask to be configured at build time -* DAEMON-177: Allow fail during init with nicer message. (1.0.4) -* DAEMON-176: Create config.nice during configure step. (1.0.4) -* DAEMON-173: Allow --JavaHome=jdk and --JavaHome=jre options that - will guess default JavaHome from the registry. (1.0.4) -* DAEMON-160: Remove obsolete code; rename native/nt as native/windows (1.0.4) -* DAEMON-144: Drop sample dependency on Commons Collections ExtendedProperties (1.0.4) -* DAEMON-95: Support log rotation using SIGUSR1 (1.0.4) -* DAEMON-80: Syslog support for jsvc (1.0.4) - -* DAEMON-138: Add --PidFile option to allow storing running process id. (1.0.3) -* DAEMON-137: Add --LogJniMessages allowing to configure JNI verbose message - logging. By default those messages were always logged. (1.0.3) -* DAEMON-140: Add missing Java6 parameters -ea, da, -esa, -dsa, -showversion - and their long name synonyms. (1.0.3) -* DAEMON-142: Add option to display procrun version. (1.0.3) -* DAEMON-166: Add classpath .jar expansion. If the classpath - element ends with asterisk it will evaluate to all .jar files - found in the path. (1.0.3) - -* Add -wait and -stop parameters. (1.0.1). - The -wait parameter is experimental: that a is loop testing for a - file in /tmp and waiting n/10 seconds. - -* Allow to run as normal user for testing. (1.0.1). - -* Initial import to Commons, including the daemon Java API, and jsvc - for Unix and Windows NT/2K/XP, which allows running a Java program - as a native operating system daemon - -* Switch to JIRA bug tracking system. - -* Add sample ProcrunService Java application for use with Procrun Jvm/Java modes (1.0.3) - -BUG FIXES: - -1.0.7: DAEMON-211 - -1.0.6: DAEMON-186, DAEMON-193, DAEMON-194, DAEMON-206, DAEMON-185, DAEMON-200 - DAEMON-192 - -1.0.5: DAEMON-158, DAEMON-184, DAEMON-187, DAEMON-188, DAEMON-190 - -1.0.4: DAEMON-95, DAEMON-171, DAEMON-100, DAEMON-164, DAEMON-165, DAEMON-175, - DAEMON-177, DAEMON-150, DAEMON-163, DAEMON-182, DAEMON-181 - -1.0.3: DAEMON-108, DAEMON-128, DAEMON-139, DAEMON-143, DAEMON-148, - DAEMON-135, DAEMON-155, DAEMON-159, DAEMON-161, DAEMON-145, DAEMON-146, - DAEMON-167, DAEMON-168, DAEMON-154, DAEMON-149 - -1.0.2: DAEMON-16, DAEMON-31, DAEMON-40, DAEMON-45, DAEMON-49, DAEMON-60, - DAEMON-84, DAEMON-90, DAEMON-91, DAEMON-92, DAEMON-93, DAEMON-94, - DAEMON-96, DAEMON-97, DAEMON-98, DAEMON-102, DAEMON-105, DAEMON-106, - DAEMON-110, DAEMON-112, DAEMON-113, DAEMON-114, DAEMON-115, DAEMON-116, - DAEMON-117, DAEMON-118, DAEMON-119, DAEMON-120, DAEMON-121, DAEMON-123, - DAEMON-124, DAEMON-125, DAEMON-126, DAEMON-129, DAEMON-130, DAEMON-132, - DAEMON-133 - -1.0.1: 304310, 30177, 27523, 29465, 31614, 33580, 31613, 34851. - -Feedback --------- -Open source works best when you give feedback: -http://commons.apache.org/daemon/ - -Please direct all bug reports to JIRA -https://issues.apache.org/jira/browse/DAEMON - -Or subscribe to the commons-user mailing list (prefix emails by [daemon]) -http://commons.apache.org/mail-lists.html - -The Commons-DAEMON Team \ No newline at end of file diff --git a/bin/daemon/prunmgr.exe b/bin/daemon/prunmgr.exe deleted file mode 100644 index 6fd0f93183..0000000000 Binary files a/bin/daemon/prunmgr.exe and /dev/null differ diff --git a/bin/daemon/prunsrv.exe b/bin/daemon/prunsrv.exe deleted file mode 100644 index cdd4aaa3ee..0000000000 Binary files a/bin/daemon/prunsrv.exe and /dev/null differ diff --git a/build.xml b/build.xml index b0e140a7c8..ff5fcebc08 100644 --- a/build.xml +++ b/build.xml @@ -41,7 +41,6 @@ - @@ -877,8 +876,6 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision} - - @@ -910,7 +907,6 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision} -