Explicit inclusion of 'peel-core.xml' and 'peel-extensions.xml'.

peelframework · Sep 4, 2015 · d475809 · d475809
1 parent 1fd59cb
commit d475809
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/peel-core/src/main/scala/org/peelframework/core/PeelApplicationContext.scala b/peel-core/src/main/scala/org/peelframework/core/PeelApplicationContext.scala
@@ -31,9 +31,7 @@ object PeelApplicationContext {
   def apply(experimentsXMLPath: Option[String] = None): ApplicationContext = {
     // construct classpath
     val cp = Array(
-      Option(getClass.getResource("/peel-core.xml")) /* */ map { x => s"classpath:${lastPartOf(x)}" },
-      Option(getClass.getResource("/peel-extensions.xml")) map { x => s"classpath:${lastPartOf(x)}" },
-      experimentsXMLPath /*                             */ map { x => s"file:$x" }
+      experimentsXMLPath map { x => s"file:$x" }
     ).flatten
     // construct and return application context
     val ac = new ClassPathXmlApplicationContext(cp, true)

diff --git a/peel-empty-bundle/src/main/resources/config/experiments.xml b/peel-empty-bundle/src/main/resources/config/experiments.xml
@@ -3,6 +3,10 @@
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
+    <!-- Peel configuratoins -->
+    <import resource="classpath:peel-core.xml"/>
+    <import resource="classpath:peel-extensions.xml"/>
+
     <!-- custom system beans -->
     <import resource="systems.xml"/>
     <!-- wordcount experiment beans -->