[jbehave-scm] [scm-core/jbehave-4.x][8/11] JBEHAVE-1002: Remove ResourceLoader from Configuration.

[Cristiano Gavião]

commit 5de3534fea346dc2a6ce7eb2cae58a820efbc7c0
Author:     Cristiano Gavião <cvgav...@gmail.com>
AuthorDate: Mon, 17 Mar 2014 21:24:14 -0300
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sun, 13 Apr 2014 12:48:12 +0200

    JBEHAVE-1002:   Remove ResourceLoader from Configuration.

diff --git 
a/jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java 
b/jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java
index 9684cf2..323d16f 100755
--- 
a/jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java
+++ 
b/jbehave-core/src/main/java/org/jbehave/core/configuration/Configuration.java
@@ -13,7 +13,6 @@ import org.jbehave.core.i18n.LocalizedKeywords;
 import org.jbehave.core.io.AbsolutePathCalculator;
 import org.jbehave.core.io.LoadFromClasspath;
 import org.jbehave.core.io.PathCalculator;
-import org.jbehave.core.io.ResourceLoader;
 import org.jbehave.core.io.StoryLoader;
 import org.jbehave.core.io.StoryPathResolver;
 import org.jbehave.core.io.UnderscoredCamelCaseResolver;
@@ -83,11 +82,6 @@ public abstract class Configuration {
     protected StoryLoader storyLoader;
 
     /**
-     * Loads resources content from classpath
-     */
-    protected ResourceLoader resourceLoader;
-
-    /**
      * Resolves story paths from class names using underscored camel case with
      * ".story" extension
      */
@@ -198,24 +192,10 @@ public abstract class Configuration {
                return storyParser;
        }
 
-       public ResourceLoader resourceLoader() {
-               if (resourceLoader == null) {
-                       resourceLoader = new LoadFromClasspath();
-               }
-               return resourceLoader;
-       }
-       
-       @Deprecated()
        public StoryLoader storyLoader() {
                if (storyLoader == null) {
-                       if ((resourceLoader != null)
-                                       && (resourceLoader.getClass()
-                                                       
.isAssignableFrom(StoryLoader.class))) {
-                               storyLoader = (StoryLoader) resourceLoader;
-                       } else {
                        storyLoader = new LoadFromClasspath();
                }
-               }
                return storyLoader;
        }
     
@@ -366,11 +346,6 @@ public abstract class Configuration {
         return this;
     }
     
-    public Configuration useResourceLoader(ResourceLoader resourceLoader) {
-       this.resourceLoader = resourceLoader;
-       return this;
-    }
-    
     public Configuration useStoryPathResolver(StoryPathResolver 
storyPathResolver) {
         this.storyPathResolver = storyPathResolver;
         return this;