Use Activator's classloader

[gpl/argeo-slc.git] / sandbox / argeo.slc.jemmytest / src / main / java / org / argeo / slc / jemmytest / JemmyTestActivator.java

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
index 5a06369c72331c05ba182521d888dbbe51345427..c8c0e357c3cf4ee4407661a0d33c6fb6a9b63c2d 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
@@ -12,22 +12,22 @@ public class JemmyTestActivator implements BundleActivator {
        private AbstractApplicationContext applicationContext;
 
        public void start(BundleContext context) throws Exception {
-               // ClassLoader classLoader = context.getBundle().getClass()
-               // .getClassLoader();
-               //
-               // Thread cur = Thread.currentThread();
-               // ClassLoader save = cur.getContextClassLoader();
-               // cur.setContextClassLoader(classLoader);
-               //
-               // try {
-               // // FIXME: make it more generic
-               // applicationContext = new ClassPathXmlApplicationContext(
-               // "/slc/conf/applicationContext.xml");
-               // } catch (Exception e) {
-               // throw new Exception("Could not initialize application context", e);
-               // } finally {
-               // cur.setContextClassLoader(save);
-               // }
+               ClassLoader classLoader = getClass().getClassLoader();
+
+               Thread cur = Thread.currentThread();
+               ClassLoader save = cur.getContextClassLoader();
+               cur.setContextClassLoader(classLoader);
+
+               try {
+                       // FIXME: make it more generic
+                       applicationContext = new ClassPathXmlApplicationContext(
+                                       "/slc/conf/applicationContext.xml");
+               } catch (Exception e) {
+                       e.printStackTrace();
+                       throw new Exception("Could not initialize application context");
+               } finally {
+                       cur.setContextClassLoader(save);
+               }
 
                // applicationContext = new GenericApplicationContext();
                // XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(
@@ -43,10 +43,10 @@ public class JemmyTestActivator implements BundleActivator {
                // }
 
                Properties properties = new Properties();
-               AutoUiApplicationJemmy applicationJemmy = new AutoUiApplicationJemmy();
-               // AutoUiApplicationJemmy applicationJemmy = (AutoUiApplicationJemmy)
-               // applicationContext
-               // .getBean("jemmyTest");
+               // AutoUiApplicationJemmy applicationJemmy = new
+               // AutoUiApplicationJemmy();
+               AutoUiApplicationJemmy applicationJemmy = (AutoUiApplicationJemmy) applicationContext
+                               .getBean("jemmyTest");
                context.registerService(AutoUiApplication.class.getName(),
                                applicationJemmy, properties);
                stdOut("JemmyTest started");