[servicemix-scm] Corrected the classloader

[pdodds]

Commit in servicemix/tooling/servicemix-client on MAIN
src/main/java/org/servicemix/client/SpringBuilder.java	+15	-3	1.1 -> 1.2
project.xml	+1	-1	1.1 -> 1.2
	+16	-4

2 modified files

Corrected the classloader

---

servicemix/tooling/servicemix-client/src/main/java/org/servicemix/client

SpringBuilder.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- SpringBuilder.java	18 Aug 2005 17:19:36 -0000	1.1
+++ SpringBuilder.java	19 Aug 2005 15:20:38 -0000	1.2
@@ -43,7 +43,7 @@

 	 * @return True if META-INF/spring-jbi.xml exists
 	 */
 	public static boolean hasSpringXml(String installationRoot) {

-		return new File(installationRoot + "/META-INF", SPRING_CONFIG).exists();

+		return getSpringConfigFile(installationRoot).exists();

 	}
 
 	/**

@@ -54,8 +54,20 @@

 	 * @return The generated ApplicationContext from Spring
 	 */
 	public static ApplicationContext getSpringBeans(String installationRoot) {

-		ApplicationContext context = new FileSystemXmlApplicationContext(
-				installationRoot + "/META-INF/" + SPRING_CONFIG);

+		Thread.currentThread().setContextClassLoader(
+				SpringBuilder.class.getClassLoader());
+		FileSystemXmlApplicationContext context = new FileSystemXmlApplicationContext(
+				getSpringConfigFile(installationRoot).getAbsolutePath());

 		return context;

+	}
+
+	/**
+	 * Helper method that creates a Java File object pointing at the config file
+	 * 
+	 * @param installationRoot
+	 * @return
+	 */
+	private static File getSpringConfigFile(String installationRoot) {
+		return new File(installationRoot + "/META-INF", SPRING_CONFIG);

 	}
 }

---

servicemix/tooling/servicemix-client

project.xml 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- project.xml	18 Aug 2005 17:19:36 -0000	1.1
+++ project.xml	19 Aug 2005 15:20:38 -0000	1.2
@@ -27,7 +27,7 @@

 	<dependencies>
 		<dependency>
 			<id>servicemix</id>

-			<version>1.0-SNAPSHOT</version>

+			<version>1.0</version>

 			<type>jar</type>
 			<url>http://www.servicemix.org</url>
 		</dependency>

CVSspam 0.2.8