Author: jbellis
Date: Thu Oct 27 16:56:29 2011
New Revision: 1189869
URL: http://svn.apache.org/viewvc?rev=1189869&view=rev
Log:
remove procrun (bin\daemon); see CASSANDRA-3331
Removed:
cassandra/branches/cassandra-1.0/bin/daemon/
Modified:
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/README.txt
cassandra/branches/cassandra-1.0/build.xml
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1189869&r1=1189868&r2=1189869&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Thu Oct 27 16:56:29 2011
@@ -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)
Modified: cassandra/branches/cassandra-1.0/README.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/README.txt?rev=1189869&r1=1189868&r2=1189869&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/README.txt (original)
+++ cassandra/branches/cassandra-1.0/README.txt Thu Oct 27 16:56:29 2011
@@ -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.
Modified: cassandra/branches/cassandra-1.0/build.xml
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/build.xml?rev=1189869&r1=1189868&r2=1189869&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0/build.xml Thu Oct 27 16:56:29 2011
@@ -41,7 +41,6 @@
<property name="build.lib" value="${basedir}/lib"/>
<property name="build.dir" value="${basedir}/build"/>
<property name="build.dir.lib" value="${basedir}/build/lib"/>
- <property name="build.dir.daemon" value="${basedir}/bin/daemon"/>
<property name="build.test.dir" value="${build.dir}/test"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.classes.main" value="${build.classes}/main" />
@@ -877,8 +876,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<!-- Shell includes in bin/ (default mode) -->
<tarfileset dir="${dist.dir}" prefix="${final.name}">
<include name="bin/*.in.sh" />
- <include name="${build.dir.daemon}/**" />
-
</tarfileset>
<!-- Executable scripts in bin/ -->
<tarfileset dir="${dist.dir}" prefix="${final.name}" mode="755">
@@ -910,7 +907,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<tarfileset dir="${basedir}" prefix="${final.name}-src">
<include name="bin/*.in.sh" />
<include name="bin/*.bat" />
- <include name="${build.dir.daemon}/**" />
</tarfileset>
<!-- Everything else (assumed to be scripts), is executable -->
<tarfileset dir="${basedir}" prefix="${final.name}-src" mode="755">
