Author: saminda Date: Fri Jun 6 20:53:02 2008 New Revision: 18095 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18095
Log: This release of WSAS uses Spring 2.5.1. This has undergone major API changes and changed the code to tally with it Modified: branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java Modified: branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java?rev=18095&r1=18094&r2=18095&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java (original) +++ branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java Fri Jun 6 20:53:02 2008 @@ -1791,7 +1791,7 @@ throw new AxisFault( "Cannot load Spring beans. Please check the Spring context " + "configuration file and verify that the defined Spring beans exist" - + " in the .jar file."); + + " in the .jar file.", e); } return data; } Modified: branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java?rev=18095&r1=18094&r2=18095&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java (original) +++ branches/wsas/java/2.3/wsas/modules/admin/src/org/wso2/wsas/admin/service/util/GenericApplicationContextUtil.java Fri Jun 6 20:53:02 2008 @@ -41,24 +41,19 @@ File urlFile = new File(springBeansFilePath); ClassLoader prevCl = Thread.currentThread().getContextClassLoader(); - ClassLoader urlCl; try { URL url = urlFile.toURL(); - urlCl = URLClassLoader.newInstance(new URL[]{url}, prevCl); + ClassLoader urlCl = URLClassLoader.newInstance(new URL[]{url}, prevCl); - // Save the class loader so that you can restore it later - Thread.currentThread() - .setContextClassLoader(urlCl); XmlBeanDefinitionReader xbdr = new XmlBeanDefinitionReader(appContext); - xbdr.setValidating(false); + xbdr.setBeanClassLoader(urlCl); + xbdr.setValidationMode(0); xbdr.loadBeanDefinitions(new InputStreamResource(applicationContxtInStream)); appContext.refresh(); } catch (MalformedURLException e) { throw AxisFault.makeFault(e); - } finally { - // Restore - Thread.currentThread().setContextClassLoader(prevCl); } + return appContext; } _______________________________________________ Wsas-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
