[jboss-cvs] JBossAS SVN: r91515 - in projects/jboss-cl/branches/Trunk_VFS3: classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 21 16:54:49 EDT 2009
Author: alesj
Date: 2009-07-21 16:54:49 -0400 (Tue, 21 Jul 2009)
New Revision: 91515
Modified:
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java
projects/jboss-cl/branches/Trunk_VFS3/pom.xml
Log:
Fix VFS3 api changes.
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java 2009-07-21 20:48:04 UTC (rev 91514)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java 2009-07-21 20:54:49 UTC (rev 91515)
@@ -192,10 +192,7 @@
*/
protected VirtualFile getVirtualFile(URI uri) throws Exception
{
- if (isCacheable())
- return VFS.getRoot(uri);
- else
- return VFS.createNewRoot(uri);
+ return VFS.getRoot(uri);
}
@Override
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java 2009-07-21 20:48:04 UTC (rev 91514)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java 2009-07-21 20:54:49 UTC (rev 91515)
@@ -648,7 +648,7 @@
try
{
VirtualFile root = findRoot(path);
- URL codeSourceURL = isUseRealURL() ? VFSUtils.getRealURL(root) : root.toURL();
+ URL codeSourceURL = root.toURL();
if (log.isTraceEnabled())
log.trace("getProtectionDomain:className="+ className + " path="+ path + " codeSourceURL=" + codeSourceURL);
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java 2009-07-21 20:48:04 UTC (rev 91514)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java 2009-07-21 20:54:49 UTC (rev 91515)
@@ -27,7 +27,6 @@
import java.net.URL;
import junit.framework.Test;
-
import org.jboss.classloader.plugins.ClassLoaderUtils;
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
@@ -40,7 +39,6 @@
import org.jboss.util.id.GUID;
import org.jboss.virtual.MemoryFileFactory;
import org.jboss.virtual.VFS;
-import org.jboss.virtual.plugins.context.memory.MemoryContextFactory;
/**
* DomainUnitTestCase.
@@ -141,8 +139,7 @@
private Class<?> generateClass(ClassLoader loader, String dynamicClassRoot, GeneratedClassInfo info) throws Exception
{
URL outputURL = new URL(dynamicClassRoot + "/" + info.getResourceName());
- MemoryContextFactory factory = MemoryContextFactory.getInstance();
- factory.putFile(outputURL, info.getClassBytes());
+ MemoryFileFactory.putFile(outputURL, info.getClassBytes());
if (loader instanceof RealClassLoader)
{
@@ -154,7 +151,7 @@
private String getDynamicClassRoot() throws Exception
{
URL dynamicClassRoot = new URL("vfsmemory", GUID.asString(), "");
- MemoryFileFactory.createRoot(dynamicClassRoot).getRoot();
+ MemoryFileFactory.createRoot(dynamicClassRoot).getChild("");
return dynamicClassRoot.toString();
}
@@ -219,10 +216,8 @@
{
in.close();
}
- catch (IOException e)
+ catch (IOException ignored)
{
- // AutoGenerated
- throw new RuntimeException(e);
}
}
}
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java 2009-07-21 20:48:04 UTC (rev 91514)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java 2009-07-21 20:54:49 UTC (rev 91515)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.classloading.vfs.policy.test;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
@@ -107,22 +106,10 @@
VirtualFile[] files = new VirtualFile[urls.length];
for (int i = 0; i < urls.length; ++i)
{
- try
- {
- files[i] = base.getChild(urls[i]);
- }
- catch (IOException ignored)
- {
- }
+ files[i] = base.getChild(urls[i]);
if (files[i] == null && i > 0)
{
- try
- {
- files[i] = files[0].getChild(urls[i]);
- }
- catch (IOException ignored)
- {
- }
+ files[i] = files[0].getChild(urls[i]);
}
if (files[i] == null)
fail("Can't find " + urls[i]);
@@ -134,22 +121,10 @@
excludedFiles = new VirtualFile[excluded.length];
for (int i = 0; i < excluded.length; ++i)
{
- try
- {
- excludedFiles[i] = base.getChild(excluded[i]);
- }
- catch (IOException ignored)
- {
- }
+ excludedFiles[i] = base.getChild(excluded[i]);
if (excludedFiles[i] == null)
{
- try
- {
- excludedFiles[i] = files[0].getChild(excluded[i]);
- }
- catch (IOException ignored)
- {
- }
+ excludedFiles[i] = files[0].getChild(excluded[i]);
}
if (excludedFiles[i] == null)
fail("Can't find " + excluded[i]);
Modified: projects/jboss-cl/branches/Trunk_VFS3/pom.xml
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/pom.xml 2009-07-21 20:48:04 UTC (rev 91514)
+++ projects/jboss-cl/branches/Trunk_VFS3/pom.xml 2009-07-21 20:54:49 UTC (rev 91515)
@@ -28,7 +28,7 @@
</modules>
<properties>
- <version.jboss.vfs>2.1.2.GA</version.jboss.vfs>
+ <version.jboss.vfs>3.0.0-SNAPSHOT</version.jboss.vfs>
<version.jboss.man>2.1.1.CR1</version.jboss.man>
<version.jboss.microcontainer>2.0.7.GA</version.jboss.microcontainer>
<version.jboss.common.core>2.2.14.GA</version.jboss.common.core>
More information about the jboss-cvs-commits
mailing list