Clean up slf4j build bits, eliminate ivy use (felt weird), fix NB pro…

…ject.

build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project basedir="." default="jar" name="JRuby" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project basedir="." default="jar" name="JRuby">
   <description>JRuby is a Java implementation of a Ruby runtime.</description>
 
   <!-- First try to load machine-specific properties. -->
@@ -127,7 +127,7 @@
   </target>
 
   <!-- Creates the directories needed for building -->
-  <target name="prepare" depends="init, create-dirs, copy-resources, extract-rdocs, update-constants, download-deps">
+  <target name="prepare" depends="init, create-dirs, copy-resources, extract-rdocs, update-constants">
   </target>
 
   <target name="create-dirs" unless="create-dirs.hasrun">
@@ -251,23 +251,16 @@
       <include name="org/jruby/util/CodegenUtils.java"/>
     </javac>
   </target>
-
-  <target name="download-deps" depends="install-ivy">
-    <ivy:resolve conf="default" />
-    <ivy:cachepath pathid="jruby.libs.classpath" conf="default" />
-  </target>
 
   <target name="compile" depends="compile-jruby, generate-method-classes, generate-unsafe"
           description="Compile the source files for the project.">
-
   </target>
 
   <target name="compile-jruby" depends="prepare, compile-annotation-binder" unless="compiled">    
     <apt factory="org.jruby.anno.AnnotationBinder" destdir="${jruby.classes.dir}"
         debug="true" source="${javac.version}" target="${javac.version}"
         deprecation="true" encoding="UTF-8" includeantruntime="true">
       <classpath refid="jruby.execute.classpath"/>
-      <classpath refid="jruby.libs.classpath"/>
       <src path="${src.dir}"/>
       <exclude name="org/jruby/runtime/Constants.java"/>
       <patternset refid="java.src.pattern"/>
@@ -373,6 +366,8 @@
         <zipfileset src="${build.lib.dir}/yecht.jar"/>
         <zipfileset src="${build.lib.dir}/yydebug.jar"/>
         <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
+        <zipfileset src="${build.lib.dir}/slf4j-api-1.6.1.jar"/>
+        <zipfileset src="${build.lib.dir}/slf4j-jdk14-1.6.1.jar"/>
         <metainf dir="spi">
           <include name="services/**"/>
         </metainf>
@@ -473,6 +468,8 @@
         <zipfileset src="${build.lib.dir}/yecht.jar"/>
         <zipfileset src="${build.lib.dir}/yydebug.jar"/>
         <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
+        <zipfileset src="${build.lib.dir}/slf4j-api-1.6.1.jar"/>
+        <zipfileset src="${build.lib.dir}/slf4j-jdk14-1.6.1.jar"/>
         <metainf dir="spi">
           <include name="services/**"/>
         </metainf>
@@ -631,6 +628,8 @@
       <zipfileset src="${build.lib.dir}/yecht.jar"/>
       <zipfileset src="${build.lib.dir}/yydebug.jar"/>
       <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
+      <zipfileset src="${build.lib.dir}/slf4j-api-1.6.1.jar"/>
+      <zipfileset src="${build.lib.dir}/slf4j-jdk14-1.6.1.jar"/>
       <metainf dir="spi">
         <include name="services/**"/>
       </metainf>

ivy/ivy.xml

@@ -10,8 +10,6 @@
     <artifact name="jruby-sources" />
   </publications>
   <dependencies>
-    <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="default" />
-    <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.6.1" conf="default" />
     <dependency org="com.google.code.findbugs" name="findbugs" rev="1.3.9" conf="check->*" />
   </dependencies>
 </ivy-module>

nbproject/project.xml

@@ -235,7 +235,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>${src.dir}</package-root>
-                <classpath mode="compile">build_lib/junit.jar:build_lib/jline-1.0.jar:build_lib/jna.jar:build_lib/nailgun-0.7.1.jar:build_lib/joni.jar:build_lib/dynalang-0.3.jar:build_lib/invokedynamic.jar:build_lib/jcodings.jar:build_lib/bytelist.jar:build_lib/jffi.jar:build_lib/yydebug.jar:build_lib/bsf.jar:build_lib/jaffl.jar:build_lib/jsr292-mock.jar:build_lib/jgrapht-jdk1.5.jar:build_lib/jnr-netdb.jar:build_lib/jnr-posix.jar:build_lib/joda-time-1.6.2.jar:build_lib/livetribe-jsr223-2.0.6.jar:build_lib/ant.jar:build_lib/org.osgi.core-4.2.0.jar:build_lib/snakeyaml-1.8.jar:build_lib/asm-4.0_RC1.jar:build_lib/asm-analysis-4.0_RC1.jar:build_lib/asm-commons-4.0_RC1.jar:build_lib/asm-tree-4.0_RC1.jar:build_lib/asm-util-4.0_RC1.jar:build_lib/jnr-constants.jar</classpath>
+                <classpath mode="compile">build_lib/junit.jar:build_lib/jline-1.0.jar:build_lib/jna.jar:build_lib/nailgun-0.7.1.jar:build_lib/joni.jar:build_lib/dynalang-0.3.jar:build_lib/invokedynamic.jar:build_lib/jcodings.jar:build_lib/bytelist.jar:build_lib/jffi.jar:build_lib/yydebug.jar:build_lib/bsf.jar:build_lib/jaffl.jar:build_lib/jsr292-mock.jar:build_lib/jgrapht-jdk1.5.jar:build_lib/jnr-netdb.jar:build_lib/jnr-posix.jar:build_lib/joda-time-1.6.2.jar:build_lib/livetribe-jsr223-2.0.6.jar:build_lib/ant.jar:build_lib/org.osgi.core-4.2.0.jar:build_lib/snakeyaml-1.8.jar:build_lib/asm-4.0_RC1.jar:build_lib/asm-analysis-4.0_RC1.jar:build_lib/asm-commons-4.0_RC1.jar:build_lib/asm-tree-4.0_RC1.jar:build_lib/asm-util-4.0_RC1.jar:build_lib/jnr-constants.jar:build_lib/slf4j-api-1.6.1.jar</classpath>
                 <built-to>${jruby.classes.dir}</built-to>
                 <built-to>${lib.dir}/jruby.jar</built-to>
                 <javadoc-built-to>docs/api</javadoc-built-to>

src/org/jruby/Ruby.java

@@ -168,7 +168,7 @@ public final class Ruby {
     /**
      * The logger used to log relevant bits.
      */
-    private static final Logger LOGGER = LoggerFactory.getLogger(Java.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Ruby.class);
 
     /**
      * Returns a new instance of the JRuby runtime configured with defaults.