[jboss-cvs] JBossAS SVN: r88887 - in projects/spring-int/trunk: vfs/src/main/java/org/jboss/spring/vfs and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 14 14:39:30 EDT 2009
Author: alesj
Date: 2009-05-14 14:39:30 -0400 (Thu, 14 May 2009)
New Revision: 88887
Modified:
projects/spring-int/trunk/deployers/src/main/java/org/jboss/spring/factory/VFSClassPathXmlApplicationContext.java
projects/spring-int/trunk/deployers/src/main/java/org/jboss/spring/factory/VFSXmlWebApplicationContext.java
projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResource.java
projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResourcePatternResolver.java
projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResourcePatternResolvingHelper.java
Log:
Code layout.
Modified: projects/spring-int/trunk/deployers/src/main/java/org/jboss/spring/factory/VFSClassPathXmlApplicationContext.java
===================================================================
--- projects/spring-int/trunk/deployers/src/main/java/org/jboss/spring/factory/VFSClassPathXmlApplicationContext.java 2009-05-14 18:21:07 UTC (rev 88886)
+++ projects/spring-int/trunk/deployers/src/main/java/org/jboss/spring/factory/VFSClassPathXmlApplicationContext.java 2009-05-14 18:39:30 UTC (rev 88887)
@@ -35,59 +35,67 @@
*
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
-public class VFSClassPathXmlApplicationContext extends ClassPathXmlApplicationContext
+public class VFSClassPathXmlApplicationContext extends ClassPathXmlApplicationContext
{
- public VFSClassPathXmlApplicationContext() {
- super();
- }
+ public VFSClassPathXmlApplicationContext()
+ {
+ super();
+ }
- public VFSClassPathXmlApplicationContext(ApplicationContext parent) {
- super(parent);
- }
+ public VFSClassPathXmlApplicationContext(ApplicationContext parent)
+ {
+ super(parent);
+ }
- public VFSClassPathXmlApplicationContext(String configLocation) throws BeansException {
- super(configLocation);
- }
+ public VFSClassPathXmlApplicationContext(String configLocation) throws BeansException
+ {
+ super(configLocation);
+ }
- public VFSClassPathXmlApplicationContext(String[] configLocations) throws BeansException {
- super(configLocations);
- }
+ public VFSClassPathXmlApplicationContext(String[] configLocations) throws BeansException
+ {
+ super(configLocations);
+ }
- public VFSClassPathXmlApplicationContext(String[] configLocations, ApplicationContext parent) throws BeansException {
- super(configLocations, parent);
- }
+ public VFSClassPathXmlApplicationContext(String[] configLocations, ApplicationContext parent) throws BeansException
+ {
+ super(configLocations, parent);
+ }
- public VFSClassPathXmlApplicationContext(String[] configLocations, boolean refresh) throws BeansException {
- super(configLocations, refresh);
- }
+ public VFSClassPathXmlApplicationContext(String[] configLocations, boolean refresh) throws BeansException
+ {
+ super(configLocations, refresh);
+ }
- public VFSClassPathXmlApplicationContext(String[] configLocations, boolean refresh, ApplicationContext parent) throws BeansException {
- super(configLocations, refresh, parent);
- }
+ public VFSClassPathXmlApplicationContext(String[] configLocations, boolean refresh, ApplicationContext parent) throws BeansException
+ {
+ super(configLocations, refresh, parent);
+ }
- public VFSClassPathXmlApplicationContext(String path, Class clazz) throws BeansException {
- super(path, clazz);
- }
+ public VFSClassPathXmlApplicationContext(String path, Class clazz) throws BeansException
+ {
+ super(path, clazz);
+ }
- public VFSClassPathXmlApplicationContext(String[] paths, Class clazz) throws BeansException {
- super(paths, clazz);
- }
+ public VFSClassPathXmlApplicationContext(String[] paths, Class clazz) throws BeansException
+ {
+ super(paths, clazz);
+ }
- public VFSClassPathXmlApplicationContext(String[] paths, Class clazz, ApplicationContext parent) throws BeansException {
- super(paths, clazz, parent);
- }
+ public VFSClassPathXmlApplicationContext(String[] paths, Class clazz, ApplicationContext parent) throws BeansException
+ {
+ super(paths, clazz, parent);
+ }
+ protected ResourcePatternResolver getResourcePatternResolver()
+ {
+ return new VFSResourcePatternResolver(new VFSResourceLoader(getClassLoader()));
+ }
- protected ResourcePatternResolver getResourcePatternResolver()
- {
- return new VFSResourcePatternResolver(new VFSResourceLoader(getClassLoader()));
- }
-
- @Override
- public Resource getResource(String location)
- {
- return getResourcePatternResolver().getResource(location);
- }
-
+ @Override
+ public Resource getResource(String location)
+ {
+ return getResourcePatternResolver().getResource(location);
+ }
}
Modified: projects/spring-int/trunk/deployers/src/main/java/org/jboss/spring/factory/VFSXmlWebApplicationContext.java
===================================================================
--- projects/spring-int/trunk/deployers/src/main/java/org/jboss/spring/factory/VFSXmlWebApplicationContext.java 2009-05-14 18:21:07 UTC (rev 88886)
+++ projects/spring-int/trunk/deployers/src/main/java/org/jboss/spring/factory/VFSXmlWebApplicationContext.java 2009-05-14 18:39:30 UTC (rev 88887)
@@ -36,7 +36,6 @@
*/
public class VFSXmlWebApplicationContext extends XmlWebApplicationContext
{
-
@Override
protected ResourcePatternResolver getResourcePatternResolver()
{
Modified: projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResource.java
===================================================================
--- projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResource.java 2009-05-14 18:21:07 UTC (rev 88886)
+++ projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResource.java 2009-05-14 18:39:30 UTC (rev 88887)
@@ -57,7 +57,8 @@
try
{
this.file = VFS.getRoot(url);
- } catch (IOException e)
+ }
+ catch (IOException e)
{
throw new IllegalArgumentException("Cannot retrieve file from URL: ", e);
}
@@ -179,19 +180,22 @@
return getDescription();
}
- @Override
- public boolean equals(Object other) {
+ @Override
+ public boolean equals(Object other)
+ {
if (other instanceof VFSResource)
{
return file.equals(((VFSResource)other).file);
- } else
+ }
+ else
{
return false;
}
- }
+ }
- @Override
- public int hashCode() {
+ @Override
+ public int hashCode()
+ {
return file.hashCode();
- }
+ }
}
Modified: projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResourcePatternResolver.java
===================================================================
--- projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResourcePatternResolver.java 2009-05-14 18:21:07 UTC (rev 88886)
+++ projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResourcePatternResolver.java 2009-05-14 18:39:30 UTC (rev 88887)
@@ -22,11 +22,7 @@
package org.jboss.spring.vfs;
import java.io.IOException;
-import java.net.URL;
-import java.util.Set;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -52,7 +48,7 @@
String rootDirPath = determineRootDir(locationPattern);
return VFSResourcePatternResolvingHelper.locateResources(locationPattern, rootDirPath, getClassLoader(), getPathMatcher(), false);
}
- if (locationPattern.startsWith(CLASSPATH_URL_PREFIX))
+ else if (locationPattern.startsWith(CLASSPATH_URL_PREFIX))
{
locationPattern = locationPattern.substring(CLASSPATH_URL_PREFIX.length());
String rootDirPath = determineRootDir(locationPattern);
@@ -63,5 +59,4 @@
return super.findPathMatchingResources(locationPattern);
}
}
-
}
\ No newline at end of file
Modified: projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResourcePatternResolvingHelper.java
===================================================================
--- projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResourcePatternResolvingHelper.java 2009-05-14 18:21:07 UTC (rev 88886)
+++ projects/spring-int/trunk/vfs/src/main/java/org/jboss/spring/vfs/VFSResourcePatternResolvingHelper.java 2009-05-14 18:39:30 UTC (rev 88887)
@@ -45,7 +45,6 @@
*/
public class VFSResourcePatternResolvingHelper
{
-
private static Logger log = Logger.getLogger(VFSResourcePatternResolvingHelper.class);
public static Resource[] locateResources(String locationPattern, String rootDirPath, ClassLoader classLoader,
More information about the jboss-cvs-commits
mailing list