Move iconv bits under org.jruby.ext.iconv.

rkh · Sep 12, 2011 · 4d7b234 · 4d7b234
1 parent bc21084
commit 4d7b234
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/org/jruby/Ruby.java b/src/org/jruby/Ruby.java
@@ -1454,7 +1454,7 @@ private void initBuiltins() {
         addLazyBuiltin("jruby_ext.jar", "jruby", "org.jruby.ext.jruby.JRubyLibrary");
         addLazyBuiltin("jruby/util.rb", "jruby/util", "org.jruby.ext.jruby.JRubyUtilLibrary");
         addLazyBuiltin("jruby/type.rb", "jruby/type", "org.jruby.ext.jruby.JRubyTypeLibrary");
-        addLazyBuiltin("iconv.jar", "iconv", "org.jruby.libraries.IConvLibrary");
+        addLazyBuiltin("iconv.jar", "iconv", "org.jruby.ext.iconv.IConvLibrary");
         addLazyBuiltin("nkf.jar", "nkf", "org.jruby.ext.nkf.NKFLibrary");
         addLazyBuiltin("stringio.jar", "stringio", "org.jruby.libraries.StringIOLibrary");
         addLazyBuiltin("strscan.jar", "strscan", "org.jruby.libraries.StringScannerLibrary");

diff --git a/src/org/jruby/ext/iconv/IConvLibrary.java b/src/org/jruby/ext/iconv/IConvLibrary.java
@@ -25,12 +25,11 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/
-package org.jruby.libraries;
+package org.jruby.ext.iconv;
 
 import java.io.IOException;
 
 import org.jruby.Ruby;
-import org.jruby.RubyIconv;
 import org.jruby.runtime.load.Library;
 
 public class IConvLibrary implements Library {

diff --git a/src/org/jruby/ext/iconv/RubyIconv.java b/src/org/jruby/ext/iconv/RubyIconv.java
@@ -26,7 +26,7 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/
-package org.jruby;
+package org.jruby.ext.iconv;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -41,6 +41,15 @@
 import java.nio.charset.UnsupportedCharsetException;
 import org.jcodings.Encoding;
 import org.jcodings.EncodingDB;
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyException;
+import org.jruby.RubyHash;
+import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
 
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;