[jboss-cvs] JBossAS SVN: r95241 - in projects/jboss-cl/branches/Trunk_VFS3: classloader and 16 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 20 23:21:21 EDT 2009
Author: jason.greene at jboss.com
Date: 2009-10-20 23:21:20 -0400 (Tue, 20 Oct 2009)
New Revision: 95241
Modified:
projects/jboss-cl/branches/Trunk_VFS3/classloader/.classpath
projects/jboss-cl/branches/Trunk_VFS3/classloader/.settings/org.eclipse.jdt.core.prefs
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.classpath
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.project
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.settings/org.eclipse.jdt.core.prefs
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/PackageVisitor.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceContext.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java
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/metadata/package-info.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/ClassLoadingVFSTestSuite.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/client/test/ClientClassPathUnitTestCase.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTest.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/metadata/test/VFSResourceVisitorUnitTestCase.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/NoopClassLoaderFactory.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/package-info.java
projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/test/NoopClassLoaderFactoryXMLUnitTestCase.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/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java
projects/jboss-cl/branches/Trunk_VFS3/classloading/.classpath
projects/jboss-cl/branches/Trunk_VFS3/classloading/.settings/org.eclipse.jdt.core.prefs
projects/jboss-cl/branches/Trunk_VFS3/pom.xml
Log:
Update to latest VFS version
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloader/.classpath
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloader/.classpath 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloader/.classpath 2009-10-21 03:21:20 UTC (rev 95241)
@@ -4,17 +4,21 @@
<classpathentry kind="src" path="src/test/resources" output="target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.2.0.CR1/jboss-logging-spi-2.2.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.2.0.CR1/jboss-logging-log4j-2.2.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloader/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloader/.settings/org.eclipse.jdt.core.prefs 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloader/.settings/org.eclipse.jdt.core.prefs 2009-10-21 03:21:20 UTC (rev 95241)
@@ -1,5 +1,5 @@
-#Fri Sep 21 17:50:00 BST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+#Tue Oct 20 15:30:31 CDT 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading/.classpath
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading/.classpath 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading/.classpath 2009-10-21 03:21:20 UTC (rev 95241)
@@ -4,29 +4,32 @@
<classpathentry kind="src" path="src/test/resources" output="target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.2.0.CR1/jboss-logging-spi-2.2.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
<classpathentry kind="src" path="/jboss-classloader"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.CR1/jboss-managed-2.1.1.CR1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.CR1/jboss-managed-2.1.1.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.CR1/jboss-metatype-2.1.1.CR1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.CR1/jboss-metatype-2.1.1.CR1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.CR8/jboss-metatype-2.1.0.CR8.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.CR8/jboss-metatype-2.1.0.CR8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.7.GA/jboss-dependency-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.7.GA/jboss-dependency-2.0.7.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.7.GA/jboss-kernel-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.7.GA/jboss-kernel-2.0.7.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.2.0.CR1/jboss-logging-log4j-2.2.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA-sources.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading/.settings/org.eclipse.jdt.core.prefs 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading/.settings/org.eclipse.jdt.core.prefs 2009-10-21 03:21:20 UTC (rev 95241)
@@ -1,5 +1,5 @@
-#Fri Sep 21 17:50:00 BST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+#Tue Oct 20 15:30:32 CDT 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.classpath
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.classpath 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.classpath 2009-10-21 03:21:20 UTC (rev 95241)
@@ -5,31 +5,34 @@
<classpathentry kind="src" path="src/test/resources" output="target/tests-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.2.0.CR1/jboss-logging-spi-2.2.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/3.0.0.CR1-SNAPSHOT/jboss-vfs-3.0.0.CR1-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/3.0.0.CR1-SNAPSHOT/jboss-vfs-3.0.0.CR1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
<classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/>
+ <classpathentry kind="src" path="/jboss-classloading"/>
<classpathentry kind="src" path="/jboss-classloader"/>
- <classpathentry kind="src" path="/jboss-classloading"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.SP1/jboss-classloading-spi-5.1.0.SP1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.7.GA/jboss-dependency-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.7.GA/jboss-dependency-2.0.7.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.CR8/jboss-metatype-2.1.0.CR8.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.CR8/jboss-metatype-2.1.0.CR8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.CR1/jboss-managed-2.1.1.CR1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.1.1.CR1/jboss-managed-2.1.1.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.CR1/jboss-metatype-2.1.1.CR1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.CR1/jboss-metatype-2.1.1.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.7.GA/jboss-kernel-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.7.GA/jboss-kernel-2.0.7.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.2.0.CR1/jboss-logging-log4j-2.2.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.2.GA/jboss-vfs-2.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.1.2.GA/jboss-vfs-2.1.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.project
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.project 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.project 2009-10-21 03:21:20 UTC (rev 95241)
@@ -2,8 +2,8 @@
<name>jboss-classloading-vfs</name>
<comment>JBoss ClassLoading VFS</comment>
<projects>
+ <project>jboss-classloading</project>
<project>jboss-classloader</project>
- <project>jboss-classloading</project>
</projects>
<buildSpec>
<buildCommand>
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.settings/org.eclipse.jdt.core.prefs 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/.settings/org.eclipse.jdt.core.prefs 2009-10-21 03:21:20 UTC (rev 95241)
@@ -1,5 +1,5 @@
-#Tue Apr 29 21:03:22 PDT 2008
+#Tue Oct 20 15:30:32 CDT 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/PackageVisitor.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/PackageVisitor.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/PackageVisitor.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -28,15 +28,15 @@
import org.jboss.classloader.spi.filter.ClassFilter;
import org.jboss.classloading.spi.metadata.ExportAll;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.vfs.helpers.AbstractVirtualFileFilterWithAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileVisitor;
+import org.jboss.vfs.VisitorAttributes;
+import org.jboss.vfs.util.AbstractVirtualFileFilterWithAttributes;
/**
* Visits a virtual file system recursively
* to determine package names based on the exportAll policy
- *
+ *
* @author <a href="adrian at jboss.org">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@@ -50,16 +50,16 @@
/** The excluded roots */
private VirtualFile[] excludedRoots;
-
+
/** The current root */
private VirtualFile root;
-
+
/** The export all */
private ExportAll exportAll;
-
+
/** The root */
private String rootPath;
-
+
/** The root with slash*/
private String rootPathWithSlash;
@@ -68,13 +68,13 @@
/** The excluded packages */
private ClassFilter excluded;
-
+
/** The excluded export packages */
private ClassFilter excludedExport;
-
+
/**
* Determine the packages
- *
+ *
* @param roots the roots
* @param excludedRoots the excluded roots
* @param exportAll the exportAll
@@ -121,12 +121,12 @@
this.exportAll = exportAll;
this.included = included;
this.excluded = excluded;
- this.excludedExport = excludedExport;
+ this.excludedExport = excludedExport;
}
/**
* Set the root
- *
+ *
* @param root the root
* @throws IllegalArgumentException for a null root
*/
@@ -138,10 +138,10 @@
rootPath = root.getPathName();
rootPathWithSlash = rootPath + "/";
}
-
+
/**
* Get the packages.
- *
+ *
* @return the packages.
*/
Set<String> getPackages()
@@ -156,13 +156,13 @@
attributes.setRecurseFilter(this);
return attributes;
}
-
+
public boolean accepts(VirtualFile file)
{
// This is our current root
if (file.equals(root))
return true;
-
+
// Some other root, it will be handled later
for (VirtualFile other : roots)
{
@@ -178,11 +178,11 @@
return false;
}
}
-
+
// Ok
return true;
}
-
+
public void visit(VirtualFile file)
{
try
@@ -220,7 +220,7 @@
else if (path.startsWith(rootPathWithSlash))
path = path.substring(rootPathWithSlash.length());
String pkg = path.replace('/', '.');
-
+
// Check for inclusions/exclusions
if (included != null && included.matchesPackageName(pkg) == false)
return;
@@ -228,13 +228,13 @@
return;
if (excludedExport != null && excludedExport.matchesPackageName(pkg))
return;
-
+
// Ok this is a package for export
packages.add(pkg);
}
}
}
- catch (IOException e)
+ catch (RuntimeException e)
{
throw new Error("Error visiting " + file, e);
}
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceContext.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceContext.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceContext.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -21,12 +21,12 @@
*/
package org.jboss.classloading.plugins.vfs;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
-import java.io.InputStream;
-import java.io.IOException;
import org.jboss.classloading.plugins.visitor.AbstractResourceContext;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* VFS resource context.
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/VFSResourceVisitor.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -27,15 +27,15 @@
import org.jboss.classloading.spi.visitor.ResourceContext;
import org.jboss.classloading.spi.visitor.ResourceFilter;
import org.jboss.classloading.spi.visitor.ResourceVisitor;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.vfs.helpers.AbstractVirtualFileFilterWithAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileVisitor;
+import org.jboss.vfs.VisitorAttributes;
+import org.jboss.vfs.util.AbstractVirtualFileFilterWithAttributes;
/**
* Visits a virtual file system recursively
* to determine resources
- *
+ *
* @author <a href="adrian at jboss.org">Adrian Brock</a>
* @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @version $Revision: 1.1 $
@@ -44,16 +44,16 @@
{
/** The roots */
private VirtualFile[] roots;
-
+
/** The excluded roots */
private VirtualFile[] excludedRoots;
-
+
/** The current root */
private VirtualFile root;
-
+
/** The root */
private String rootPath;
-
+
/** The root with slash*/
private String rootPathWithSlash;
@@ -68,16 +68,16 @@
/** The resource visitor */
private ResourceVisitor visitor;
-
+
/** The resource filter */
private ResourceFilter filter;
-
+
/** The resource filter */
private ResourceFilter recurseFilter;
/**
* Visit the resources
- *
+ *
* @param roots the roots
* @param excludedRoots the excluded roots
* @param included the included packages
@@ -162,7 +162,7 @@
/**
* Set the root
- *
+ *
* @param root the root
* @throws IllegalArgumentException for a null root
*/
@@ -181,7 +181,7 @@
attributes.setIncludeRoot(false);
attributes.setRecurseFilter(this);
return attributes;
- }
+ }
/**
* Determine the file's path.
@@ -235,11 +235,11 @@
return false;
}
}
-
+
// Ok
return true;
}
-
+
public void visit(VirtualFile file)
{
try
@@ -256,9 +256,9 @@
return;
if (excluded != null && excluded.matchesResourcePath(path))
return;
-
+
ResourceContext resource = new VFSResourceContext(file, path, classLoader);
-
+
//Check the filter and visit
if (filter == null || filter.accepts(resource))
visitor.visit(resource);
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-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/dependency/VFSClassLoaderPolicyModule.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -40,12 +40,12 @@
import org.jboss.classloading.spi.visitor.ResourceVisitor;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* VFSClassLoaderPolicyModule.
- *
+ *
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@@ -56,13 +56,13 @@
/** The roots */
private List<String> roots;
-
+
/** Our cached vfs roots */
private VirtualFile[] vfsRoots;
/**
* Create a new VFSClassLoaderPolicyModule.
- *
+ *
* @param classLoadingMetaData the classloading metadata
* @param contextName the context name
*/
@@ -70,10 +70,10 @@
{
super(classLoadingMetaData, contextName);
}
-
+
/**
* Get the roots.
- *
+ *
* @return the roots.
*/
public List<String> getRoots()
@@ -83,7 +83,7 @@
/**
* Set the roots.
- *
+ *
* @param roots the roots.
*/
public void setRoots(List<String> roots)
@@ -100,7 +100,7 @@
List<Capability> capabilities = super.determineCapabilities();
if (capabilities != null)
return capabilities;
-
+
// We need to work it out
ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
capabilities = new CopyOnWriteArrayList<Capability>();
@@ -109,7 +109,7 @@
Object version = getVersion();
Capability capability = factory.createModule(getName(), version);
capabilities.add(capability);
-
+
// Do we determine package capabilities
ClassFilter included = getIncluded();
ClassFilter excluded = getExcluded();
@@ -124,7 +124,7 @@
capabilities.add(capability);
}
}
-
+
return capabilities;
}
@@ -143,17 +143,17 @@
{
return (VFSClassLoaderFactory) super.getClassLoadingMetaData();
}
-
+
/**
* Get the virtual file roots
- *
+ *
* @return the roots
*/
protected VirtualFile[] determineVFSRoots()
{
if (vfsRoots != null)
return vfsRoots;
-
+
if (roots == null)
{
vfsRoots = new VirtualFile[0];
@@ -192,7 +192,7 @@
*/
protected VirtualFile getVirtualFile(URI uri) throws Exception
{
- return VFS.getRoot(uri);
+ return VFS.getChild(uri);
}
@Override
@@ -200,13 +200,13 @@
{
return (VFSClassLoaderPolicy) super.getPolicy();
}
-
+
@Override
protected VFSClassLoaderPolicy determinePolicy()
{
VirtualFile[] roots = determineVFSRoots();
VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy(getContextName(), roots);
-
+
String[] packageNames = getPackageNames();
policy.setExportedPackages(packageNames);
policy.setIncluded(getIncluded());
@@ -241,5 +241,5 @@
ClassFilter excluded = getExcluded();
VFSResourceVisitor.visit(roots, null, included, excluded, classLoader, visitor, filter, recurseFilter, urls);
}
- }
+ }
}
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/metadata/package-info.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/metadata/package-info.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/metadata/package-info.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -30,3 +30,4 @@
import org.jboss.xb.annotations.JBossXmlAdaptedType;
import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
+
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-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -47,13 +47,13 @@
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.logging.Logger;
import org.jboss.util.collection.SoftValueHashMap;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
/**
* VFSClassLoaderPolicy.
- *
- * @author <a href="adrian at jboss.org">Adrian Brock</a>
+ *
+ * @author <a href="adrian at jboss.org">Adrian Brock</a>
* @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @author <a href="anil.saldhana at jboss.org">Anil Saldhana</a>
* @version $Revision: 1.1 $
@@ -68,13 +68,13 @@
/** A name for the policy */
private String name;
-
+
/** The delegates */
private List<? extends DelegateLoader> delegates;
-
+
/** The roots */
private VirtualFile[] roots;
-
+
/** The excluded roots */
private VirtualFile[] excludedRoots;
@@ -86,10 +86,10 @@
/** The excluded */
private ClassFilter excluded;
-
+
/** The excluded for export */
private ClassFilter excludedExport;
-
+
/** The exported packages */
private String[] exportedPackages;
@@ -98,23 +98,23 @@
/** Whether we are cachable */
private boolean cacheable = true;
-
+
/** Whether we are blacklistable */
private boolean blackListable = true;
-
+
/** Manifest cache */
private Map<URL, Manifest> manifestCache = new ConcurrentHashMap<URL, Manifest>();
-
+
/** Cache of virtual file information by path */
@SuppressWarnings("unchecked")
private Map<String, VirtualFileInfo> vfsCache = Collections.synchronizedMap(new SoftValueHashMap());
-
+
/** JBCL-64, JBVFS-77: CodeSource should use real url **/
private boolean useRealURL = true;
/**
* Determine a name from the roots
- *
+ *
* @param roots the roots
* @return the name
*/
@@ -122,7 +122,7 @@
{
if (roots == null)
return "";
-
+
try
{
for (VirtualFile root : roots)
@@ -133,10 +133,10 @@
}
return "";
}
-
+
/**
* Create a new VFSClassLoaderPolicy.
- *
+ *
* @param roots the roots
* @return the classloader policy
* @throws IllegalArgumentException for null roots
@@ -145,10 +145,10 @@
{
return new VFSClassLoaderPolicy(roots);
}
-
+
/**
* Create a new VFSClassLoaderPolicy.
- *
+ *
* @param name a name of the policy
* @param roots the roots
* @return the classloader policy
@@ -158,10 +158,10 @@
{
return new VFSClassLoaderPolicy(name, roots);
}
-
+
/**
* Create a new VFSClassLoaderPolicy.
- *
+ *
* @param roots the roots
* @param excludedRoots the excluded roots
* @return the classloader policy
@@ -171,10 +171,10 @@
{
return new VFSClassLoaderPolicy(roots, excludedRoots);
}
-
+
/**
* Create a new VFSClassLoaderPolicy.
- *
+ *
* @param name a name of the policy
* @param roots the roots
* @param excludedRoots the excluded roots
@@ -185,11 +185,11 @@
{
return new VFSClassLoaderPolicy(name, roots, excludedRoots);
}
-
+
/**
* Create a new VFSClassLoaderPolicy.
- *
+ *
* @param roots the roots
* @throws IllegalArgumentException for null roots
*/
@@ -200,7 +200,7 @@
/**
* Create a new VFSClassLoaderPolicy.
- *
+ *
* @param roots the roots
* @param excludedRoots the excluded roots
* @throws IllegalArgumentException for null roots
@@ -212,7 +212,7 @@
/**
* Create a new VFSClassLoaderPolicy.
- *
+ *
* @param name the name
* @param roots the roots
* @throws IllegalArgumentException for null roots
@@ -224,7 +224,7 @@
/**
* Create a new VFSClassLoaderPolicy.
- *
+ *
* @param name the name
* @param roots the roots
* @param excludedRoots the excluded roots
@@ -269,7 +269,7 @@
/**
* Set the delegates.
- *
+ *
* @param delegates the delegates.
*/
public void setDelegates(List<? extends DelegateLoader> delegates)
@@ -279,7 +279,7 @@
/**
* Get the included.
- *
+ *
* @return the included.
*/
public ClassFilter getIncluded()
@@ -289,7 +289,7 @@
/**
* Set the included.
- *
+ *
* @param included the included.
*/
public void setIncluded(ClassFilter included)
@@ -299,7 +299,7 @@
/**
* Get the excluded.
- *
+ *
* @return the excluded.
*/
public ClassFilter getExcluded()
@@ -309,7 +309,7 @@
/**
* Set the excluded.
- *
+ *
* @param excluded the excluded.
*/
public void setExcluded(ClassFilter excluded)
@@ -319,7 +319,7 @@
/**
* Get the excludedExport.
- *
+ *
* @return the excludedExport.
*/
public ClassFilter getExcludedExport()
@@ -329,7 +329,7 @@
/**
* Set the excludedExport.
- *
+ *
* @param excludedExport the excludedExport.
*/
public void setExcludedExport(ClassFilter excludedExport)
@@ -339,7 +339,7 @@
/**
* Get the exportAll.
- *
+ *
* @return the exportAll.
*/
public ExportAll getExportAll()
@@ -349,7 +349,7 @@
/**
* Set the exportAll.
- *
+ *
* @param exportAll the exportAll.
*/
public void setExportAll(ExportAll exportAll)
@@ -367,7 +367,7 @@
/**
* Get the exported packages
- *
+ *
* @return the exported packages
*/
public String[] getExportedPackages()
@@ -377,7 +377,7 @@
/**
* Set the exportedPackages.
- *
+ *
* @param exportedPackages the exportedPackages.
*/
public void setExportedPackages(String[] exportedPackages)
@@ -399,7 +399,7 @@
/**
* Set the importAll.
- *
+ *
* @param importAll the importAll.
*/
public void setImportAll(boolean importAll)
@@ -415,7 +415,7 @@
/**
* Set the cacheable.
- *
+ *
* @param cacheable the cacheable.
*/
public void setCacheable(boolean cacheable)
@@ -431,7 +431,7 @@
/**
* Set the blackListable.
- *
+ *
* @param blackListable the blackListable.
*/
public void setBlackListable(boolean blackListable)
@@ -452,7 +452,7 @@
{
if (checkFilters(path, "getResource"))
return null;
-
+
VirtualFile child = findChild(path);
if (child != null)
{
@@ -468,7 +468,7 @@
}
return null;
}
-
+
@Override
public InputStream getResourceAsStream(String path)
{
@@ -530,11 +530,11 @@
log.debug("Error getting resources for " + root, e);
}
}
- }
-
+ }
+
/**
* Find a child from a path
- *
+ *
* @param path the path
* @return the child if found in the roots
*/
@@ -548,7 +548,7 @@
/**
* Find a root from a path
- *
+ *
* @param path the path
* @return the root if found in the roots
*/
@@ -562,7 +562,7 @@
/**
* Find the virtual file information for a path
- *
+ *
* @param path the path
* @return the virtual file information
*/
@@ -571,13 +571,13 @@
VirtualFileInfo result = vfsCache.get(path);
if (result != null)
return result;
-
+
for (VirtualFile root : roots)
{
try
{
VirtualFile file = root.getChild(path);
- if (file != null)
+ if (file.exists())
{
result = new VirtualFileInfo(file, root);
vfsCache.put(path, result);
@@ -590,7 +590,7 @@
}
return null;
}
-
+
@Override
public PackageInformation getClassPackageInformation(String className, String packageName)
{
@@ -612,7 +612,7 @@
else
manifestCache.put(rootURL, manifest);
}
-
+
if (manifest == NO_MANIFEST)
manifest = null;
}
@@ -663,10 +663,10 @@
throw new Error("Error determining protection domain for " + clazz, e);
}
}
-
+
/**
* Check the filters
- *
+ *
* @param path the path to check
* @param context the context
* @return true if it fails the filters
@@ -694,10 +694,10 @@
{
/** The file */
private VirtualFile file;
-
+
/** The root */
private VirtualFile root;
-
+
public VirtualFileInfo(VirtualFile file, VirtualFile root)
{
this.file = file;
@@ -706,7 +706,7 @@
/**
* Get the file.
- *
+ *
* @return the file.
*/
public VirtualFile getFile()
@@ -716,7 +716,7 @@
/**
* Get the root.
- *
+ *
* @return the root.
*/
public VirtualFile getRoot()
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/ClassLoadingVFSTestSuite.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/ClassLoadingVFSTestSuite.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/ClassLoadingVFSTestSuite.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -37,8 +37,8 @@
import org.jboss.test.classloading.vfs.metadata.test.UsesPackageUnitTestCase;
import org.jboss.test.classloading.vfs.metadata.test.VFSClassLoaderFactoryUnitTestCase;
import org.jboss.test.classloading.vfs.metadata.test.VFSResourceVisitorUnitTestCase;
+import org.jboss.test.classloading.vfs.metadata.xml.test.NoopClassLoaderFactoryXMLUnitTestCase;
import org.jboss.test.classloading.vfs.metadata.xml.test.VFSClassLoaderFactoryXMLUnitTestCase;
-import org.jboss.test.classloading.vfs.metadata.xml.test.NoopClassLoaderFactoryXMLUnitTestCase;
import org.jboss.test.classloading.vfs.policy.test.ExportAllUnitTestCase;
import org.jboss.test.classloading.vfs.policy.test.PackageInfoUnitTestCase;
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/client/test/ClientClassPathUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/client/test/ClientClassPathUnitTestCase.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/client/test/ClientClassPathUnitTestCase.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -21,9 +21,11 @@
*/
package org.jboss.test.classloading.vfs.client.test;
+import java.io.Closeable;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
+import java.util.List;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
@@ -31,10 +33,12 @@
import org.jboss.test.classloading.vfs.client.support.launcher.ClientLauncher;
import org.jboss.test.classloading.vfs.metadata.VFSClassLoadingMicrocontainerTest;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VFSUtils;
/**
* Tests of vfs class loading that affect a client application type of env.
- *
+ *
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
@@ -49,7 +53,8 @@
{
super(name);
}
-/*
+
+ /*
public void testClientVFSClassLoaderFactory()
throws Exception
{
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTest.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTest.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTest.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -21,10 +21,15 @@
*/
package org.jboss.test.classloading.vfs.metadata;
+import java.io.Closeable;
+import java.io.IOException;
import java.net.URL;
import java.security.CodeSource;
import java.security.ProtectionDomain;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.classloader.plugins.ClassLoaderUtils;
@@ -39,17 +44,21 @@
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.test.AbstractTestDelegate;
import org.jboss.test.kernel.junit.MicrocontainerTest;
+import org.jboss.vfs.TempFileProvider;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* VFSClassLoadingMicrocontainerTest.
- *
+ *
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class VFSClassLoadingMicrocontainerTest extends MicrocontainerTest
{
protected ClassLoaderSystem system;
-
+ private TempFileProvider provider;
+
public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new VFSClassLoadingMicrocontainerTestDelegate(clazz);
@@ -62,12 +71,12 @@
defaultDomain.setParentPolicy(ParentPolicy.BEFORE_BUT_JAVA_ONLY);
return system;
}
-
+
public VFSClassLoadingMicrocontainerTest(String name)
{
super(name);
}
-
+
protected String getRoot(Class<?> clazz)
{
URL location = getRootURL(clazz);
@@ -88,35 +97,35 @@
contextName = factory.getName() + ":" + factory.getVersion();
return contextName;
}
-
+
protected ClassLoader assertClassLoader(VFSClassLoaderFactory factory) throws Exception
{
return assertClassLoader(getContextName(factory));
}
-
+
protected ClassLoader assertClassLoader(String name, String version) throws Exception
{
String contextName = name + ":" + version;
return assertClassLoader(contextName);
}
-
+
protected ClassLoader assertClassLoader(String name) throws Exception
{
Object obj = getBean(name);
return assertInstanceOf(obj, ClassLoader.class);
}
-
+
protected void assertNoClassLoader(VFSClassLoaderFactory factory) throws Exception
{
assertNoClassLoader(getContextName(factory));
}
-
+
protected void assertNoClassLoader(String name, String version) throws Exception
{
String contextName = name + ":" + version;
assertNoClassLoader(contextName);
}
-
+
protected void assertClassLoader(Class<?> clazz, ClassLoader expected)
{
if (expected == null)
@@ -125,32 +134,32 @@
boolean result = expected.equals(cl);
assertTrue(ClassLoaderUtils.classToString(clazz) + " should have expected classloader=" + expected, result);
}
-
+
protected void assertClassEquality(Class<?> expected, Class<?> actual)
{
assertTrue("Should be the same " + ClassLoaderUtils.classToString(expected) +" and " + ClassLoaderUtils.classToString(actual), expected == actual);
}
-
+
protected void assertNoClassEquality(Class<?> expected, Class<?> actual)
{
assertTrue("Should NOT be the same " + ClassLoaderUtils.classToString(expected) +" and " + ClassLoaderUtils.classToString(actual), expected != actual);
}
-
+
protected Class<?> assertLoadClass(Class<?> reference, ClassLoader start)
{
return assertLoadClass(reference, start, start, false);
}
-
+
protected Class<?> assertLoadClass(Class<?> reference, ClassLoader start, boolean isReference)
{
return assertLoadClass(reference, start, start, isReference);
}
-
+
protected Class<?> assertLoadClass(Class<?> reference, ClassLoader start, ClassLoader expected)
{
return assertLoadClass(reference, start, expected, false);
}
-
+
protected Class<?> assertLoadClass(Class<?> reference, ClassLoader start, ClassLoader expected, boolean isReference)
{
Class<?> result = assertLoadClass(reference.getName(), start, expected);
@@ -160,12 +169,12 @@
assertNoClassEquality(reference, result);
return result;
}
-
+
protected Class<?> assertLoadClass(String name, ClassLoader start)
{
return assertLoadClass(name, start, start);
}
-
+
protected Class<?> assertLoadClass(String name, ClassLoader start, ClassLoader expected)
{
Class<?> result = null;
@@ -181,12 +190,12 @@
assertClassLoader(result, expected);
return result;
}
-
+
protected void assertLoadClassFail(Class<?> reference, ClassLoader start)
{
assertLoadClassFail(reference.getName(), start);
}
-
+
protected void assertLoadClassFail(String name, ClassLoader start)
{
try
@@ -199,7 +208,7 @@
checkThrowable(ClassNotFoundException.class, expected);
}
}
-
+
protected KernelDeployment install(VFSClassLoaderFactory metaData) throws Exception
{
AbstractKernelDeployment deployment = new AbstractKernelDeployment();
@@ -227,13 +236,34 @@
{
return assertBean(contextName + "$MODULE", Module.class);
}
-
+
protected void setUp() throws Exception
{
super.setUp();
// This is a hack for a hack. ;-)
AbstractJDKChecker.getExcluded().add(VFSClassLoadingMicrocontainerTest.class);
-
+
system = (ClassLoaderSystem) getBean("ClassLoaderSystem");
+ provider = TempFileProvider.create("test", new ScheduledThreadPoolExecutor(2));
}
+
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ provider.close();
+ }
+
+ public List<Closeable> recursiveMount(VirtualFile file) throws IOException
+ {
+ ArrayList<Closeable> mounts = new ArrayList<Closeable>();
+
+ if (!file.isDirectory() && file.getName().matches("^.*\\.([EeWwJj][Aa][Rr]|[Zz][Ii][Pp])$"))
+ mounts.add(VFS.mountZip(file, file, provider));
+
+ if (file.isDirectory())
+ for (VirtualFile child : file.getChildren())
+ mounts.addAll(recursiveMount(child));
+
+ return mounts;
+ }
}
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-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -27,6 +27,7 @@
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;
@@ -37,12 +38,10 @@
import org.jboss.test.classloading.vfs.metadata.support.a.A;
import org.jboss.test.classloading.vfs.metadata.support.b.B;
import org.jboss.util.id.GUID;
-import org.jboss.virtual.MemoryFileFactory;
-import org.jboss.virtual.VFS;
/**
* DomainUnitTestCase.
- *
+ *
* @author <a href="adrian at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
@@ -51,11 +50,7 @@
final static GeneratedClassInfo NEW_PACKAGE = new GeneratedClassInfo("newpackage.GeneratedClass");
final static GeneratedClassInfo OTHER_PACKAGE = new GeneratedClassInfo("otherpackage.GeneratedClass");
final static GeneratedClassInfo EXISTING_PACKAGE = new GeneratedClassInfo("org.jboss.test.classloading.vfs.metadata.support.a.GeneratedClass");
- static
- {
- VFS.init();
- }
-
+
public static Test suite()
{
return suite(GeneratedClassesUnitTestCase.class);
@@ -70,17 +65,17 @@
{
runImportAllGenerateClass(EXISTING_PACKAGE, true);
}
-
+
public void testImportAllGenerateClassInGlobalIncludedPackage() throws Exception
{
runImportAllGenerateClass(NEW_PACKAGE, true);
}
-
+
public void testImportAllGenerateClassInOtherPackage() throws Exception
{
runImportAllGenerateClass(OTHER_PACKAGE, false);
}
-
+
private void runImportAllGenerateClass(GeneratedClassInfo info, boolean expectSuccess) throws Exception
{
ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
@@ -106,15 +101,15 @@
assertLoadClass(B.class, clB);
assertLoadClass(A.class, clB, clA);
assertLoadClass(B.class, clA, clB);
-
+
Class<?> clazz = generateClass(clA, dynamicClassRoot, info);
Class<?> clazzA = assertLoadClass(info.getClassname(), clA);
assertSame(clazz, clazzA);
-
+
try
{
Class<?> clazzB = assertLoadClass(info.getClassname(), clB, clA);
-
+
if (!expectSuccess)
{
fail("Should not have been able to load " + info.getClassname());
@@ -140,14 +135,14 @@
{
URL outputURL = new URL(dynamicClassRoot + "/" + info.getResourceName());
MemoryFileFactory.putFile(outputURL, info.getClassBytes());
-
+
if (loader instanceof RealClassLoader)
{
((RealClassLoader)loader).clearBlackList(info.getResourceName());
}
return loader.loadClass(info.getClassname());
}
-
+
private String getDynamicClassRoot() throws Exception
{
URL dynamicClassRoot = new URL("vfsmemory", GUID.asString(), "");
@@ -160,19 +155,19 @@
String classname;
String resourceName;
byte[] classBytes;
-
+
public GeneratedClassInfo(String classname)
{
this.classname = classname;
resourceName = ClassLoaderUtils.classNameToPath(classname);
loadClassBytes();
}
-
+
public String getClassname()
{
return classname;
}
-
+
public String getPackageName()
{
return ClassLoaderUtils.getClassPackageName(classname);
@@ -191,7 +186,7 @@
private void loadClassBytes()
{
InputStream in = this.getClass().getClassLoader().getResourceAsStream("classes/" + resourceName);
-
+
assertNotNull("Could not find inputstream for " + resourceName, in);
try
{
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -32,9 +33,9 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import java.util.ArrayList;
import junit.framework.Test;
+
import org.jboss.classloader.plugins.ClassLoaderUtils;
import org.jboss.classloading.plugins.visitor.FederatedResourceVisitor;
import org.jboss.classloading.spi.dependency.Module;
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/NoopClassLoaderFactory.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/NoopClassLoaderFactory.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/NoopClassLoaderFactory.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -23,6 +23,7 @@
import java.util.Collections;
import java.util.List;
+
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/package-info.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/package-info.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/support/package-info.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -30,3 +30,4 @@
import org.jboss.xb.annotations.JBossXmlAdaptedType;
import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
+
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/test/NoopClassLoaderFactoryXMLUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/test/NoopClassLoaderFactoryXMLUnitTestCase.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/test/NoopClassLoaderFactoryXMLUnitTestCase.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -22,6 +22,7 @@
package org.jboss.test.classloading.vfs.metadata.xml.test;
import junit.framework.Test;
+
import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory10;
import org.jboss.test.classloading.vfs.metadata.xml.AbstractJBossXBTest;
import org.jboss.test.classloading.vfs.metadata.xml.support.NoopClassLoaderFactory;
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-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -33,17 +33,18 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.test.BaseTestCase;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* ExportAllUnitTestCase.
- *
+ *
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@@ -74,14 +75,14 @@
{
VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy(files, excluded);
policy.setExportAll(exportAll);
-
+
String[] packageNames = policy.getPackageNames();
Set<String> actual = makeSet(packageNames);
assertEquals(expected.keySet(), actual);
-
+
ClassLoaderSystem system = new DefaultClassLoaderSystem();
ClassLoader classLoader = system.registerClassLoaderPolicy(policy);
-
+
for (Map.Entry<String, String> entry : expected.entrySet())
{
String packageName = entry.getKey();
@@ -102,7 +103,7 @@
{
URL baseURL = getResource("/classloader");
assertNotNull(baseURL);
- VirtualFile base = VFS.getRoot(baseURL);
+ VirtualFile base = VFS.getChild(baseURL);
VirtualFile[] files = new VirtualFile[urls.length];
for (int i = 0; i < urls.length; ++i)
{
@@ -114,7 +115,7 @@
if (files[i] == null)
fail("Can't find " + urls[i]);
}
-
+
VirtualFile[] excludedFiles = null;
if (excluded != null)
{
@@ -130,7 +131,7 @@
fail("Can't find " + excluded[i]);
}
}
-
+
testExportAllCommon(exportAll, expected, empty, files, excludedFiles);
}
@@ -143,7 +144,7 @@
URL url = getResource(urlString);
if (url != null)
{
- files[i]= VFS.getRoot(url);
+ files[i]= VFS.getChild(url);
}
else
{
@@ -153,7 +154,7 @@
fail("Expected to find resource: " + urlString);
}
}
-
+
VirtualFile[] excludedFiles = null;
if (excluded != null)
{
@@ -164,7 +165,7 @@
URL url = getResource(urlString);
if (url != null)
{
- excludedFiles[i]= VFS.getRoot(url);
+ excludedFiles[i]= VFS.getChild(url);
}
else
{
@@ -174,16 +175,16 @@
}
}
}
-
+
testExportAllCommon(exportAll, expected, empty, files, excludedFiles);
}
-
+
public void testExportAllJar1() throws Exception
{
Map<String,String> expected = makeSimpleMap("testjar1",
"",
"package1",
- "package2",
+ "package2",
"package2.subpackage1",
"package2.subpackage2",
"package2.subpackage3"
@@ -195,10 +196,10 @@
throws Exception
{
URL testjar1URL = getResource("/classloader/testjar1");
- VirtualFile testjar1 = VFS.getRoot(testjar1URL);
+ VirtualFile testjar1 = VFS.getChild(testjar1URL);
VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy(testjar1);
policy.setExportAll(ExportAll.ALL);
-
+
ClassLoaderSystem system = new DefaultClassLoaderSystem();
ClassLoader classLoader = system.registerClassLoaderPolicy(policy);
URL notempty = classLoader.getResource("notempty");
@@ -208,7 +209,7 @@
throws Exception
{
URL testwar1URL = getResource("/classloader/testwar1.war");
- VirtualFile testwar1 = VFS.getRoot(testwar1URL);
+ VirtualFile testwar1 = VFS.getChild(testwar1URL);
VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy(testwar1);
policy.setExportAll(ExportAll.NON_EMPTY);
policy.setImportAll(true);
@@ -226,7 +227,7 @@
Map<String, String> expected = makeSimpleMap("testjar1",
"",
"package1",
- "package2",
+ "package2",
"package2.subpackage1",
"package2.subpackage2",
"package2.subpackage3"
@@ -234,14 +235,14 @@
testExportAll(ExportAll.NON_EMPTY, expected, "testjar1");
}
-
+
public void testExportAllJar2() throws Exception
{
Map<String,String> expected = makeSimpleMap("testjar2",
"",
"package1"
);
-
+
Set<String> empty = makeSet("");
testExportAll(ExportAll.ALL, expected, empty, "testjar2");
@@ -255,13 +256,13 @@
testExportAll(ExportAll.NON_EMPTY, expected, "testjar2");
}
-
+
public void testExportAllJar1And2() throws Exception
{
Map<String,String> expected = makeSimpleMap("testjar1",
"",
"package1",
- "package2",
+ "package2",
"package2.subpackage1",
"package2.subpackage2",
"package2.subpackage3"
@@ -275,7 +276,7 @@
Map<String, String> expected = makeSimpleMap("testjar1",
"",
"package1",
- "package2",
+ "package2",
"package2.subpackage1",
"package2.subpackage2",
"package2.subpackage3"
@@ -283,7 +284,7 @@
testExportAll(ExportAll.NON_EMPTY, expected, "testjar1", "testjar2");
}
-
+
public void testExportAllJar2And1() throws Exception
{
Map<String,String> expected = makeComplexMap(
@@ -311,7 +312,7 @@
testExportAll(ExportAll.NON_EMPTY, expected, "testjar2", "testjar1");
}
-
+
public void testExportAllJar3() throws Exception
{
Map<String,String> expected = makeSimpleMap("testjar3",
@@ -322,7 +323,7 @@
testExportAll(ExportAll.ALL, expected, "testjar3", "subjar1.jar");
}
-
+
public void testExportAllSimpleExcluded() throws Exception
{
Map<String,String> expected = makeSimpleMap("testjar1",
@@ -332,7 +333,7 @@
testExportAll(ExportAll.ALL, expected, new String[] { "testjar1" } , new String[] { "package2" });
}
-
+
public void testExportAllMultipleRootsExcluded() throws Exception
{
Map<String,String> expected = makeSimpleMap("testjar1",
@@ -342,7 +343,7 @@
testExportAll(ExportAll.ALL, expected, new String[] { "testjar1", "testjar2" } , new String[] { "package2" });
}
-
+
public void testExportAllMultipleExcluded() throws Exception
{
Map<String,String> expected = makeSimpleMap("testjar1",
@@ -351,17 +352,17 @@
testExportAll(ExportAll.ALL, expected, new String[] { "testjar1" } , new String[] { "package1", "package2" });
}
-
+
public void testJar3Resources()
throws Exception
{
URL testjar3URL = getResource("/classloader/testjar3");
- VirtualFile testjar3 = VFS.getRoot(testjar3URL);
+ VirtualFile testjar3 = VFS.getChild(testjar3URL);
VirtualFile testjar3subjar = testjar3.getChild("subjar1.jar");
assertNotNull(testjar3subjar);
VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy(testjar3, testjar3subjar);
policy.setExportAll(ExportAll.NON_EMPTY);
-
+
ClassLoaderSystem system = new DefaultClassLoaderSystem();
ClassLoader classLoader = system.registerClassLoaderPolicy(policy);
URL notempty = classLoader.getResource("notempty");
@@ -384,13 +385,13 @@
}
return builder.toString();
}
-
+
protected Set<String> makeSet(String... elements)
{
assertNotNull(elements);
return new HashSet<String>(Arrays.asList(elements));
}
-
+
protected Map<String,String> makeSimpleMap(String prefix, String... elements)
{
assertNotNull(prefix);
@@ -400,7 +401,7 @@
result.put(string, prefix + "." + string);
return result;
}
-
+
protected Map<String,String> makeComplexMap(String... elements)
{
assertNotNull(elements);
Modified: projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java 2009-10-21 03:21:20 UTC (rev 95241)
@@ -30,8 +30,8 @@
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.test.BaseTestCase;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* Package related tests of VFSClassLoaderPolicy
@@ -50,7 +50,7 @@
throws Exception
{
URL testear1xURL = getResource("/classloader/testear1x.ear");
- VirtualFile testear1x = VFS.getRoot(testear1xURL);
+ VirtualFile testear1x = VFS.getChild(testear1xURL);
VirtualFile jar1 = testear1x.getChild("lib/jar1.jar");
assertNotNull(jar1);
VirtualFile jar2 = testear1x.getChild("lib/jar2.jar");
@@ -66,7 +66,7 @@
Specification-Vendor: JBoss
Implementation-Title: JBoss [division of RedHat]
Implementation-URL: http://www.jboss.org/
- Implementation-Version: 1.0.1.GA
+ Implementation-Version: 1.0.1.GA
Implementation-Vendor: JBoss.org
Implementation-Vendor-Id: http://www.jboss.org/
*/
Modified: projects/jboss-cl/branches/Trunk_VFS3/pom.xml
===================================================================
--- projects/jboss-cl/branches/Trunk_VFS3/pom.xml 2009-10-21 03:20:22 UTC (rev 95240)
+++ projects/jboss-cl/branches/Trunk_VFS3/pom.xml 2009-10-21 03:21:20 UTC (rev 95241)
@@ -28,11 +28,11 @@
</modules>
<properties>
- <version.jboss.vfs>3.0.0-SNAPSHOT</version.jboss.vfs>
+ <version.jboss.vfs>3.0.0.CR1-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>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
<version.jboss.classloading.spi>5.1.0.SP1</version.jboss.classloading.spi>
<version.jbossxb>2.0.1.GA</version.jbossxb>
<version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
@@ -222,6 +222,18 @@
<artifactId>jboss-logging-spi</artifactId>
<version>${version.jboss.logging.spi}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.integration</groupId>
More information about the jboss-cvs-commits
mailing list