Merge branch 'jruby-1_7'

* jruby-1_7: (46 commits)
  make previous commit null-safe + review JRuby home verification - normalize once!
  normalize JRubyHome for windows.
  backport ruby 1.9.3 test_bigdecimal from MRI (NAN.round no longer supposed to fail)
  make sure BigDecimal test restores exception modes + make nan asserts 1.8 compat
  handle BigDecimal#round-ing for NaN (does not raise since 1.8.7 current MRI 2.2.3)
  update to latest jruby-openssl release: 0.9.12
  update options library to latest 1.3 release
  re-format code - mislined line + unused variable & use indexOf(char) instead of str
  avoid expensive pattern compiling in arg processing loop (split() and replaceAll())
  [nkf] handle 1.9.3 NKF library compatibility - returning encoding objects (see jruby#338)
  avoid double convertToInteger and double NKF map lookup in EncodingService
  define NKF version constants (based on MRI 1.8.7 ... which is how NKF is compatible)
  make NKF shared public static map final
  correct ArgumentError message format to match MRI >= 1.9.3 (fixes jruby#3346)
  be failsafe when trying to load META-INF/maven/org.yaml/snakeyaml/pom.properties
  fix generics (for master backport) to dispatch to correct CallableSelector override
  move CallableCache internal interface were it fits + add matching methods for arities
  invent a "true" null (java) callable cache for invokers + make get/put signature final
  refactor (internal) Java.__jcreate! impl to use same cache as RubyToJavaInvoker-s ... introducing an internal CallableCache interface to loose coupling in CallableSelector
  Use Cliff Click's high-scale collections instead of IntHashMap.
  ...

Conflicts:
	core/pom.xml
	core/src/main/java/org/jruby/RubyFile.java
	core/src/main/java/org/jruby/RubyInstanceConfig.java
	core/src/main/java/org/jruby/RubyProc.java
	core/src/main/java/org/jruby/exceptions/RaiseException.java
	core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
	core/src/main/java/org/jruby/ext/psych/PsychLibrary.java
	core/src/main/java/org/jruby/java/dispatch/CallableSelector.java
	core/src/main/java/org/jruby/java/invokers/RubyToJavaInvoker.java
	core/src/main/java/org/jruby/javasupport/Java.java
	core/src/main/java/org/jruby/runtime/Helpers.java
	core/src/main/java/org/jruby/runtime/backtrace/TraceType.java
	core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
	core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
	default.build.properties
	lib/pom.rb
	lib/pom.xml
	maven/jruby-dist/pom.rb
	maven/jruby-dist/pom.xml
	maven/jruby-dist/src/main/assembly/jruby.xml
	maven/jruby-stdlib/pom.rb
	maven/jruby/src/it/runnable/spec/one_spec.rb
	pom.xml
	rakelib/test.rake
	spec/profiler/json_profile_printer_spec.rb
	spec/profiler/runtime_spec.rb
	test/externals/ruby1.9/bigdecimal/test_bigdecimal.rb
	test/pom.rb
	test/pom.xml
	test/test_big_decimal.rb
	test/test_file.rb
	test/test_pathname.rb

Author: kares

Diff for: antlib/extra.xml

@@ -67,6 +67,7 @@ build jruby-complete.jar
 <arg value='test/test_ivar_table_integrity.rb'/>
 <arg value='test/test_io.rb'/>
 <arg value='test/test_load.rb'/>
+<arg value='test/test_load_gem_extensions.rb'/>
 <arg value='test/test_method.rb'/>
 <arg value='test/test_method_cache.rb'/>
 <arg value='test/test_method_override_and_caching.rb'/>
@@ -393,7 +394,6 @@ build jruby-complete.jar
 <arg value='test/externals/ruby1.9/psych/test_document.rb'/>
 <arg value='test/externals/ruby1.9/psych/test_emitter.rb'/>
 <arg value='test/externals/ruby1.9/psych/test_encoding.rb'/>
-<arg value='test/externals/ruby1.9/psych/test_engine_manager.rb'/>
 <arg value='test/externals/ruby1.9/psych/test_exception.rb'/>
 <arg value='test/externals/ruby1.9/psych/test_hash.rb'/>
 <arg value='test/externals/ruby1.9/psych/test_json_tree.rb'/>
@@ -514,4 +514,4 @@ build jruby-complete.jar
 <!--arg value='-v'/-->
 </exec>
 </target>
-<target description='test using jruby-complete or jruby-core/jruby-stdlib jars' name='test-jruby-jars' depends='mvn,test-jruby-jars-jruby.1.9,test-jruby-complete-slow,test-jruby-jars-objectspace,test-jruby-jars-mri.1.9,test-jruby-complete-rubicon.1.9'/></project>
+<target description='test using jruby-complete or jruby-core/jruby-stdlib jars' name='test-jruby-jars' depends='mvn,test-jruby-jars-jruby.1.9,test-jruby-complete-slow,test-jruby-jars-objectspace,test-jruby-jars-mri.1.9,test-jruby-complete-rubicon.1.9'/></project>

Diff for: core/src/main/java/org/jruby/RubyDir.java

@@ -720,7 +720,7 @@ private static String dirFromPath(final String path, final Ruby runtime) throws
         String dir = path;
         String[] pathParts = RubyFile.splitURI(path);
         if (pathParts != null) {
-            if (pathParts[0].startsWith("file:") && pathParts[1].length() > 0 && pathParts[1].indexOf("!/") == -1) {
+            if (pathParts[0].startsWith("file:") && pathParts[1].length() > 0 && pathParts[1].indexOf(".jar!/") == -1) {
                 dir = pathParts[1];
             } else {
                 throw runtime.newErrnoENOTDIRError(dir);