Move 'jruby/serialization' library under org.jruby.ext.jruby

rkh · Sep 12, 2011 · c49e012 · c49e012
1 parent 17b117b
commit c49e012
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/org/jruby/Ruby.java b/src/org/jruby/Ruby.java
@@ -1479,7 +1479,7 @@ private void initBuiltins() {
         addLazyBuiltin("timeout.rb", "timeout", "org.jruby.ext.timeout.Timeout");
         addLazyBuiltin("socket.jar", "socket", "org.jruby.ext.socket.SocketLibrary");
         addLazyBuiltin("rbconfig.rb", "rbconfig", "org.jruby.ext.rbconfig.RbConfigLibrary");
-        addLazyBuiltin("jruby/serialization.rb", "serialization", "org.jruby.libraries.JRubySerializationLibrary");
+        addLazyBuiltin("jruby/serialization.rb", "serialization", "org.jruby.ext.jruby.JRubySerializationLibrary");
         addLazyBuiltin("ffi-internal.jar", "ffi-internal", "org.jruby.ext.ffi.FFIService");
         addLazyBuiltin("tempfile.rb", "tempfile", "org.jruby.libraries.TempfileLibrary");
         addLazyBuiltin("fcntl.rb", "fcntl", "org.jruby.libraries.FcntlLibrary");

diff --git a/...jruby/util/io/JRubyObjectInputStream.java → ...uby/ext/jruby/JRubyObjectInputStream.java b/...jruby/util/io/JRubyObjectInputStream.java → ...uby/ext/jruby/JRubyObjectInputStream.java
@@ -1,4 +1,4 @@
-package org.jruby.util.io;
+package org.jruby.ext.jruby;
 
 import java.io.InputStream;
 import java.io.ObjectInputStream;

diff --git a/.../libraries/JRubySerializationLibrary.java → .../ext/jruby/JRubySerializationLibrary.java b/.../libraries/JRubySerializationLibrary.java → .../ext/jruby/JRubySerializationLibrary.java
@@ -1,12 +1,11 @@
-package org.jruby.libraries;
+package org.jruby.ext.jruby;
 
 import org.jruby.Ruby;
-import org.jruby.util.io.JRubyObjectInputStream;
 import org.jruby.runtime.load.Library;
 import java.io.IOException;
 
 public class JRubySerializationLibrary implements Library {
     public void load(Ruby runtime, boolean wrap) throws IOException {
-	JRubyObjectInputStream.createJRubyObjectInputStream(runtime);
+        JRubyObjectInputStream.createJRubyObjectInputStream(runtime);
     }
 }