[jboss-cvs] JBossAS SVN: r99292 - in branches/vfs3-int/system/src: main/java/org/jboss/system/server/profile/basic and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 12 10:52:18 EST 2010
Author: johnbailey
Date: 2010-01-12 10:52:16 -0500 (Tue, 12 Jan 2010)
New Revision: 99292
Modified:
branches/vfs3-int/system/src/main/java/org/jboss/deployers/plugins/scanner/VFSDeploymentScannerImpl.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/IncludeExcludeVisitorAttributes.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/XmlIncludeVirtualFileFilter.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/repository/AbstractImmutableProfile.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/VFSScanner.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/attachments/AttachmentStore.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/attachments/DeploymentStructureMetaData.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/ProfileServicePersistenceDeployer.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileDeployment.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileService.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultDeploymentRepositoryFactory.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultProfileDeploymentFactory.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/FilteredProfileFactory.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/XmlProfileFactory.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepositoryFactory.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/RepositoryClusteringHandler.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/AbstractLocalContentManager.java
branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/LocalContentManager.java
branches/vfs3-int/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml
branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java
branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java
branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/test/ProfileServiceUnitTestCase.java
Log:
[JBAS-7352] Initial VFS3 integration for jboss-as-system
Modified: branches/vfs3-int/system/src/main/java/org/jboss/deployers/plugins/scanner/VFSDeploymentScannerImpl.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/deployers/plugins/scanner/VFSDeploymentScannerImpl.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/deployers/plugins/scanner/VFSDeploymentScannerImpl.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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;
/**
@@ -266,7 +266,7 @@
if( uriList.add(uri) == true )
{
log.debug("Added URI: " + uri);
- VirtualFile vf = VFS.getRoot(uri);
+ VirtualFile vf = VFS.getChild(uri);
vdfList.add(vf);
}
}
@@ -278,7 +278,7 @@
{
throw new NullPointerException("uri argument cannot be null");
}
- VirtualFile vf = VFS.getRoot(uri);
+ VirtualFile vf = VFS.getChild(uri);
vdfList.remove(vf);
boolean success = uriList.remove(uri);
@@ -304,7 +304,7 @@
vdfList.clear();
for (URI uri : uriList)
{
- VirtualFile vf = VFS.getRoot(uri);
+ VirtualFile vf = VFS.getChild(uri);
vdfList.add(vf);
}
@@ -563,18 +563,11 @@
if we want to watch the same file as jboss4. But since not all files have a deployment
descriptor, we need to be able to watch the deployment root anyway.
*/
- try
+ DeploymentInfo info = new DeploymentInfo(deployment, vf.getLastModified());
+ if (!deployedMap.containsKey(vf))
{
- DeploymentInfo info = new DeploymentInfo(deployment, vf.getLastModified());
- if (!deployedMap.containsKey(vf))
- {
- deployedMap.put(vf, info);
- }
+ deployedMap.put(vf, info);
}
- catch(IOException e)
- {
- log.warn("Failed to obtain lastModified for: "+vf, e);
- }
}
/**
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -23,16 +23,15 @@
import java.util.regex.Pattern;
-import org.jboss.deployers.vfs.spi.structure.modified.AbstractPathNameFilter;
-import org.jboss.deployers.vfs.spi.structure.modified.StructureCacheFilter;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* Pattern filter.
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public abstract class AbstractPatternVirtualFileFilter extends AbstractPathNameFilter implements VirtualFileFilter
+public abstract class AbstractPatternVirtualFileFilter implements VirtualFileFilter
{
private Pattern pattern;
@@ -51,16 +50,16 @@
/**
* @see StructureCacheFilter#accepts(String)
*/
- public boolean accepts(String path)
+ public boolean accepts(VirtualFile file)
{
- if (path == null)
+ if (file == null)
{
return false;
}
// pattern match the path against our configured
// regext pattern
- return pattern.matcher(path).matches() == doMatch();
+ return pattern.matcher(file.getPathName()).matches() == doMatch();
}
}
\ No newline at end of file
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/IncludeExcludeVisitorAttributes.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/IncludeExcludeVisitorAttributes.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/IncludeExcludeVisitorAttributes.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profile/basic/XmlIncludeVirtualFileFilter.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/XmlIncludeVirtualFileFilter.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/basic/XmlIncludeVirtualFileFilter.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -21,17 +21,18 @@
*/
package org.jboss.system.server.profile.basic;
-import org.jboss.deployers.vfs.spi.structure.modified.AbstractPathNameFilter;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileFilter;
/**
* Include only .xml files.
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class XmlIncludeVirtualFileFilter extends AbstractPathNameFilter
+public class XmlIncludeVirtualFileFilter implements VirtualFileFilter
{
- public boolean accepts(String path)
+ public boolean accepts(VirtualFile file)
{
- return path.endsWith(".xml");
+ return file.getPathName().endsWith(".xml");
}
}
\ No newline at end of file
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/repository/AbstractImmutableProfile.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/repository/AbstractImmutableProfile.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profile/repository/AbstractImmutableProfile.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/VFSScanner.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/VFSScanner.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/VFSScanner.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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;
/**
@@ -596,6 +596,6 @@
*/
private VirtualFile getVFforURI(URI uri) throws IOException
{
- return VFS.getRoot(uri);
+ return VFS.getChild(uri);
}
}
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/attachments/AttachmentStore.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/attachments/AttachmentStore.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/attachments/AttachmentStore.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/attachments/DeploymentStructureMetaData.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/attachments/DeploymentStructureMetaData.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/attachments/DeploymentStructureMetaData.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -25,6 +25,8 @@
import javax.xml.bind.annotation.XmlElement;
+import org.jboss.deployers.spi.structure.MetaDataEntry;
+
/**
* Basic xml representation helper class of the StructureMetaData.
*
@@ -35,7 +37,7 @@
{
/** The meta data path */
- private List<String> metaDataPaths;
+ private List<MetaDataEntry> metaDataPaths;
/** The class paths */
private List<DeploymentClassPathMetaData> classPaths;
@@ -51,12 +53,12 @@
@XmlElement(name = "meta-data-path")
- public List<String> getMetaDataPaths()
+ public List<MetaDataEntry> getMetaDataPaths()
{
return metaDataPaths;
}
- public void setMetaDataPaths(List<String> metaDataPaths)
+ public void setMetaDataPaths(List<MetaDataEntry> metaDataPaths)
{
this.metaDataPaths = metaDataPaths;
}
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/PersistenceModificationChecker.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -25,12 +25,14 @@
import java.util.List;
import org.jboss.deployers.spi.structure.ContextInfo;
+import org.jboss.deployers.spi.structure.MetaDataEntry;
import org.jboss.deployers.spi.structure.StructureMetaData;
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;
+import org.jboss.vfs.util.SuffixMatchFilter;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -48,7 +50,7 @@
public static boolean hasBeenModified(VFSDeploymentUnit unit, long lastModified) throws Exception
{
VirtualFile root = unit.getRoot();
- if (root.isArchive() || root.isLeaf())
+ if (root.isFile())
{
if(root.getLastModified() > lastModified)
return true;
@@ -70,13 +72,13 @@
protected static boolean hasBeenModifed(VirtualFile root, ContextInfo contextInfo, long lastModified) throws IOException
{
- List<String> metadataPaths = contextInfo.getMetaDataPath();
+ List<MetaDataEntry> metadataPaths = contextInfo.getMetaDataPath();
if (metadataPaths != null && metadataPaths.isEmpty() == false)
{
- for (String metaDataPath : metadataPaths)
+ for (MetaDataEntry metaDataPath : metadataPaths)
{
- VirtualFile mdpVF = root.getChild(metaDataPath);
- if (mdpVF != null)
+ VirtualFile mdpVF = root.getChild(metaDataPath.getPath());
+ if (mdpVF.exists())
{
List<VirtualFile> children = mdpVF.getChildren(filter);
if (children != null && children.isEmpty() == false)
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/ProfileServicePersistenceDeployer.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/ProfileServicePersistenceDeployer.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/persistence/deployer/ProfileServicePersistenceDeployer.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -34,12 +34,15 @@
import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.plugins.main.MainDeployerImpl;
import org.jboss.deployers.spi.attachments.AttachmentsFactory;
import org.jboss.deployers.spi.attachments.MutableAttachments;
import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedCommon;
import org.jboss.managed.api.ManagedComponent;
@@ -51,7 +54,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.
@@ -377,7 +380,7 @@
if (mainDeployer == null)
throw new IllegalStateException("Null main deployer.");
- DeploymentContext deploymentContext = mainDeployer.getDeploymentContext(name);
+ DeploymentContext deploymentContext = MainDeployerImpl.class.cast(mainDeployer).getDeploymentContext(name);
if (deploymentContext == null || deploymentContext instanceof VFSDeploymentContext == false)
return null;
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractDeploymentRepository.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileDeployment.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileDeployment.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileDeployment.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileService.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileService.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractProfileService.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -81,7 +81,7 @@
private Controller controller;
/** The deploy state */
- public static final ControllerState DEPLOY_STATE = new ControllerState("Deploy");
+ public static final ControllerState DEPLOY_STATE = ControllerState.getInstance("Deploy");
/** The profileActions. */
private Map<ControllerState, AbstractProfileAction> profileActions = new HashMap<ControllerState, AbstractProfileAction>();
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/AbstractVFSProfileSource.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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.
@@ -214,7 +214,7 @@
*/
protected void addedDeployments(List<VirtualFile> list, VirtualFile root) throws IOException, URISyntaxException
{
- if(root.isLeaf() == true || root.isArchive() == true)
+ if(root.isFile() == true)
{
addedDeployment(list, root);
}
@@ -252,7 +252,7 @@
return;
// If it's a directory or exploded deployment
- if(component.isLeaf() == false && component.isArchive() == false)
+ if(component.isFile() == false)
{
// Check the name
if(isRecursiveScan() && component.getName().indexOf('.') == -1)
@@ -350,7 +350,7 @@
VirtualFile vf = getCachedVirtualFile(uri.toString());
if(vf == null)
{
- vf = VFS.getRoot(uri);
+ vf = VFS.getChild(uri);
this.applicationVFCache.put(uri.toString(), vf);
}
return vf;
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/BasicDeploymentRepository.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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.
@@ -211,7 +211,7 @@
}
// Get the vfs uri and add the VFS uri to the cached VFS uris
- VirtualFile contentVF = VFS.getRoot(contentFile.toURI());
+ VirtualFile contentVF = VFS.getChild(contentFile.toURI());
try
{
// Add the new virtual file to the cache
@@ -276,7 +276,7 @@
ProfileDeployment deployment = getDeployment(vfsPath);
VirtualFile root = deployment.getRoot();
- if(deleteFile && root != null)
+ if(deleteFile && root != null && root.exists())
{
// Delete the file, fail if it can't be deleted and still exists
if(root.delete() == false && root.exists())
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultDeploymentRepositoryFactory.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultDeploymentRepositoryFactory.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultDeploymentRepositoryFactory.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultProfileDeploymentFactory.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultProfileDeploymentFactory.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/DefaultProfileDeploymentFactory.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/repository/FilteredProfileFactory.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/FilteredProfileFactory.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/FilteredProfileFactory.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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.
@@ -151,7 +151,7 @@
{
VirtualFile repo = getCachedVirtualFile(uri);
VirtualFile vf = repo.getChild(deploymentName);
- if(vf != null)
+ if(vf.exists())
list.add(vf);
}
if(list.size() == 0)
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/HotDeploymentRepository.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/repository/XmlProfileFactory.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/XmlProfileFactory.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/XmlProfileFactory.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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;
@@ -84,10 +84,10 @@
this.profileDirectories = new ArrayList<VirtualFile>();
for(URI uri : profileDirectories)
{
- VirtualFile vf = VFS.getRoot(uri);
- if(vf == null)
+ VirtualFile vf = VFS.getChild(uri);
+ if(vf.exists() == false)
throw new IllegalArgumentException("Could not find uri: " + vf);
- if(vf.isLeaf())
+ if(vf.isFile())
throw new IllegalArgumentException("Not a directory: " + vf);
this.profileDirectories.add(vf);
}
@@ -250,7 +250,7 @@
protected VirtualFile getProfileFile(ProfileKey key, URL url) throws Exception
{
if(url != null)
- return VFS.getRoot(url);
+ return VFS.getChild(url);
else
return resolveFile(key.getName());
}
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepository.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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.
@@ -731,7 +731,7 @@
{
try
{
- VFS.getRoot(uri);
+ VFS.getChild(uri);
list.add(uri);
}
catch (Exception e)
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepositoryFactory.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepositoryFactory.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/ClusteredDeploymentRepositoryFactory.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/RepositoryClusteringHandler.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/RepositoryClusteringHandler.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/RepositoryClusteringHandler.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/AbstractLocalContentManager.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/AbstractLocalContentManager.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/AbstractLocalContentManager.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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.
@@ -692,7 +692,7 @@
VirtualFile vf = this.vfCache.get(uri.toString());
if(vf == null)
{
- vf = VFS.getRoot(uri);
+ vf = VFS.getChild(uri);
this.vfCache.put(uri.toString(), vf);
}
return vf;
@@ -810,7 +810,7 @@
private static boolean isDirectory(VirtualFile file) throws IOException
{
- return (!file.isLeaf() && !file.isArchive());
+ return file.isDirectory();
}
private static List<String> getRelativePath(VirtualFile file, VirtualFile root)
Modified: branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/LocalContentManager.java
===================================================================
--- branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/LocalContentManager.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/main/java/org/jboss/system/server/profileservice/repository/clustered/local/LocalContentManager.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml
===================================================================
--- branches/vfs3-int/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/resources/tests/bootstrap/defaulthotdeploy/deployer-beans.xml 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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.util.SuffixesExcludeFilter">
<constructor><parameter>
<list elementClass="java.lang.String">
<!-- Exclude class files as subdeployments -->
Modified: branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java
===================================================================
--- branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -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-int/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java
===================================================================
--- branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -34,7 +34,6 @@
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;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -68,9 +67,6 @@
new URI[] { one.toURI(), two.toURI() });
profileFactory.setProfileFactory(createProfileFactory());
- // Clear jar suffixes.
- JarUtils.clearSuffixes();
-
// Parse
Collection<Profile> profiles = profileFactory.createProfiles(new ProfileKey("default"), null);
assertNotNull(profiles);
Modified: branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/test/ProfileServiceUnitTestCase.java 2010-01-12 15:42:49 UTC (rev 99291)
+++ branches/vfs3-int/system/src/tests/org/jboss/test/server/profileservice/test/ProfileServiceUnitTestCase.java 2010-01-12 15:52:16 UTC (rev 99292)
@@ -38,7 +38,6 @@
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;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -86,9 +85,6 @@
new URI[] { one.toURI(), two.toURI() });
profileFactory.setProfileFactory(createProfileFactory());
- // Clear jar suffixes.
- JarUtils.clearSuffixes();
-
// A list of profile keys
List<ProfileKey> keys = new ArrayList<ProfileKey>();
More information about the jboss-cvs-commits
mailing list