[jboss-cvs] JBossAS SVN: r94633 - in branches/vfs3-integration: connector/src/main/java/org/jboss/resource/deployers and 58 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 9 19:00:40 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-10-09 19:00:38 -0400 (Fri, 09 Oct 2009)
New Revision: 94633
Modified:
branches/vfs3-integration/cluster/src/main/java/org/jboss/profileservice/cluster/repository/DefaultRepositoryClusteringHandler.java
branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java
branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
branches/vfs3-integration/deployment/src/main/java/org/jboss/deployment/services/DeploymentManagerService.java
branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java
branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java
branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/deployers/metadata/SessionFactoryMetaData.java
branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/HibernateMappingVisitor.java
branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/domain/DomainProfileFactory.java
branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/AbstractTemplateCreator.java
branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java
branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
branches/vfs3-integration/security/src/main/java/org/jboss/security/deployers/AclConfigParsingDeployer.java
branches/vfs3-integration/security/src/main/java/org/jboss/security/deployers/JAXBElementParsingDeployer.java
branches/vfs3-integration/server/src/etc/conf/all/bootstrap/deployers.xml
branches/vfs3-integration/server/src/etc/conf/all/bootstrap/profile.xml
branches/vfs3-integration/server/src/etc/conf/all/bootstrap/vfs.xml
branches/vfs3-integration/server/src/etc/conf/default/bootstrap/profile.xml
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AltAnnotationMetaDataDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AnnotatedClassFilter.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AppParsingDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EARContentsDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EARStructure.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EarLibExcludeDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/FileNameVirtualFileFilter.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/HandlesTypesClassFilter.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/OptAnnotationMetaDataDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/ServletContainerInitializerDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/WebAppFragmentParsingDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/vfs/VFSCacheOperations.java
branches/vfs3-integration/server/src/main/java/org/jboss/deployment/vfs/VFSCacheStatistics.java
branches/vfs3-integration/server/src/main/java/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCXmlFileLoader.java
branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployment.java
branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/WARStructure.java
branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/deployers/SpringParserDeployer.java
branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResource.java
branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResourceLoader.java
branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResourcePatternResolver.java
branches/vfs3-integration/system-jmx/src/main/java/org/jboss/deployment/MainDeployer.java
branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/SARArchiveFilter.java
branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/ServiceXSLDeployer.java
branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java
branches/vfs3-integration/system/src/main/java/org/jboss/deployers/plugins/scanner/VFSDeploymentScannerImpl.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/basic/IncludeExcludeVisitorAttributes.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/repository/AbstractImmutableProfile.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/VFSScanner.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/attachments/AttachmentStore.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/ProfileServicePersistenceDeployer.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileDeployment.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultDeploymentRepositoryFactory.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultProfileDeploymentFactory.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/FilteredProfileFactory.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/XmlProfileFactory.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepositoryFactory.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/RepositoryClusteringHandler.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/AbstractLocalContentManager.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/LocalContentManager.java
branches/vfs3-integration/system/src/main/java/org/jboss/system/tools/ProfileServiceDeploymentRepositoryAdapter.java
branches/vfs3-integration/system/src/resources/deploy/beans/test-beans.xml
branches/vfs3-integration/system/src/resources/deploy/beans/unpacked.beans/META-INF/jboss-beans.xml
branches/vfs3-integration/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml
branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java
branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java
branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/test/ProfileServiceUnitTestCase.java
branches/vfs3-integration/testsuite/build.xml
branches/vfs3-integration/testsuite/imports/server-config.xml
branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/spaces/test/SpacesUnitTestCase.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
branches/vfs3-integration/testsuite/src/main/org/jboss/test/security/service/HttpsClient.java
branches/vfs3-integration/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile.xml
branches/vfs3-integration/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
branches/vfs3-integration/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
branches/vfs3-integration/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml
branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/VFSDirContext.java
branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
branches/vfs3-integration/tomcat/src/resources/war-deployers-jboss-beans.xml
branches/vfs3-integration/varia/src/main/java/org/jboss/varia/deployment/LegacyBeanShellDeployer.java
branches/vfs3-integration/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
branches/vfs3-integration/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java
Log:
Blanket org.jboss.virtual -> org.jboss.vfs to get things started. True migration of AS components depends on the external projects migrating first.
Modified: branches/vfs3-integration/cluster/src/main/java/org/jboss/profileservice/cluster/repository/DefaultRepositoryClusteringHandler.java
===================================================================
--- branches/vfs3-integration/cluster/src/main/java/org/jboss/profileservice/cluster/repository/DefaultRepositoryClusteringHandler.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/cluster/src/main/java/org/jboss/profileservice/cluster/repository/DefaultRepositoryClusteringHandler.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -56,7 +56,7 @@
import org.jboss.system.server.profileservice.repository.clustered.sync.SynchronizationReadAction;
import org.jboss.system.server.profileservice.repository.clustered.sync.SynchronizationRemoteAction;
import org.jboss.system.server.profileservice.repository.clustered.sync.SynchronizationWriteAction;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* {@link RepositoryClusteringHandler} implementation that uses {@link HAPartition}.
Modified: branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -46,7 +46,7 @@
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
Modified: branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java
===================================================================
--- branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -33,7 +33,7 @@
import org.jboss.resource.metadata.JBossRAMetaData;
import org.jboss.resource.metadata.RARDeploymentMetaData;
import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.xb.binding.ObjectModelFactory;
/**
Modified: branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
===================================================================
--- branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplate.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplate.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -45,8 +45,8 @@
import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* The connection factory template implementation.
Modified: branches/vfs3-integration/deployment/src/main/java/org/jboss/deployment/services/DeploymentManagerService.java
===================================================================
--- branches/vfs3-integration/deployment/src/main/java/org/jboss/deployment/services/DeploymentManagerService.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/deployment/src/main/java/org/jboss/deployment/services/DeploymentManagerService.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -54,8 +54,8 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.util.file.Files;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* A service that supports the JSR-88 DeploymentManager operations.
Modified: branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -59,7 +59,7 @@
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.RemoteEnvironment;
import org.jboss.util.NotImplementedException;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Injection of the application client main class is handled from here.
Modified: branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -67,7 +67,7 @@
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.serviceref.ServiceReferenceHandler;
import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
/**
Modified: branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientScanningDeployer.java
===================================================================
--- branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientScanningDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/AppClientScanningDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -29,8 +29,8 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
/**
* Scan the main & super classes for annotations.
Modified: branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -40,7 +40,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.logging.Logger;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Creates initial EJB deployments and initializes only basic metadata.
Modified: branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -48,8 +48,8 @@
import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.naming.Util;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
/**
* Deploys a client application jar.
Modified: branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -49,7 +49,7 @@
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Deployes EJB 3 components based on meta data coming from JBossEjbParsingDeployer.
Modified: branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java
===================================================================
--- branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/ejb3/src/main/java/org/jboss/ejb3/deployers/JBoss5DeploymentUnit.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -31,12 +31,12 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.context.jar.JarUtils;
-import org.jboss.virtual.plugins.vfs.helpers.FilterVirtualFileVisitor;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VisitorAttributes;
+import org.jboss.vfs.plugins.context.jar.JarUtils;
+import org.jboss.vfs.plugins.vfs.helpers.FilterVirtualFileVisitor;
+import org.jboss.vfs.plugins.vfs.helpers.SuffixesExcludeFilter;
/**
* Comment
Modified: branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/deployers/metadata/SessionFactoryMetaData.java
===================================================================
--- branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/deployers/metadata/SessionFactoryMetaData.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/deployers/metadata/SessionFactoryMetaData.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -33,7 +33,7 @@
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.hibernate.jmx.Hibernate;
import org.jboss.util.id.GUID;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Hibernate session factory metadata.
Modified: branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java
===================================================================
--- branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/Hibernate.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -46,8 +46,8 @@
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.logging.Logger;
import org.jboss.util.naming.Util;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* The {@link HibernateMBean} implementation.
Modified: branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/HibernateMappingVisitor.java
===================================================================
--- branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/HibernateMappingVisitor.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/hibernate-int/src/main/java/org/jboss/hibernate/jmx/HibernateMappingVisitor.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -25,9 +25,9 @@
import java.util.Set;
import java.util.HashSet;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileVisitor;
+import org.jboss.vfs.VisitorAttributes;
/**
* Mapping visitor, matching .hbm.xml files.
Modified: branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/domain/DomainProfileFactory.java
===================================================================
--- branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/domain/DomainProfileFactory.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/domain/DomainProfileFactory.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -37,8 +37,8 @@
import org.jboss.system.server.profile.repository.metadata.HotDeploymentProfileMetaData;
import org.jboss.system.server.profile.repository.metadata.ProfilesMetaData;
import org.jboss.system.server.profileservice.repository.AbstractBootstrapProfileFactory;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
Modified: branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/AbstractTemplateCreator.java
===================================================================
--- branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/AbstractTemplateCreator.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/AbstractTemplateCreator.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -28,7 +28,7 @@
import org.jboss.deployers.spi.management.deploy.DeploymentProgress;
import org.jboss.managed.api.DeploymentTemplateInfo;
import org.jboss.profileservice.spi.ProfileKey;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A basic template creator, which applies and distributes the template.
Modified: branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java
===================================================================
--- branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/templates/JmsDestinationTemplate.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -51,8 +51,8 @@
import org.jboss.metatype.api.values.MetaValueFactory;
import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.metatype.plugins.values.MetaValueFactoryBuilder;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java
===================================================================
--- branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/AbstractDeployHandler.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -50,7 +50,7 @@
import org.jboss.security.SecurityContext;
import org.jboss.system.server.profileservice.repository.DefaultProfileDeploymentFactory;
import org.jboss.system.server.profileservice.repository.MainDeployerAdapter;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A remoting StreamInvocationHandler installed as the profile service subsystem
Modified: branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/DeployHandler.java
===================================================================
--- branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/DeployHandler.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/profileservice/src/main/java/org/jboss/profileservice/management/upload/remoting/DeployHandler.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -36,8 +36,8 @@
import org.jboss.profileservice.spi.MutableProfile;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileService;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* A profile service deploy subsystem handling transient deployments.
Modified: branches/vfs3-integration/security/src/main/java/org/jboss/security/deployers/AclConfigParsingDeployer.java
===================================================================
--- branches/vfs3-integration/security/src/main/java/org/jboss/security/deployers/AclConfigParsingDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/security/src/main/java/org/jboss/security/deployers/AclConfigParsingDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
import org.jboss.security.acl.config.ACLConfiguration;
import org.jboss.security.acl.config.ACLConfigurationFactory;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Parsing Deployer for ACL jboss-acl-policy.xml that
Modified: branches/vfs3-integration/security/src/main/java/org/jboss/security/deployers/JAXBElementParsingDeployer.java
===================================================================
--- branches/vfs3-integration/security/src/main/java/org/jboss/security/deployers/JAXBElementParsingDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/security/src/main/java/org/jboss/security/deployers/JAXBElementParsingDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -29,7 +29,7 @@
import org.jboss.deployers.vfs.spi.deployer.JAXBDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.xml.sax.InputSource;
/**
Modified: branches/vfs3-integration/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- branches/vfs3-integration/server/src/etc/conf/all/bootstrap/deployers.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/etc/conf/all/bootstrap/deployers.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -124,7 +124,7 @@
<bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
<!-- A filter to exclude some obvious non-subdeployments -->
<property name="filter">
- <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+ <bean name="JARFilter" class="org.jboss.vfs.plugins.vfs.helpers.SuffixesExcludeFilter">
<constructor><parameter>
<list elementClass="java.lang.String">
<!-- Exclude class files as subdeployments -->
Modified: branches/vfs3-integration/server/src/etc/conf/all/bootstrap/profile.xml
===================================================================
--- branches/vfs3-integration/server/src/etc/conf/all/bootstrap/profile.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/etc/conf/all/bootstrap/profile.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -203,7 +203,7 @@
</bean>
<!-- A filter for excluding files from the scanner -->
- <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
+ <bean name="DeploymentFilter" class="org.jboss.vfs.plugins.vfs.helpers.ExtensibleFilter">
<!-- Files starting with theses strings are ignored -->
<property name="prefixes">#,%,\,,.,_$</property>
<!-- Files ending with theses strings are ignored -->
Modified: branches/vfs3-integration/server/src/etc/conf/all/bootstrap/vfs.xml
===================================================================
--- branches/vfs3-integration/server/src/etc/conf/all/bootstrap/vfs.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/etc/conf/all/bootstrap/vfs.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -5,13 +5,13 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="VFSCache">
- <constructor factoryClass="org.jboss.virtual.spi.cache.VFSCacheFactory" factoryMethod="getInstance">
+ <constructor factoryClass="org.jboss.vfs.spi.cache.VFSCacheFactory" factoryMethod="getInstance">
<!-- Use the CombinedVFSCache implementation -->
- <parameter>org.jboss.virtual.plugins.cache.CombinedVFSCache</parameter>
+ <parameter>org.jboss.vfs.plugins.cache.CombinedVFSCache</parameter>
</constructor>
<start ignored="true"/>
<property name="permanentRoots">
- <map keyClass="java.net.URL" valueClass="org.jboss.virtual.spi.ExceptionHandler">
+ <map keyClass="java.net.URL" valueClass="org.jboss.vfs.spi.ExceptionHandler">
<entry>
<key>${jboss.lib.url}</key>
<value><null/></value>
@@ -37,11 +37,11 @@
</map>
</property>
<property name="realCache">
- <bean class="org.jboss.virtual.plugins.cache.IterableTimedVFSCache"/>
+ <bean class="org.jboss.vfs.plugins.cache.IterableTimedVFSCache"/>
</property>
</bean>
- <bean name="VfsNamesExceptionHandler" class="org.jboss.virtual.plugins.context.helpers.NamesExceptionHandler">
+ <bean name="VfsNamesExceptionHandler" class="org.jboss.vfs.plugins.context.helpers.NamesExceptionHandler">
<constructor>
<parameter class="java.lang.String">sqljdbc.jar</parameter>
</constructor>
Modified: branches/vfs3-integration/server/src/etc/conf/default/bootstrap/profile.xml
===================================================================
--- branches/vfs3-integration/server/src/etc/conf/default/bootstrap/profile.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/etc/conf/default/bootstrap/profile.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -164,7 +164,7 @@
</bean>
<!-- A filter for excluding files from the scanner -->
- <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
+ <bean name="DeploymentFilter" class="org.jboss.vfs.plugins.vfs.helpers.ExtensibleFilter">
<!-- Files starting with theses strings are ignored -->
<property name="prefixes">#,%,\,,.,_$</property>
<!-- Files ending with theses strings are ignored -->
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AltAnnotationMetaDataDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AltAnnotationMetaDataDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AltAnnotationMetaDataDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -71,7 +71,7 @@
import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
import org.jboss.deployers.spi.annotations.Element;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A POST_CLASSLOADER deployer which generates metadata from annotations.
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AnnotatedClassFilter.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AnnotatedClassFilter.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AnnotatedClassFilter.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -22,7 +22,6 @@
package org.jboss.deployment;
import java.io.IOException;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -33,10 +32,10 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VirtualFileVisitor;
+import org.jboss.vfs.VisitorAttributes;
/**
* A VirtualFileVisitor that traverses unit root and determines the
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AnnotationMetaDataDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -48,8 +48,8 @@
import org.jboss.metadata.web.spec.Web25MetaData;
import org.jboss.metadata.web.spec.Web30MetaData;
import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
/**
* A POST_CLASSLOADER deployer which generates metadata from
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AppParsingDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AppParsingDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/AppParsingDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -32,7 +32,7 @@
import org.jboss.metadata.ear.spec.ModulesMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EARContentsDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EARContentsDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EARContentsDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -41,8 +41,8 @@
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.ModulesMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
/**
* An implicit application.xml type of deployer. This deployer runs if
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EARStructure.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EARStructure.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EARStructure.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -41,10 +41,10 @@
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.ModulesMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.plugins.vfs.helpers.SuffixMatchFilter;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EarLibExcludeDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EarLibExcludeDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/EarLibExcludeDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -30,8 +30,8 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* Exclude ear's lib from AnnotationEnvironmentDeployer / OptAnnotationMetaDataDeployer processing.
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/FileNameVirtualFileFilter.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/FileNameVirtualFileFilter.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/FileNameVirtualFileFilter.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -25,8 +25,8 @@
import java.util.Set;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* Exclude virtual file by file name and path.
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/HandlesTypesClassFilter.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/HandlesTypesClassFilter.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/HandlesTypesClassFilter.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -33,10 +33,10 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VirtualFileVisitor;
+import org.jboss.vfs.VisitorAttributes;
/**
* A VirtualFileVisitor that traverses unit root and determines the
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/JBossEjbParsingDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -29,8 +29,8 @@
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
/**
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/OptAnnotationMetaDataDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/OptAnnotationMetaDataDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/OptAnnotationMetaDataDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -46,7 +46,7 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A POST_CLASSLOADER deployer which generates metadata from annotations.
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/ServletContainerInitializerDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/ServletContainerInitializerDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/ServletContainerInitializerDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -38,7 +38,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A deployer that processes ServletContainerInitializer.
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.spec.TldMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* An ObjectModelFactoryDeployer for translating tag library descriptors into
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/WebAppFragmentParsingDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/WebAppFragmentParsingDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/WebAppFragmentParsingDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.spec.WebFragmentMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* An ObjectModelFactoryDeployer for translating web-fragment.xml descriptors into
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/vfs/VFSCacheOperations.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/vfs/VFSCacheOperations.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/vfs/VFSCacheOperations.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -21,8 +21,8 @@
*/
package org.jboss.deployment.vfs;
-import org.jboss.virtual.spi.cache.VFSCache;
-import org.jboss.virtual.spi.cache.VFSCacheFactory;
+import org.jboss.vfs.spi.cache.VFSCache;
+import org.jboss.vfs.spi.cache.VFSCacheFactory;
/**
* Simple vfs cache ops.
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/deployment/vfs/VFSCacheStatistics.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/deployment/vfs/VFSCacheStatistics.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/deployment/vfs/VFSCacheStatistics.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -24,10 +24,10 @@
import java.util.Collections;
import java.util.Date;
-import org.jboss.virtual.spi.VFSContext;
-import org.jboss.virtual.spi.cache.CacheStatistics;
-import org.jboss.virtual.spi.cache.VFSCache;
-import org.jboss.virtual.spi.cache.VFSCacheFactory;
+import org.jboss.vfs.spi.VFSContext;
+import org.jboss.vfs.spi.cache.CacheStatistics;
+import org.jboss.vfs.spi.cache.VFSCache;
+import org.jboss.vfs.spi.cache.VFSCacheFactory;
/**
* Simple vfs cache statistics.
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCXmlFileLoader.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCXmlFileLoader.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCXmlFileLoader.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -26,7 +26,7 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.XmlFileLoader;
import org.jboss.ejb.Container;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.w3c.dom.Element;
/**
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -67,9 +67,9 @@
import org.jboss.system.metadata.ServiceInjectionValueMetaData;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.util.file.Files;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
import org.jboss.web.WebApplication;
/** A template pattern class for web container integration into JBoss. This class
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployment.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployment.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -70,7 +70,7 @@
import org.jboss.security.authorization.PolicyRegistration;
import org.jboss.web.WebApplication;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.virtual.VFSUtils;
+import org.jboss.vfs.VFSUtils;
import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
import org.omg.CORBA.ORB;
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -29,12 +29,8 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.ServiceLoader;
import java.util.Set;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.annotation.HandlesTypes;
-
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
@@ -52,7 +48,7 @@
import org.jboss.metadata.web.spec.WebFragmentMetaData;
import org.jboss.metadata.web.spec.WebCommonMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A deployer that merges annotation metadata, xml metadata, and jboss metadata
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/WARStructure.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/WARStructure.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/WARStructure.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -29,10 +29,10 @@
import org.jboss.deployers.spi.structure.ContextInfo;
import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
import org.jboss.deployers.vfs.spi.structure.StructureContext;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VisitorAttributes;
+import org.jboss.vfs.plugins.vfs.helpers.SuffixMatchFilter;
/**
* WARStructure.
Modified: branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
===================================================================
--- branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -40,7 +40,7 @@
import org.jboss.metadata.web.spec.Web25MetaData;
import org.jboss.metadata.web.spec.Web30MetaData;
import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A POST_CLASSLOADER deployer which generates metadata from
Modified: branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/deployers/SpringParserDeployer.java
===================================================================
--- branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/deployers/SpringParserDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/deployers/SpringParserDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -23,7 +23,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Spring deployer.
Modified: branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResource.java
===================================================================
--- branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResource.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResource.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -28,8 +28,8 @@
import java.io.File;
import java.io.InputStream;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VFSUtils;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VFSUtils;
import org.springframework.core.io.Resource;
/**
Modified: branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResourceLoader.java
===================================================================
--- branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResourceLoader.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResourceLoader.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -23,8 +23,8 @@
import java.net.URL;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
Modified: branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResourcePatternResolver.java
===================================================================
--- branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResourcePatternResolver.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/spring-int/src/main/java/org/jboss/spring/io/VFSResourcePatternResolver.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -28,10 +28,10 @@
import java.util.Enumeration;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileVisitor;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileVisitor;
+import org.jboss.vfs.VisitorAttributes;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/deployers/plugins/scanner/VFSDeploymentScannerImpl.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/deployers/plugins/scanner/VFSDeploymentScannerImpl.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/deployers/plugins/scanner/VFSDeploymentScannerImpl.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -43,9 +43,9 @@
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
import org.jboss.util.StringPropertyReplacer;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -23,8 +23,8 @@
import java.util.regex.Pattern;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* Pattern filter.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/basic/IncludeExcludeVisitorAttributes.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/basic/IncludeExcludeVisitorAttributes.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/basic/IncludeExcludeVisitorAttributes.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -26,9 +26,9 @@
import java.util.Set;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VisitorAttributes;
/**
* Include/exclude visitor attributes.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/repository/AbstractImmutableProfile.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/repository/AbstractImmutableProfile.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profile/repository/AbstractImmutableProfile.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -30,7 +30,7 @@
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.system.server.profileservice.repository.AbstractVFSProfileSource;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A immutable vfs based profile.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/VFSScanner.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/VFSScanner.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/VFSScanner.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -40,9 +40,9 @@
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.util.JBossObject;
import org.jboss.util.StringPropertyReplacer;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
import org.jboss.logging.Logger;
/**
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/attachments/AttachmentStore.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/attachments/AttachmentStore.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/attachments/AttachmentStore.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -27,7 +27,7 @@
import org.jboss.managed.api.ManagedComponent;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* The AttachmentStore.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -29,8 +29,8 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/ProfileServicePersistenceDeployer.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/ProfileServicePersistenceDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/ProfileServicePersistenceDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -32,7 +32,7 @@
import org.jboss.system.server.profileservice.attachments.RepositoryAttachmentMetaData;
import org.jboss.system.server.profileservice.persistence.PersistenceFactory;
import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* The ProfileService Persistence Deployer. This deployer applies the
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -51,7 +51,7 @@
import org.jboss.system.server.profileservice.attachments.RepositoryAttachmentMetaDataFactory;
import org.jboss.system.server.profileservice.persistence.PersistenceFactory;
import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* The AbstractAttachmentStore.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -35,7 +35,7 @@
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileKey;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A abstract VFS based deployment repository.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileDeployment.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileDeployment.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileDeployment.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -27,7 +27,7 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.profileservice.spi.ProfileDeployment;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* The profile deployment.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -37,9 +37,9 @@
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.ProfileDeployment;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* A abstract VFS based source for profile deployments.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -41,8 +41,8 @@
import org.jboss.profileservice.spi.ModificationInfo;
import org.jboss.profileservice.spi.ProfileDeployment;
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;
/**
* A basic deployment repository.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultDeploymentRepositoryFactory.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultDeploymentRepositoryFactory.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultDeploymentRepositoryFactory.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -35,7 +35,7 @@
import org.jboss.profileservice.spi.metadata.ProfileSourceMetaData;
import org.jboss.system.server.profile.repository.metadata.HotDeploymentProfileSourceMetaData;
import org.jboss.system.server.profile.repository.metadata.ImmutableProfileSourceMetaData;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFileFilter;
/**
* The default repository factory for immutable and mutable repositories.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultProfileDeploymentFactory.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultProfileDeploymentFactory.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultProfileDeploymentFactory.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -22,7 +22,7 @@
package org.jboss.system.server.profileservice.repository;
import org.jboss.profileservice.spi.ProfileDeployment;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Basic ProfileDeploymentFactory.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/FilteredProfileFactory.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/FilteredProfileFactory.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/FilteredProfileFactory.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -39,7 +39,7 @@
import org.jboss.profileservice.spi.metadata.ProfileSourceMetaData;
import org.jboss.system.server.profile.repository.AbstractImmutableProfile;
import org.jboss.system.server.profile.repository.metadata.FilteredProfileMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A filtered profile factory.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -33,7 +33,7 @@
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ModificationInfo.ModifyStatus;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* A deployment repository, with hot deployment capabilities.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/XmlProfileFactory.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/XmlProfileFactory.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/XmlProfileFactory.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -36,8 +36,8 @@
import org.jboss.system.server.profile.repository.metadata.FilteredProfileMetaData;
import org.jboss.system.server.profile.repository.metadata.HotDeploymentProfileMetaData;
import org.jboss.system.server.profile.repository.metadata.ProfilesMetaData;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -46,8 +46,8 @@
import org.jboss.system.server.profileservice.repository.clustered.metadata.RepositoryContentMetadata;
import org.jboss.system.server.profileservice.repository.clustered.metadata.RepositoryItemMetadata;
import org.jboss.system.server.profileservice.repository.clustered.metadata.RepositoryRootMetadata;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* DeploymentRepository that keeps its contents in sync across a cluster.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepositoryFactory.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepositoryFactory.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepositoryFactory.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -43,7 +43,7 @@
import org.jboss.system.server.profileservice.repository.clustered.metadata.ClusteredProfileSourceMetaData;
import org.jboss.system.server.profileservice.repository.clustered.metadata.HotDeploymentClusteredProfileSourceMetaData;
import org.jboss.system.server.profileservice.repository.clustered.metadata.ImmutableClusteredProfileSourceMetaData;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFileFilter;
/**
* Factory for clustered deployment repositories.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/RepositoryClusteringHandler.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/RepositoryClusteringHandler.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/RepositoryClusteringHandler.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -30,7 +30,7 @@
import org.jboss.system.server.profileservice.repository.clustered.metadata.RepositoryContentMetadata;
import org.jboss.system.server.profileservice.repository.clustered.metadata.RepositoryItemMetadata;
import org.jboss.system.server.profileservice.repository.clustered.sync.InconsistentRepositoryStructureException;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Handles intra-cluster operations for a clustered DeploymentRepository.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/AbstractLocalContentManager.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/AbstractLocalContentManager.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/AbstractLocalContentManager.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -44,8 +44,8 @@
import org.jboss.system.server.profileservice.repository.clustered.sync.SynchronizationActionContext;
import org.jboss.system.server.profileservice.repository.clustered.sync.SynchronizationId;
import org.jboss.system.server.profileservice.repository.clustered.sync.TwoPhaseCommitAction;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* Abstract base class for a {@link LocalContentManager} implementation.
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/LocalContentManager.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/LocalContentManager.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/LocalContentManager.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -35,7 +35,7 @@
import org.jboss.system.server.profileservice.repository.clustered.sync.SynchronizationAction;
import org.jboss.system.server.profileservice.repository.clustered.sync.SynchronizationActionContext;
import org.jboss.system.server.profileservice.repository.clustered.sync.SynchronizationId;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Object responsible for the local persistence operations associated with a
Modified: branches/vfs3-integration/system/src/main/java/org/jboss/system/tools/ProfileServiceDeploymentRepositoryAdapter.java
===================================================================
--- branches/vfs3-integration/system/src/main/java/org/jboss/system/tools/ProfileServiceDeploymentRepositoryAdapter.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/main/java/org/jboss/system/tools/ProfileServiceDeploymentRepositoryAdapter.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -42,7 +42,7 @@
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.system.server.profileservice.hotdeploy.Scanner;
import org.jboss.system.server.profileservice.repository.HotDeploymentRepository;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Profile deployment repository adapter.
Modified: branches/vfs3-integration/system/src/resources/deploy/beans/test-beans.xml
===================================================================
--- branches/vfs3-integration/system/src/resources/deploy/beans/test-beans.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/resources/deploy/beans/test-beans.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -4,8 +4,8 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="VFSClassLoader" class="org.jboss.virtual.classloading.VFSClassLoader">
- <constructor factoryClass="org.jboss.virtual.classloading.VFSClassLoaderFactory"
+ <bean name="VFSClassLoader" class="org.jboss.vfs.classloading.VFSClassLoader">
+ <constructor factoryClass="org.jboss.vfs.classloading.VFSClassLoaderFactory"
factoryMethod="newClassLoader">
<parameter class="java.net.URI">${jbosstest.support.dir}</parameter>
<parameter>
Modified: branches/vfs3-integration/system/src/resources/deploy/beans/unpacked.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/vfs3-integration/system/src/resources/deploy/beans/unpacked.beans/META-INF/jboss-beans.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/resources/deploy/beans/unpacked.beans/META-INF/jboss-beans.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -4,8 +4,8 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="VFSClassLoader-unpacked" class="org.jboss.virtual.classloading.VFSClassLoader">
- <constructor factoryClass="org.jboss.virtual.classloading.VFSClassLoaderFactory"
+ <bean name="VFSClassLoader-unpacked" class="org.jboss.vfs.classloading.VFSClassLoader">
+ <constructor factoryClass="org.jboss.vfs.classloading.VFSClassLoaderFactory"
factoryMethod="newClassLoader">
<parameter class="java.net.URI">${jbosstest.support.dir}</parameter>
<parameter>
Modified: branches/vfs3-integration/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml
===================================================================
--- branches/vfs3-integration/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -31,7 +31,7 @@
<bean name="JARStructureCandidates" class="org.jboss.deployers.plugins.structure.vfs.jar.JARCandidateStructureVisitorFactory">
<!-- A filter to exclude some obvious non-subdeployments -->
<property name="filter">
- <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+ <bean name="JARFilter" class="org.jboss.vfs.plugins.vfs.helpers.SuffixesExcludeFilter">
<constructor><parameter>
<list elementClass="java.lang.String">
<!-- Exclude class files as subdeployments -->
Modified: branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java
===================================================================
--- branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -32,7 +32,7 @@
import org.jboss.system.server.profileservice.attachments.AttachmentStore;
import org.jboss.system.server.profileservice.attachments.RepositoryAttachmentMetaData;
import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
Modified: branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java
===================================================================
--- branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -34,7 +34,7 @@
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.system.server.profileservice.repository.AbstractBootstrapProfileFactory;
import org.jboss.system.server.profileservice.repository.XmlProfileFactory;
-import org.jboss.virtual.plugins.context.jar.JarUtils;
+import org.jboss.vfs.plugins.context.jar.JarUtils;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
Modified: branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/test/ProfileServiceUnitTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system/src/tests/org/jboss/test/server/profileservice/test/ProfileServiceUnitTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -38,7 +38,7 @@
import org.jboss.system.server.profileservice.repository.XmlProfileFactory;
import org.jboss.test.server.profileservice.support.MockAttachmentStore;
import org.jboss.test.server.profileservice.support.MockMainDeployer;
-import org.jboss.virtual.plugins.context.jar.JarUtils;
+import org.jboss.vfs.plugins.context.jar.JarUtils;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
Modified: branches/vfs3-integration/system-jmx/src/main/java/org/jboss/deployment/MainDeployer.java
===================================================================
--- branches/vfs3-integration/system-jmx/src/main/java/org/jboss/deployment/MainDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system-jmx/src/main/java/org/jboss/deployment/MainDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -52,8 +52,8 @@
import org.jboss.util.file.Files;
import org.jboss.util.file.JarUtils;
import org.jboss.util.stream.Streams;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* The legacy component for deployer management. This now simply delegates to the
Modified: branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/SARArchiveFilter.java
===================================================================
--- branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/SARArchiveFilter.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/SARArchiveFilter.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -25,8 +25,8 @@
import java.util.Set;
import java.util.StringTokenizer;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* SARArchiveFilter.
Modified: branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -36,8 +36,8 @@
import org.jboss.system.metadata.ServiceMetaDataParser;
import org.jboss.system.server.ServerConfigLocator;
import org.jboss.util.xml.DOMWriter;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/ServiceXSLDeployer.java
===================================================================
--- branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/ServiceXSLDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/deployers/ServiceXSLDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -25,7 +25,7 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.system.metadata.ServiceDeployment;
import org.jboss.system.metadata.ServiceDeploymentParser;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.w3c.dom.Document;
public class ServiceXSLDeployer extends XSLDeployer<ServiceDeployment>
Modified: branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java
===================================================================
--- branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -71,8 +71,8 @@
import org.jboss.system.server.ServerInfoMBean;
import org.jboss.util.JBossObject;
import org.jboss.util.file.FileSuffixFilter;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* A pojo that creates a legacy jmx kernel ala the jboss-4.x server bootstrap.
Modified: branches/vfs3-integration/testsuite/build.xml
===================================================================
--- branches/vfs3-integration/testsuite/build.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/build.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -1608,7 +1608,7 @@
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
@@ -1680,7 +1680,7 @@
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.factory.initial" value="org.jboss.naming.HttpNamingContextFactory"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.http.url}"/>
@@ -1740,7 +1740,7 @@
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
@@ -2746,7 +2746,7 @@
<sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<!-- [JBAS-3969] IOException: unknown protocol: vfsfile -->
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -2807,7 +2807,7 @@
<sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<!-- [JBAS-3969] IOException: unknown protocol: vfsfile -->
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -3310,7 +3310,7 @@
</syspropertyset>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<sysproperty key="jboss.vfs.forceCopy" value="true"/>
<classpath>
@@ -3434,7 +3434,7 @@
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<!-- [JBAS-3969] IOException: unknown protocol: vfsfile -->
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
Modified: branches/vfs3-integration/testsuite/imports/server-config.xml
===================================================================
--- branches/vfs3-integration/testsuite/imports/server-config.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/imports/server-config.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -1295,7 +1295,7 @@
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<!-- [JBAS-3969] IOException: unknown protocol: vfsfile -->
- <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.vfs.protocol"/>
<syspropertyset>
<propertyref prefix="jbosstest"/>
</syspropertyset>
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -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-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -43,7 +43,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;
/**
* Test for JBAS-7102. Creates a war w/ 150MB of content in the farm
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -46,7 +46,7 @@
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.channelfactory.managed.ManagedObjectTestUtil;
-import org.jboss.virtual.VFS;
+import org.jboss.vfs.VFS;
/**
* Validates the expected ChannelFactory-related ManagedObjects are there
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ClusterPartitionManagedObjectsTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -40,7 +40,7 @@
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.virtual.VFS;
+import org.jboss.vfs.VFS;
/**
* Validates the expected HAPartition-related ManagedObjects are there
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -50,7 +50,7 @@
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
import org.jboss.test.JBossTestSetup;
-import org.jboss.virtual.VFS;
+import org.jboss.vfs.VFS;
/**
* Abstract deployment test.
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -25,7 +25,6 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Arrays;
-import java.util.Map;
import junit.framework.Test;
@@ -33,8 +32,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>
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/spaces/test/SpacesUnitTestCase.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/spaces/test/SpacesUnitTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/spaces/test/SpacesUnitTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -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.
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/deployers/test/DeploymentManagerUnitTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -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.
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -36,7 +36,7 @@
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
-import org.jboss.virtual.VFS;
+import org.jboss.vfs.VFS;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -41,7 +41,7 @@
import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
-import org.jboss.virtual.VFS;
+import org.jboss.vfs.VFS;
/**
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/profileservice/test/ServerManagedObjectsTestCase.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -21,22 +21,18 @@
*/
package org.jboss.test.profileservice.test;
-import java.net.InetAddress;
-import java.net.URL;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import javax.naming.InitialContext;
-import org.jboss.deployers.spi.management.KnownComponentTypes;
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.RunState;
import org.jboss.managed.plugins.ManagedOperationMatcher;
import org.jboss.metatype.api.types.EnumMetaType;
import org.jboss.metatype.api.types.MetaType;
@@ -45,11 +41,10 @@
import org.jboss.metatype.api.values.EnumValueSupport;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValue;
-import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.profileservice.management.matchers.AliasMatcher;
import org.jboss.profileservice.spi.ProfileService;
import org.jboss.test.JBossTestCase;
-import org.jboss.virtual.VFS;
+import org.jboss.vfs.VFS;
/**
* Tests of key server bean managed object views
Modified: branches/vfs3-integration/testsuite/src/main/org/jboss/test/security/service/HttpsClient.java
===================================================================
--- branches/vfs3-integration/testsuite/src/main/org/jboss/test/security/service/HttpsClient.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/main/org/jboss/test/security/service/HttpsClient.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -39,8 +39,8 @@
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;
+import org.jboss.vfs.plugins.vfs.VirtualFileURLConnection;
/** A test mbean service that reads input from an https url passed in
to its readURL method.
Modified: branches/vfs3-integration/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile.xml
===================================================================
--- branches/vfs3-integration/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -103,7 +103,7 @@
<bean name="ProfileServicePersistenceDeployer" class="org.jboss.system.server.profileservice.persistence.deployer.ProfileServicePersistenceDeployer" />
<!-- A filter for excluding files from the scanner -->
- <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
+ <bean name="DeploymentFilter" class="org.jboss.vfs.plugins.vfs.helpers.ExtensibleFilter">
<!-- Files starting with theses strings are ignored -->
<property name="prefixes">#,%,\,,.,_$</property>
<!-- Files ending with theses strings are ignored -->
Modified: branches/vfs3-integration/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- branches/vfs3-integration/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -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.plugins.vfs.helpers.SuffixMatchFilter">
<constructor><parameter class="java.lang.String">.jar</parameter></constructor>
</bean>
</property>
Modified: branches/vfs3-integration/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- branches/vfs3-integration/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -2,7 +2,7 @@
<!--
Web application deployers
- $Id:$
+ $Id$
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
@@ -10,7 +10,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.plugins.vfs.helpers.SuffixMatchFilter">
<constructor><parameter class="java.lang.String">.jar</parameter></constructor>
</bean>
</property>
Modified: branches/vfs3-integration/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml
===================================================================
--- branches/vfs3-integration/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -2,21 +2,21 @@
<!--
Web application deployers
-$Id:$
+$Id$
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- WAR Structure -->
- <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">
- <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
- </bean>
- </property>
- <property name="contextInfoOrder">1000</property>
- </bean>
+ <!-- WAR Structure -->
+ <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.vfs.plugins.vfs.helpers.SuffixMatchFilter">
+ <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
+ </bean>
+ </property>
+ <property name="contextInfoOrder">1000</property>
+ </bean>
+
<!-- web.xml parsing deployer -->
<bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
<property name="relativeOrder">2000</property>
Modified: branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -68,7 +68,7 @@
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.LifecycleCallbackMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.web.WebApplication;
import org.jboss.web.tomcat.service.injection.TomcatInjectionUtils;
import org.jboss.web.tomcat.service.injection.WebEJBHandler;
Modified: branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -113,7 +113,7 @@
import org.jboss.metadata.web.spec.WelcomeFileListMetaData;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.web.deployers.MergedJBossWebMetaDataDeployer;
import org.jboss.web.tomcat.metadata.ContextMetaData;
import org.jboss.web.tomcat.metadata.ParameterMetaData;
Modified: branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -37,11 +37,11 @@
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
+import org.jboss.vfs.VisitorAttributes;
+import org.jboss.vfs.plugins.vfs.helpers.SuffixMatchFilter;
import org.jboss.web.deployers.AbstractWarDeployer;
import org.jboss.web.deployers.AbstractWarDeployment;
import org.jboss.web.tomcat.service.session.SessionIDGenerator;
Modified: branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -60,7 +60,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.naming.NonSerializableFactory;
import org.jboss.security.SecurityUtil;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.web.WebApplication;
import org.jboss.web.deployers.AbstractWarDeployment;
import org.jboss.web.tomcat.security.JaccContextValve;
Modified: branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/VFSDirContext.java
===================================================================
--- branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/VFSDirContext.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/VFSDirContext.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -49,7 +49,7 @@
import org.apache.naming.resources.Resource;
import org.apache.naming.resources.ResourceAttributes;
import org.jboss.logging.Logger;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* VFS Directory Context implementation.
Modified: branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
===================================================================
--- branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -37,7 +37,7 @@
import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* The war deployment class loader deployer.
Modified: branches/vfs3-integration/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- branches/vfs3-integration/tomcat/src/resources/war-deployers-jboss-beans.xml 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/tomcat/src/resources/war-deployers-jboss-beans.xml 2009-10-09 23:00:38 UTC (rev 94633)
@@ -10,7 +10,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.plugins.vfs.helpers.SuffixMatchFilter">
<constructor><parameter class="java.lang.String">.jar</parameter></constructor>
</bean>
</property>
Modified: branches/vfs3-integration/varia/src/main/java/org/jboss/varia/deployment/LegacyBeanShellDeployer.java
===================================================================
--- branches/vfs3-integration/varia/src/main/java/org/jboss/varia/deployment/LegacyBeanShellDeployer.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/varia/src/main/java/org/jboss/varia/deployment/LegacyBeanShellDeployer.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -23,7 +23,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* .bsh file deployer.
Modified: branches/vfs3-integration/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- branches/vfs3-integration/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -10,7 +10,7 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
Modified: branches/vfs3-integration/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java
===================================================================
--- branches/vfs3-integration/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java 2009-10-09 22:52:44 UTC (rev 94632)
+++ branches/vfs3-integration/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSVirtualFileFilter.java 2009-10-09 23:00:38 UTC (rev 94633)
@@ -1,8 +1,8 @@
package org.jboss.webservices.integration.deployers.deployment;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilterWithAttributes;
-import org.jboss.virtual.VisitorAttributes;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilterWithAttributes;
+import org.jboss.vfs.VisitorAttributes;
/**
* WS file filter for files with the '.wsdl', or '.xsd' or '.xml' suffix.
More information about the jboss-cvs-commits
mailing list