[jboss-cvs] JBossAS SVN: r91995 - in projects/vfs/branches/dml-zip-rework/src: test/java/org/jboss/test/vfs and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-08-04 22:13:03 -0400 (Tue, 04 Aug 2009)
New Revision: 91995

Modified:
   projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/VFS.java
   projects/vfs/branches/dml-zip-rework/src/test/java/org/jboss/test/vfs/FileVFSUnitTestCase.java
Log:
More package name fixes

Modified: projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/VFS.java
===================================================================
--- projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/VFS.java	2009-08-05 01:51:47 UTC (rev 91994)
+++ projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/VFS.java	2009-08-05 02:13:03 UTC (rev 91995)
@@ -150,10 +150,10 @@
         URL.setURLStreamHandlerFactory(null);
         String pkgs = System.getProperty("java.protocol.handler.pkgs");
         if (pkgs == null || pkgs.trim().length() == 0) {
-            pkgs = "org.jboss.virtual.protocol";
+            pkgs = "org.jboss.vfs.protocol";
             System.setProperty("java.protocol.handler.pkgs", pkgs);
-        } else if (pkgs.contains("org.jboss.virtual.protocol") == false) {
-            pkgs = "org.jboss.virtual.protocol|" + pkgs;
+        } else if (pkgs.contains("org.jboss.vfs.protocol") == false) {
+            pkgs = "org.jboss.vfs.protocol|" + pkgs;
             System.setProperty("java.protocol.handler.pkgs", pkgs);
         }
     }

Modified: projects/vfs/branches/dml-zip-rework/src/test/java/org/jboss/test/vfs/FileVFSUnitTestCase.java
===================================================================
--- projects/vfs/branches/dml-zip-rework/src/test/java/org/jboss/test/vfs/FileVFSUnitTestCase.java	2009-08-05 01:51:47 UTC (rev 91994)
+++ projects/vfs/branches/dml-zip-rework/src/test/java/org/jboss/test/vfs/FileVFSUnitTestCase.java	2009-08-05 02:13:03 UTC (rev 91995)
@@ -624,7 +624,7 @@
          expectedClasses.add(outer.getPathName() + "/jar1-filesonly.jar/org/jboss/test/vfs/support/jar1/ClassInJar1$InnerClass.class");
          expectedClasses.add(outer.getPathName() + "/jar2.jar/org/jboss/test/vfs/support/jar2/ClassInJar2.class");
          expectedClasses.add(outer.getPathName() + "/org/jboss/test/vfs/support/CommonClass.class");
-         super.enableTrace("org.jboss.virtual.util.SuffixMatchFilter");
+         super.enableTrace("org.jboss.vfs.util.SuffixMatchFilter");
          SuffixMatchFilter classVisitor = new SuffixMatchFilter(".class", VisitorAttributes.RECURSE);
          List<VirtualFile> classes = outer.getChildren(classVisitor);
          int count = 0;
@@ -663,7 +663,7 @@
          expectedClasses.add(rootURL.getPath() + "/jar2.jar/org/jboss/test/vfs/support/jar2/ClassInJar2.class");
          // FIXME: .class files are not being copied from the resources directory
          expectedClasses.add(rootURL.getPath() + "/org/jboss/test/vfs/support/CommonClass.class");
-         super.enableTrace("org.jboss.virtual.util.SuffixMatchFilter");
+         super.enableTrace("org.jboss.vfs.util.SuffixMatchFilter");
          SuffixMatchFilter classVisitor = new SuffixMatchFilter(".class", VisitorAttributes.RECURSE);
          List<VirtualFile> classes = testdir.getChildren(classVisitor);
          int count = 0;
@@ -699,7 +699,7 @@
          HashSet<String> expectedClasses = new HashSet<String>();
          expectedClasses.add(rootURL.getPath() + "/org/jboss/test/vfs/support/jar1/ClassInJar1.class");
          expectedClasses.add(rootURL.getPath() + "/org/jboss/test/vfs/support/jar1/ClassInJar1$InnerClass.class");
-         super.enableTrace("org.jboss.virtual.util.SuffixMatchFilter");
+         super.enableTrace("org.jboss.vfs.util.SuffixMatchFilter");
          SuffixMatchFilter classVisitor = new SuffixMatchFilter(".class", VisitorAttributes.RECURSE);
          List<VirtualFile> classes = testdir.getChildren(classVisitor);
          int count = 0;