[jboss-cvs] JBossAS SVN: r80723 - in trunk: server/src/main/org/jboss/deployment and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Nov 9 10:33:24 EST 2008
Author: alesj
Date: 2008-11-09 10:33:23 -0500 (Sun, 09 Nov 2008)
New Revision: 80723
Modified:
trunk/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java
trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
trunk/spring-int/src/main/org/jboss/spring/io/VFSResourceLoader.java
trunk/spring-int/src/main/org/jboss/spring/io/VFSResourcePatternResolver.java
trunk/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java
trunk/system/src/main/org/jboss/system/server/profile/repository/ProfileImpl.java
trunk/system/src/main/org/jboss/system/server/profileservice/VFSScanner.java
trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
Log:
Use VFS::getCachedFile instead of VFS::getRoot, where it makes sense.
Modified: trunk/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java
===================================================================
--- trunk/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java 2008-11-09 14:44:36 UTC (rev 80722)
+++ trunk/hibernate-int/src/main/org/jboss/hibernate/jmx/Hibernate.java 2008-11-09 15:33:23 UTC (rev 80723)
@@ -265,7 +265,7 @@
if (harUrl == null)
throw new IllegalArgumentException("Must set one of the resources, root or harUrl: " + this);
- root = VFS.getRoot(harUrl);
+ root = VFS.getCachedFile(harUrl);
}
HibernateMappingVisitor visitor = new HibernateMappingVisitor();
Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java 2008-11-09 14:44:36 UTC (rev 80722)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbParsingDeployer.java 2008-11-09 15:33:23 UTC (rev 80723)
@@ -132,7 +132,7 @@
standardJBossXmlPath = new URL(configUrl, "standardjboss.xml");
}
- VirtualFile stdJBoss = VFS.getRoot(standardJBossXmlPath);
+ VirtualFile stdJBoss = VFS.getCachedFile(standardJBossXmlPath);
if (stdJBoss == null && ignoreMissingStandardJBossXml == false)
{
throw new DeploymentException("standardjboss.xml not found in config dir: " + standardJBossXmlPath);
Modified: trunk/spring-int/src/main/org/jboss/spring/io/VFSResourceLoader.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/io/VFSResourceLoader.java 2008-11-09 14:44:36 UTC (rev 80722)
+++ trunk/spring-int/src/main/org/jboss/spring/io/VFSResourceLoader.java 2008-11-09 15:33:23 UTC (rev 80723)
@@ -59,7 +59,7 @@
{
// Try to parse the location as a URL...
URL url = new URL(location);
- VirtualFile file = VFS.getRoot(url);
+ VirtualFile file = VFS.getCachedFile(url);
return new VFSResource(file);
}
catch (Exception ex)
Modified: trunk/spring-int/src/main/org/jboss/spring/io/VFSResourcePatternResolver.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/io/VFSResourcePatternResolver.java 2008-11-09 14:44:36 UTC (rev 80722)
+++ trunk/spring-int/src/main/org/jboss/spring/io/VFSResourcePatternResolver.java 2008-11-09 15:33:23 UTC (rev 80723)
@@ -82,7 +82,7 @@
protected List<Resource> getVFSResources(URL rootURL, String subPattern) throws IOException
{
log.debug("Scanning url: " + rootURL + ", sub-pattern: " + subPattern);
- VirtualFile root = VFS.getRoot(rootURL);
+ VirtualFile root = VFS.getCachedFile(rootURL);
PatternVirtualFileVisitor visitor = new PatternVirtualFileVisitor(subPattern);
root.visit(visitor);
if (log.isTraceEnabled())
@@ -94,7 +94,7 @@
{
try
{
- VirtualFile file = VFS.getRoot(url);
+ VirtualFile file = VFS.getCachedFile(url);
return new VFSResource(file);
}
catch (IOException e)
Modified: trunk/system/src/main/org/jboss/system/server/profile/repository/ProfileImpl.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/repository/ProfileImpl.java 2008-11-09 14:44:36 UTC (rev 80722)
+++ trunk/system/src/main/org/jboss/system/server/profile/repository/ProfileImpl.java 2008-11-09 15:33:23 UTC (rev 80723)
@@ -106,8 +106,7 @@
throws Exception
{
URI uri = repository.getDeploymentURI(phase);
- VirtualFile root = VFS.getRoot(uri);
- return root;
+ return VFS.getRoot(uri);
}
public Collection<VFSDeployment> getDeployments(DeploymentPhase phase)
Modified: trunk/system/src/main/org/jboss/system/server/profileservice/VFSScanner.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/VFSScanner.java 2008-11-09 14:44:36 UTC (rev 80722)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/VFSScanner.java 2008-11-09 15:33:23 UTC (rev 80723)
@@ -68,7 +68,7 @@
private List<URI> uriList = new CopyOnWriteArrayList<URI>();
/** The list of VirtualFiles to scan */
- private List<VirtualFile> vdfList = new CopyOnWriteArrayList<VirtualFile>();;
+ private List<VirtualFile> vdfList = new CopyOnWriteArrayList<VirtualFile>();
/** Allow a filter for scanned directories */
private VirtualFileFilter filter;
@@ -587,5 +587,4 @@
{
return VFS.getCachedFile(uri);
}
-
}
Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java 2008-11-09 14:44:36 UTC (rev 80722)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java 2008-11-09 15:33:23 UTC (rev 80723)
@@ -773,7 +773,7 @@
dir = applicationVFCache.get(uriString);
if (dir == null)
{
- dir = VFS.getRoot(uri);
+ dir = VFS.getCachedFile(uri);
applicationVFCache.put(uriString, dir);
}
}
Modified: trunk/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java 2008-11-09 14:44:36 UTC (rev 80722)
+++ trunk/system-jmx/src/main/org/jboss/system/server/jmx/JMXKernel.java 2008-11-09 15:33:23 UTC (rev 80723)
@@ -503,7 +503,7 @@
for (int i = 0; i < list.size(); ++i)
{
URL url = list.get(i);
- files[i] = VFS.getRoot(url);
+ files[i] = VFS.getCachedFile(url);
}
VFSClassLoaderPolicy policy = new VFSClassLoaderPolicy(files);
More information about the jboss-cvs-commits
mailing list