# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1366224484 25200
# Node ID 729f36e68da8316dea15b7435a254c876024868d
# Parent  2b887e35b5cd8499e23f1d759db849c9cf29a2f4
work on building from source

diff -r 2b887e35b5cd -r 729f36e68da8 elasticsearch.spec
--- a/elasticsearch.spec	Mon Apr 15 19:33:28 2013 -0700
+++ b/elasticsearch.spec	Wed Apr 17 11:48:04 2013 -0700
@@ -43,8 +43,7 @@
     b=$(basename $f)
     install -D -p -m 644 $f $RPM_BUILD_ROOT%{_bindir}/$b
 done
-rm -f $RPM_BUILD_ROOT%{_bindir}/lucene-core*.jar
-for f in elasticsearch jna jts log4j lucene-analyzers lucene-highlighter lucene-memory lucene-queries snappy-java spatial4j; do
+for f in elasticsearch jna jts log4j lucene-core lucene-analyzers lucene-highlighter lucene-memory lucene-queries snappy-java spatial4j; do
     mv $RPM_BUILD_ROOT%{_bindir}/$f*.jar $RPM_BUILD_ROOT%{_bindir}/$f.jar
 done
 
diff -r 2b887e35b5cd -r 729f36e68da8 logstash.Makefile
--- a/logstash.Makefile	Mon Apr 15 19:33:28 2013 -0700
+++ b/logstash.Makefile	Wed Apr 17 11:48:04 2013 -0700
@@ -53,7 +53,7 @@
 	cp $(GEOIP) build/monolith/
 	# build the classpath in a manifest file
 	#echo -n "Class-Path: /usr/share/jruby.jar /usr/local/bin/graphtastic-client.jar " >logstash.manifest
-	#echo /usr/local/bin/{elasticsearch,jna,jts,log4j,lucene-analyzers,lucene-highlighter,lucene-memory,lucene-queries,snappy-java,spatial4j}.jar >>logstash.manifest
+	#echo /usr/local/bin/{elasticsearch,jna,jts,log4j,lucene-core,lucene-analyzers,lucene-highlighter,lucene-memory,lucene-queries,snappy-java,spatial4j}.jar >>logstash.manifest
 	# build-logstash-jar
 	jar cfme build/logstash.jar logstash.manifest logstash.runner       \
 		-C build/ruby .								 \
diff -r 2b887e35b5cd -r 729f36e68da8 logstash.manifest
--- a/logstash.manifest	Mon Apr 15 19:33:28 2013 -0700
+++ b/logstash.manifest	Wed Apr 17 11:48:04 2013 -0700
@@ -1,1 +1,1 @@
-Class-Path: /usr/share/jruby.jar /usr/local/bin/graphtastic-client.jar /usr/local/bin/elasticsearch.jar /usr/local/bin/jna.jar /usr/local/bin/jts.jar /usr/local/bin/log4j.jar /usr/local/bin/lucene-analyzers.jar /usr/local/bin/lucene-highlighter.jar /usr/local/bin/lucene-memory.jar /usr/local/bin/lucene-queries.jar /usr/local/bin/snappy-java.jar /usr/local/bin/spatial4j.jar
+Class-Path: /usr/share/jruby.jar /usr/local/bin/graphtastic-client.jar /usr/local/bin/elasticsearch.jar /usr/local/bin/jna.jar /usr/local/bin/jts.jar /usr/local/bin/log4j.jar /usr/local/bin/lucene-core.jar /usr/local/bin/lucene-analyzers.jar /usr/local/bin/lucene-highlighter.jar /usr/local/bin/lucene-memory.jar /usr/local/bin/lucene-queries.jar /usr/local/bin/snappy-java.jar /usr/local/bin/spatial4j.jar
diff -r 2b887e35b5cd -r 729f36e68da8 logstash.rc
--- a/logstash.rc	Mon Apr 15 19:33:28 2013 -0700
+++ b/logstash.rc	Wed Apr 17 11:48:04 2013 -0700
@@ -50,7 +50,7 @@
     cd $HOME
     pid=$(
     exec sudo -u logstash /bin/bash - <<EOF
-        $JAVA $ARGS  &
+        $JAVA $ARGS >&2 &
         echo \$!
 EOF
     )
diff -r 2b887e35b5cd -r 729f36e68da8 logstash.spec
--- a/logstash.spec	Mon Apr 15 19:33:28 2013 -0700
+++ b/logstash.spec	Wed Apr 17 11:48:04 2013 -0700
@@ -45,6 +45,8 @@
 
 %prep
 %setup -q
+sed -i -e 's,jarpath =.*,jarpath = "/usr/local/bin/elasticsearch/*.jar",g' lib/logstash/outputs/elasticsearch.rb
+sed -i -e 's,jarpath =.*,jarpath = "/usr/local/bin/elasticsearch/*.jar",g' lib/logstash/outputs/elasticsearch_river.rb
 
 
 %build
diff -r 2b887e35b5cd -r 729f36e68da8 logstash.sysconfig
--- a/logstash.sysconfig	Mon Apr 15 19:33:28 2013 -0700
+++ b/logstash.sysconfig	Wed Apr 17 11:48:04 2013 -0700
@@ -5,7 +5,8 @@
 # used by /etc/rc.d/init.d/logstash
 # extra args for java
 #JAVAARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 -verbose"
+#JAVAARGS=-verbose
 # extra args for agent
-AGENTARGS=-v
+#AGENTARGS=-vvv
 # args for web
 WEBARGS="--backend elasticsearch://127.0.0.1/?local"