Moving JavaSupport files into site_ruby/1.8/builtin, so they can be t…

…weaked by intrepid users and indexed by tools like NetBeans. git-svn-id: http://svn.codehaus.org/jruby/branches/jruby-1_0@4800 961051c9-f516-0410-bf72-c9f7e237a7b7
jruby · Oct 30, 2007 · f2ce942 · f2ce942
1 parent 75a46fc
commit f2ce942
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 1 deletion.
diff --git a/build.xml b/build.xml
@@ -97,6 +97,11 @@
             <include name="**/*.rb"/>
         </fileset>
     </copy>
+    <copy todir="${jruby.classes.dir}/builtin">
+        <fileset dir="${lib.dir}/ruby/site_ruby/1.8/builtin">
+            <include name="**/*.rb"/>
+        </fileset>
+    </copy>
 
     <tstamp>
         <format property="build.date" pattern="yyyy-MM-dd"/>

diff --git a/src/builtin/java/collections.rb → ...site_ruby/1.8/builtin/java/collections.rb b/src/builtin/java/collections.rb → ...site_ruby/1.8/builtin/java/collections.rb
diff --git a/src/builtin/java/exceptions.rb → .../site_ruby/1.8/builtin/java/exceptions.rb b/src/builtin/java/exceptions.rb → .../site_ruby/1.8/builtin/java/exceptions.rb
diff --git a/src/builtin/java/interfaces.rb → .../site_ruby/1.8/builtin/java/interfaces.rb b/src/builtin/java/interfaces.rb → .../site_ruby/1.8/builtin/java/interfaces.rb
diff --git a/src/builtin/javasupport.rb → ...ruby/site_ruby/1.8/builtin/javasupport.rb b/src/builtin/javasupport.rb → ...ruby/site_ruby/1.8/builtin/javasupport.rb
diff --git a/src/builtin/javasupport/core_ext.rb → ..._ruby/1.8/builtin/javasupport/core_ext.rb b/src/builtin/javasupport/core_ext.rb → ..._ruby/1.8/builtin/javasupport/core_ext.rb
diff --git a/src/builtin/javasupport/core_ext/array.rb → ...1.8/builtin/javasupport/core_ext/array.rb b/src/builtin/javasupport/core_ext/array.rb → ...1.8/builtin/javasupport/core_ext/array.rb
diff --git a/src/builtin/javasupport/core_ext/kernel.rb → ....8/builtin/javasupport/core_ext/kernel.rb b/src/builtin/javasupport/core_ext/kernel.rb → ....8/builtin/javasupport/core_ext/kernel.rb
diff --git a/src/builtin/javasupport/core_ext/module.rb → ....8/builtin/javasupport/core_ext/module.rb b/src/builtin/javasupport/core_ext/module.rb → ....8/builtin/javasupport/core_ext/module.rb
diff --git a/src/builtin/javasupport/core_ext/object.rb → ....8/builtin/javasupport/core_ext/object.rb b/src/builtin/javasupport/core_ext/object.rb → ....8/builtin/javasupport/core_ext/object.rb
diff --git a/src/builtin/javasupport/core_ext/string.rb → ....8/builtin/javasupport/core_ext/string.rb b/src/builtin/javasupport/core_ext/string.rb → ....8/builtin/javasupport/core_ext/string.rb
diff --git a/src/builtin/javasupport/java.rb → ...site_ruby/1.8/builtin/javasupport/java.rb b/src/builtin/javasupport/java.rb → ...site_ruby/1.8/builtin/javasupport/java.rb
diff --git a/src/builtin/javasupport/proxy/array.rb → ...by/1.8/builtin/javasupport/proxy/array.rb b/src/builtin/javasupport/proxy/array.rb → ...by/1.8/builtin/javasupport/proxy/array.rb
diff --git a/src/builtin/javasupport/proxy/base.rb → ...uby/1.8/builtin/javasupport/proxy/base.rb b/src/builtin/javasupport/proxy/base.rb → ...uby/1.8/builtin/javasupport/proxy/base.rb
diff --git a/src/builtin/javasupport/proxy/concrete.rb → ...1.8/builtin/javasupport/proxy/concrete.rb b/src/builtin/javasupport/proxy/concrete.rb → ...1.8/builtin/javasupport/proxy/concrete.rb
diff --git a/src/builtin/javasupport/proxy/interface.rb → ....8/builtin/javasupport/proxy/interface.rb b/src/builtin/javasupport/proxy/interface.rb → ....8/builtin/javasupport/proxy/interface.rb
diff --git a/src/builtin/javasupport/utilities/array.rb → ....8/builtin/javasupport/utilities/array.rb b/src/builtin/javasupport/utilities/array.rb → ....8/builtin/javasupport/utilities/array.rb
diff --git a/src/builtin/javasupport/utilities/base.rb → ...1.8/builtin/javasupport/utilities/base.rb b/src/builtin/javasupport/utilities/base.rb → ...1.8/builtin/javasupport/utilities/base.rb
diff --git a/src/org/jruby/Ruby.java b/src/org/jruby/Ruby.java
@@ -659,7 +659,7 @@ private void initLibraries() {
         registerBuiltin("java.rb", new Library() {
                 public void load(Ruby runtime) throws IOException {
                     Java.createJavaModule(runtime);
-                    new BuiltinScript("javasupport").load(runtime);
+                    runtime.getLoadService().smartLoad("builtin/javasupport");
                     RubyClassPathVariable.createClassPathVariable(runtime);
                 }
             });