[jboss-cvs] JBossAS SVN: r99258 - in branches/vfs3-int/testsuite/src: main/org/jboss/test/cluster/defaultcfg/test and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 11 19:57:04 EST 2010
Author: johnbailey
Date: 2010-01-11 19:57:04 -0500 (Mon, 11 Jan 2010)
New Revision: 99258
Modified:
branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHotDeployUnitTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/spaces/test/SpacesUnitTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
branches/vfs3-int/testsuite/src/main/org/jboss/test/security/service/HttpsClient.java
branches/vfs3-int/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
Log:
[JBAS-7357] - Initial VFS3 integration for jboss-as-testsuite
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -42,7 +42,7 @@
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.virtual.VFS;
+import org.jboss.vfs.VFS;
/**
*
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHotDeployUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHotDeployUnitTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHotDeployUnitTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -41,7 +41,6 @@
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.virtual.VFS;
/**
* @author Brian Stansberry
@@ -198,8 +197,6 @@
{
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
activeView = ps.getViewManager();
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
}
// Reload
activeView.load();
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -43,7 +43,6 @@
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.virtual.VFS;
/**
* Test for JBAS-7102. Creates a war w/ 150MB of content in the farm
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -46,7 +46,6 @@
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.channelfactory.managed.ManagedObjectTestUtil;
-import org.jboss.virtual.VFS;
/**
* Validates the expected ChannelFactory-related ManagedObjects are there
@@ -289,8 +288,6 @@
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
activeView = ps.getViewManager();
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
}
activeView.load();
return activeView;
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -40,7 +40,6 @@
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.virtual.VFS;
/**
* Validates the expected HAPartition-related ManagedObjects are there
@@ -296,8 +295,6 @@
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
activeView = ps.getViewManager();
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
}
activeView.load();
return activeView;
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -74,7 +74,6 @@
"org.jboss.cache.ReplicationException",
"org.jboss.logging.XLevel",
"org.jboss.mx.util.InstanceOfQueryExp",
- "org.jboss.virtual.plugins.context.jar.NestedJarFromStream",
"org.jboss.console",
"org.jboss.ejb3.stateful.StatefulBeanContextReference",
"org.jboss.iiop",
@@ -136,9 +135,6 @@
"org.jboss.security.SimplePrincipal",
"org.jboss.security.SubjectSecurityProxyFactory",
"org.jboss.services.binding.DuplicateServiceException",
- // unclear if vfs classes are serialized to client
- "org.jboss.virtual.plugins.context.vfs.AssembledDirectoryHandler",
- "org.jboss.virtual.plugins.context.zip.ZipEntryHandler",
// ignore webservices framework classes
"org.jboss.wsf",
// lib/endorsed/stax-api.jar
@@ -157,8 +153,6 @@
"org.jacorb",
"javax.faces",
"org.jboss.resource.adapter.jdbc.vendor.MSSQLValidConnectionChecker",
- "org.jboss.virtual.AssembledDirectory",
- "org.jboss.virtual.plugins.context.vfs.AssembledFileHandler",
"javax.xml.ws.soap.SOAPFaultException",
"org.jboss.metadata.ear.jboss.JBossAppMetaData",
"org.jboss.metadata.jpa.spec.PersistenceUnitMetaData",
@@ -211,8 +205,6 @@
"org.jboss.security.SubjectSecurityProxyFactory",
"org.jboss.services.binding.DuplicateServiceException",
// unclear if vfs classes are serialized to client
- "org.jboss.virtual.plugins.context.vfs.AssembledDirectoryHandler",
- "org.jboss.virtual.plugins.context.zip.ZipEntryHandler",
// ignore webservices framework classes
"org.jboss.wsf",
// lib/endorsed/stax-api.jar
@@ -231,10 +223,6 @@
"org.jacorb",
"javax.faces",
"org.jboss.resource.adapter.jdbc.vendor.MSSQLValidConnectionChecker",
- "org.jboss.virtual.AssembledDirectory",
- "org.jboss.virtual.AssembledDirectoryHandler",
- "org.jboss.virtual.plugins.context.vfs.AssembledFileHandler",
- "org.jboss.virtual.plugins.context.zip.ZipEntryHandler",
"javax.xml.ws.soap.SOAPFaultException",
"org.jboss.metadata.ear.jboss.JBossAppMetaData",
"org.jboss.metadata.jpa.spec.PersistenceUnitMetaData",
@@ -283,14 +271,10 @@
"org.jgroups",
"javax.faces",
"org.jboss.resource.adapter.jdbc.vendor.MSSQLValidConnectionChecker",
- "org.jboss.virtual.AssembledDirectory",
- "org.jboss.virtual.plugins.context.vfs.AssembledFileHandler",
"javax.xml.ws.soap.SOAPFaultException",
"org.jboss.classloading.spi.dependency.Module",
"org.jboss.metadata.ear.jboss.JBossAppMetaData",
"org.jboss.metadata.jpa.spec.PersistenceUnitMetaData",
- "org.jboss.virtual.plugins.context.vfs.AssembledDirectoryHandler",
- "org.jboss.virtual.plugins.context.zip.ZipEntryHandler",
// ignore webservices framework classes as done in other test versions
"org.jboss.wsf",
// those were changed to match 423 ids
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -50,7 +50,6 @@
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
import org.jboss.test.JBossTestSetup;
-import org.jboss.virtual.VFS;
/**
* Abstract deployment test.
@@ -259,8 +258,6 @@
ProfileService ps = (ProfileService)ctx.lookup("ProfileService");
ManagementView activeView = ps.getViewManager();
activeView.load();
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
return activeView;
}
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -22,10 +22,10 @@
package org.jboss.test.deployers.seam.test;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Arrays;
-import java.util.Map;
import junit.framework.Test;
@@ -33,8 +33,8 @@
import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.mx.loading.UnifiedLoaderRepository3;
import org.jboss.test.JBossTestCase;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -82,14 +82,13 @@
jboss-seam-booking.war/WEB-INF/pages.xml
jboss-seam-booking.war/WEB-INF/web.xml
*/
- protected VirtualFile getRoot(boolean noCopy) throws IOException
+ protected VirtualFile getRoot(boolean noCopy) throws IOException, URISyntaxException
{
URL url = getDeployURL("jboss-seam-booking.ear");
if(noCopy)
url = new URL(url.toExternalForm() + "?useNoCopyJarHandler=true");
assertNotNull(url);
- VFS vfs = VFS.getVFS(url);
- VirtualFile vf = vfs.getRoot();
+ VirtualFile vf = VFS.getChild(url);
assertNotNull(vf);
return vf;
}
@@ -99,19 +98,19 @@
URL[] cp = {
// ear
ear.toURL(),
- ear.findChild("lib/commons-beanutils.jar").toURL(),
- ear.findChild("lib/commons-digester.jar").toURL(),
- ear.findChild("lib/commons-digester.jar").toURL(),
- ear.findChild("lib/jboss-el.jar").toURL(),
- ear.findChild("lib/richfaces-api.jar").toURL(),
- ear.findChild("jboss-seam.jar").toURL(),
- ear.findChild("jboss-seam-booking.jar").toURL(),
- ear.findChild("jboss-seam-booking.war/WEB-INF/classes/").toURL(),
- ear.findChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-debug.jar").toURL(),
- ear.findChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-ui.jar").toURL(),
- ear.findChild("jboss-seam-booking.war/WEB-INF/lib/jsf-facelets.jar").toURL(),
- ear.findChild("jboss-seam-booking.war/WEB-INF/lib/richfaces-impl.jar").toURL(),
- ear.findChild("jboss-seam-booking.war/WEB-INF/lib/richfaces-ui.jar").toURL(),
+ ear.getChild("lib/commons-beanutils.jar").toURL(),
+ ear.getChild("lib/commons-digester.jar").toURL(),
+ ear.getChild("lib/commons-digester.jar").toURL(),
+ ear.getChild("lib/jboss-el.jar").toURL(),
+ ear.getChild("lib/richfaces-api.jar").toURL(),
+ ear.getChild("jboss-seam.jar").toURL(),
+ ear.getChild("jboss-seam-booking.jar").toURL(),
+ ear.getChild("jboss-seam-booking.war/WEB-INF/classes/").toURL(),
+ ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-debug.jar").toURL(),
+ ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-ui.jar").toURL(),
+ ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jsf-facelets.jar").toURL(),
+ ear.getChild("jboss-seam-booking.war/WEB-INF/lib/richfaces-impl.jar").toURL(),
+ ear.getChild("jboss-seam-booking.war/WEB-INF/lib/richfaces-ui.jar").toURL(),
};
return cp;
}
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/spaces/test/SpacesUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/spaces/test/SpacesUnitTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/spaces/test/SpacesUnitTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -27,8 +27,8 @@
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.test.deployers.OldAbstractDeploymentTest;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* A test that deploys everything in an EAR.
@@ -45,10 +45,10 @@
File file = new File(deployDir);
file = new File(file, "dir with spaces");
URI contextName = file.toURI();
- VFS vfs = VFS.getVFS(contextName);
+ VirtualFile contextFile = VFS.getChild(contextName);
// Create the deployment
- VirtualFile vf = vfs.getChild("spaces.ear");
+ VirtualFile vf = contextFile.getChild("spaces.ear");
assertNotNull(vf);
Deployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(vf);
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -38,8 +38,8 @@
import org.jboss.profileservice.spi.DeploymentOption;
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.ProfileKey;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* Basic DeploymentManager test.
@@ -243,8 +243,7 @@
String deployed = start.getDeploymentID().getRepositoryNames()[0];
// Delete the file manually
- VFS.init();
- VirtualFile f = VFS.getRoot(new URI(deployed));
+ VirtualFile f = VFS.getChild(new URI(deployed));
assertTrue(deployed, f.exists());
assertTrue("deleted " + deployed, f.delete());
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -36,7 +36,6 @@
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
-import org.jboss.virtual.VFS;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -136,8 +135,6 @@
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
ManagementView activeView = ps.getViewManager();
activeView.load();
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
return activeView;
}
@@ -155,8 +152,6 @@
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
deployMgr = ps.getDeploymentManager();
deployMgr.loadProfile(getProfileKey());
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
}
return deployMgr;
}
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -41,7 +41,6 @@
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
-import org.jboss.virtual.VFS;
/**
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
@@ -189,8 +188,6 @@
InitialContext ctx = getInitialContext();
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
activeView = ps.getViewManager();
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
}
// Reload
activeView.load();
@@ -210,8 +207,6 @@
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
deployMgr = ps.getDeploymentManager();
deployMgr.loadProfile(getProfileKey());
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
}
return deployMgr;
}
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -49,7 +49,6 @@
import org.jboss.profileservice.management.matchers.AliasMatcher;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
-import org.jboss.virtual.VFS;
/**
* Tests of key server bean managed object views
@@ -277,8 +276,6 @@
InitialContext ctx = getInitialContext();
ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
activeView = ps.getViewManager();
- // Init the VFS to setup the vfs* protocol handlers
- VFS.init();
}
activeView.load();
return activeView;
Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/security/service/HttpsClient.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/security/service/HttpsClient.java 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/security/service/HttpsClient.java 2010-01-12 00:57:04 UTC (rev 99258)
@@ -39,8 +39,7 @@
import org.jboss.logging.Logger;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.test.util.SecurityProviderUtil;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.plugins.vfs.VirtualFileURLConnection;
+import org.jboss.vfs.VirtualFile;
/** A test mbean service that reads input from an https url passed in
to its readURL method.
@@ -149,22 +148,6 @@
URL keyStoreURL = loader.getResource("META-INF/tst.keystore");
if (keyStoreURL == null)
throw new IOException("Failed to find resource tst.keystore");
- if (keyStoreURL.getProtocol().equals("vfszip"))
- {
- VirtualFileURLConnection conn = (VirtualFileURLConnection) keyStoreURL.openConnection();
- VirtualFile vf = conn.getContent();
- InputStream is = vf.openStream();
- File tmp = File.createTempFile("tst-", ".keystore");
- tmp.deleteOnExit();
- FileOutputStream fos = new FileOutputStream(tmp);
- byte[] buffer = new byte[1024];
- int bytes;
- while ((bytes = is.read(buffer)) > 0)
- fos.write(buffer, 0, bytes);
- fos.close();
- is.close();
- keyStoreURL = tmp.toURL();
- }
log.debug("Setting javax.net.ssl.trustStore to: " + keyStoreURL.getPath());
System.setProperty("javax.net.ssl.trustStore", keyStoreURL.getPath());
}
Modified: branches/vfs3-int/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- branches/vfs3-int/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2010-01-12 00:54:47 UTC (rev 99257)
+++ branches/vfs3-int/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2010-01-12 00:57:04 UTC (rev 99258)
@@ -25,7 +25,7 @@
<bean name="WARStructure" class="org.jboss.web.deployers.WARStructure">
<property name="webInfLibFilter">
<!-- We accept all .jar files in WEB-INF/lib -->
- <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter">
+ <bean name="WebInfLibFilter" class="org.jboss.vfs.util.SuffixMatchFilter">
<constructor><parameter class="java.lang.String">.jar</parameter></constructor>
</bean>
</property>
More information about the jboss-cvs-commits
mailing list