[Join-cvs] join1/src/main/org/figure8/join/core ContainerContextLoader.java, 1.3, 1.4
Brought to you by:
lbroudoux
|
From: Laurent B. <lbr...@us...> - 2008-02-03 22:42:03
|
Update of /cvsroot/join/join1/src/main/org/figure8/join/core In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2153/core Modified Files: ContainerContextLoader.java Log Message: Fix checstyle issues Index: ContainerContextLoader.java =================================================================== RCS file: /cvsroot/join/join1/src/main/org/figure8/join/core/ContainerContextLoader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ContainerContextLoader.java 3 Jul 2006 21:58:32 -0000 1.3 --- ContainerContextLoader.java 3 Feb 2008 22:41:58 -0000 1.4 *************** *** 1,4 **** /** ! * Copyright 2005-2006 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the --- 1,4 ---- /** ! * Copyright 2005-2008 the original author or authors. * * Licensed under the Gnu General Pubic License, Version 2.0 (the *************** *** 79,92 **** * @return The newly created Join web application context */ ! protected WebApplicationContext createWebApplicationContext(ServletContext servletContext, ApplicationContext parent) throws BeansException{ // Instanciate the default implementation of app context. ConfigurableWebApplicationContext wac = (ConfigurableWebApplicationContext) BeanUtils.instantiateClass(DEFAULT_CONTEXT_CLASS); // Set its parent and servlet contexts. ! wac.setParent(parent); ! wac.setServletContext(servletContext); // Set its configuration files location. ! String configLocation = servletContext.getInitParameter(CONFIG_LOCATION_PARAM); // Check if some extra configuration files should be added. if (addingExtraConfigLocationAllowed()){ --- 79,93 ---- * @return The newly created Join web application context */ ! protected WebApplicationContext createWebApplicationContext(ServletContext servletContext, ApplicationContext parent) ! throws BeansException{ // Instanciate the default implementation of app context. ConfigurableWebApplicationContext wac = (ConfigurableWebApplicationContext) BeanUtils.instantiateClass(DEFAULT_CONTEXT_CLASS); // Set its parent and servlet contexts. ! wac.setParent(parent); ! wac.setServletContext(servletContext); // Set its configuration files location. ! String configLocation = servletContext.getInitParameter(CONFIG_LOCATION_PARAM); // Check if some extra configuration files should be added. if (addingExtraConfigLocationAllowed()){ *************** *** 96,105 **** } if (configLocation != null){ ! wac.setConfigLocations(StringUtils.tokenizeToStringArray(configLocation, ! ConfigurableWebApplicationContext.CONFIG_LOCATION_DELIMITERS)); ! } // Refresh and return. ! wac.refresh(); ! return wac; } --- 97,106 ---- } if (configLocation != null){ ! wac.setConfigLocations(StringUtils.tokenizeToStringArray(configLocation, ! ConfigurableWebApplicationContext.CONFIG_LOCATION_DELIMITERS)); ! } // Refresh and return. ! wac.refresh(); ! return wac; } |