[waffle-scm] [809] trunk/waffle-ruby/src/test/java/org/codehaus/waffle/context/pico: Refactored ruby script env values to be self contained.

[mauro]

Title: [waffle-scm] [809] trunk/waffle-ruby/src/test/java/org/codehaus/waffle/context/pico: Refactored ruby script env values to be self contained.

Revision

809

Author

mauro

Date

2008-09-03 10:00:03 -0500 (Wed, 03 Sep 2008)

Log Message

Refactored ruby script env values to be self contained. 

Modified Paths

• trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyScriptLoader.java
• trunk/waffle-ruby/src/test/java/org/codehaus/waffle/context/pico/RubyScriptLoaderTest.java

Diff

Modified: trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyScriptLoader.java (808 => 809)

--- trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyScriptLoader.java	2008-09-03 14:44:45 UTC (rev 808)
+++ trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyScriptLoader.java	2008-09-03 15:00:03 UTC (rev 809)
@@ -3,8 +3,6 @@
  */
 package org.codehaus.waffle.context.pico;
 
-import static java.text.MessageFormat.format;
-
 import javax.servlet.ServletContext;
 
 import org.codehaus.waffle.Startable;
@@ -24,7 +22,6 @@
     public static final String DEFAULT_RUBY_SCRIPT_PATH = "/WEB-INF/classes/ruby/";
     public static final String RUBY_SCRIPT_PATH_KEY = "org.codehaus.waffle.ruby.path";
     public static final String RUBY_SCRIPT_ENV_KEY = "org.codehaus.waffle.ruby.env";
-    public static final String RUBY_SCRIPT_ENV_PATH_FORMAT = "dir:{0}";
 
     private final ServletContext servletContext;
     private final Ruby runtime;
@@ -45,7 +42,7 @@
                 // env not defined, return default
                 return DEFAULT_RUBY_SCRIPT_PATH;
             }
-            path = format(RUBY_SCRIPT_ENV_PATH_FORMAT, env);
+            path = env;
         }
         return path;
     }

Modified: trunk/waffle-ruby/src/test/java/org/codehaus/waffle/context/pico/RubyScriptLoaderTest.java (808 => 809)

--- trunk/waffle-ruby/src/test/java/org/codehaus/waffle/context/pico/RubyScriptLoaderTest.java	2008-09-03 14:44:45 UTC (rev 808)
+++ trunk/waffle-ruby/src/test/java/org/codehaus/waffle/context/pico/RubyScriptLoaderTest.java	2008-09-03 15:00:03 UTC (rev 809)
@@ -29,8 +29,7 @@
 
     @Test
     public void canLoadScriptsFromScriptEnvIntoRubyRuntime() {
-        String home = System.getenv("HOME");
-        assertScriptPath(null, "HOME", "dir:"+home);
+        assertScriptPath(null, "HOME", System.getenv("HOME"));
     }
 
     private void assertScriptPath(final String rubyScriptPath, final String rubyScriptEnv, String expectedPath) {

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email