Permalink
Browse files

Remove jruby_astyanax-jars gem. Fewer dependencies are a good idea he…

…re, and it's been a pain to use. Let's go simple.
  • Loading branch information...
1 parent 9376758 commit a5f84ec0103a2353ed44d9e647fce80d71d9896b Noah Gibbs committed Feb 15, 2013
Showing with 2 additions and 12 deletions.
  1. +2 −2 Rakefile
  2. BIN build/include_jars/antlr-2.7.7.jar
  3. BIN build/include_jars/antlr-3.2.jar
  4. BIN build/include_jars/antlr-runtime-3.2.jar
  5. BIN build/include_jars/astyanax-1.0.6.jar
  6. BIN build/include_jars/avro-1.4.0-cassandra-1.jar
  7. BIN build/include_jars/cassandra-all-1.1.0.jar
  8. BIN build/include_jars/cassandra-thrift-1.1.0.jar
  9. BIN build/include_jars/commons-cli-1.1.jar
  10. BIN build/include_jars/commons-codec-1.2.jar
  11. BIN build/include_jars/commons-lang-2.4.jar
  12. BIN build/include_jars/commons-logging-1.1.1.jar
  13. BIN build/include_jars/compress-lzf-0.8.4.jar
  14. BIN build/include_jars/concurrentlinkedhashmap-lru-1.2.jar
  15. BIN build/include_jars/guava-11.0.2.jar
  16. BIN build/include_jars/high-scale-lib-1.1.2.jar
  17. BIN build/include_jars/httpclient-4.0.1.jar
  18. BIN build/include_jars/httpcore-4.0.1.jar
  19. BIN build/include_jars/jackson-core-asl-1.4.0.jar
  20. BIN build/include_jars/jackson-mapper-asl-1.4.0.jar
  21. BIN build/include_jars/jamm-0.2.5.jar
  22. BIN build/include_jars/jettison-1.3.1.jar
  23. BIN build/include_jars/jetty-6.1.22.jar
  24. BIN build/include_jars/jetty-util-6.1.22.jar
  25. BIN build/include_jars/jline-0.9.94.jar
  26. BIN build/include_jars/joda-time-2.0.jar
  27. BIN build/include_jars/json-simple-1.1.jar
  28. BIN build/include_jars/jsr305-1.3.9.jar
  29. BIN build/include_jars/libthrift-0.7.0.jar
  30. BIN build/include_jars/log4j-1.2.16.jar
  31. BIN build/include_jars/metrics-core-2.0.3.jar
  32. BIN build/include_jars/org.apache.servicemix.bundles.commons-csv-1.0-r706900_3.jar
  33. BIN build/include_jars/servlet-api-2.5-20081211.jar
  34. BIN build/include_jars/servlet-api-2.5.jar
  35. BIN build/include_jars/slf4j-api-1.6.4.jar
  36. BIN build/include_jars/slf4j-log4j12-1.6.1.jar
  37. BIN build/include_jars/snakeyaml-1.6.jar
  38. BIN build/include_jars/snappy-java-1.0.4.1.jar
  39. BIN build/include_jars/snaptree-0.1.jar
  40. BIN build/include_jars/stax-api-1.0.1.jar
  41. BIN build/include_jars/stringtemplate-3.2.jar
  42. BIN build/include_jars/uuid-3.2.0.jar
  43. +0 −1 hastur-server.gemspec
  44. +0 −9 lib/hastur-server/api/jruby-astyanax.rb
View
@@ -117,13 +117,12 @@ ALL_EXCLUDES = FileList["**/*~"] + ["server_package.tar.bz2"] +
# config allows jar stuff but not war stuff.
if ARGV.include?("retrieval_war")
Warbler::Task.new("retrieval_war", Warbler::Config.new do |config|
- require "jruby_astyanax-jars"
-
config.jar_name = "build/jars/retrieval_v2"
config.features = ["executable"]
# See config/warble.rb for explanation of config variables
config.dirs = %w(lib tools)
+ config.java_libs += FileList["build/include_jars/*.jar"]
config.excludes = ALL_EXCLUDES
config.bundler = false # This doesn't seem to turn off the gemspec
config.gem_dependencies = true
@@ -142,6 +141,7 @@ Warbler::Task.new("core_jar", Warbler::Config.new do |config|
# See config/warble.rb for explanation of config variables
config.dirs = %w(lib vendor tools)
+ config.java_libs += FileList["build/include_jars/*.jar"]
config.excludes = ALL_EXCLUDES
config.bundler = false # This doesn't seem to turn off the gemspec
config.gem_dependencies = true
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -58,5 +58,4 @@ EOS
s.add_runtime_dependency "sys-uname"
s.add_runtime_dependency "hastur-rack"
s.add_runtime_dependency "jruby-msgpack"
- s.add_runtime_dependency "jruby_astyanax-jars"
end
@@ -5,15 +5,6 @@
require "java"
-#require "jruby_astyanax-jars"
-# JRuby_astyanax has a CLASSPATH line that gives a NullPointerException in jruby_astyanax-jars.rb.
-# So we can't just require it. We want the jars, though. For now, we find them and require
-# them. TODO: fork that gem?
-ast_include_file = `gem which jruby_astyanax-jars.rb`.chomp
-raise "Can't find jruby_astyanax gem!" if ast_include_file.empty?
-ast_jars_dir = File.dirname(ast_include_file)
-Dir[File.join(ast_jars_dir, "*.jar")].each { |f| require f }
-
java_import com.netflix.astyanax.impl.AstyanaxConfigurationImpl
java_import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl
java_import com.netflix.astyanax.AstyanaxContext

0 comments on commit a5f84ec

Please sign in to comment.