jruby · Jan 19, 2015 · Jan 19, 2015 · Jan 19, 2015
Showing with 21 additions and 16 deletions.

+3 −2 core/pom.rb

+11 −11 core/pom.xml

+4 −2 core/src/main/java/org/jruby/util/URLResource.java

+2 −1 ext/pom.rb

+1 −0 ext/pom.xml
diff --git a/core/pom.rb b/core/pom.rb
@@ -61,11 +61,12 @@
   jar 'com.headius:unsafe-mock', '${unsafe.version}', :scope => 'provided'
   jar 'com.headius:jsr292-mock:1.1', :scope => 'provided'
 
+  jar 'com.headius:openjdk-truffle:0.6'
+  jar 'com.oracle:truffle-dsl-processor:0.6', :scope => 'provided'
+
   jar 'bsf:bsf:2.4.0', :scope => 'provided'
   jar 'com.jcraft:jzlib:1.1.3'
   jar 'com.martiansoftware:nailgun-server:0.9.1'
-  jar 'com.oracle:truffle:0.6'
-  jar 'com.oracle:truffle-dsl-processor:0.6', :scope => 'provided'
   jar 'junit:junit', :scope => 'test'
   jar 'org.apache.ant:ant:${ant.version}', :scope => 'provided'
   jar 'org.osgi:org.osgi.core:5.0.0', :scope => 'provided'

diff --git a/core/pom.xml b/core/pom.xml
@@ -177,6 +177,17 @@
       <version>1.1</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.headius</groupId>
+      <artifactId>openjdk-truffle</artifactId>
+      <version>0.6</version>
+    </dependency>
+    <dependency>
+      <groupId>com.oracle</groupId>
+      <artifactId>truffle-dsl-processor</artifactId>
+      <version>0.6</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>bsf</groupId>
       <artifactId>bsf</artifactId>
@@ -193,17 +204,6 @@
       <artifactId>nailgun-server</artifactId>
       <version>0.9.1</version>
     </dependency>
-    <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>truffle</artifactId>
-      <version>0.6</version>
-    </dependency>
-    <dependency>
-      <groupId>com.oracle</groupId>
-      <artifactId>truffle-dsl-processor</artifactId>
-      <version>0.6</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/core/src/main/java/org/jruby/util/URLResource.java b/core/src/main/java/org/jruby/util/URLResource.java
@@ -5,6 +5,8 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
@@ -156,8 +158,8 @@ public static FileResource createClassloaderURI(Ruby runtime, String pathname) {
         }
         try
         {
-            pathname = new NormalizedFile("/" + pathname).getCanonicalPath().substring(1);
-        } catch (IOException e) {
+            pathname = new URI(pathname.replaceFirst("^/*", "/")).normalize().getPath().replaceAll("^/([.][.]/)*", "");
+        } catch (URISyntaxException e) {
             pathname = pathname.replaceAll("^[.]?/+", "");
         }
         URL url = cl.getResource(pathname);

diff --git a/ext/pom.rb b/ext/pom.rb
@@ -11,7 +11,8 @@
               'tesla.dump.readonly' => true )
 
   modules [ 'readline',
-            'ripper' ]
+            'ripper',
+            'truffle' ]
 
   plugin( :deploy,
           'skip' =>  'true' )

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -13,6 +13,7 @@
   <modules>
     <module>readline</module>
     <module>ripper</module>
+    <module>truffle</module>
   </modules>
   <properties>
     <tesla.dump.readonly>true</tesla.dump.readonly>