[jboss-cvs] JBossAS SVN: r99294 - in branches/vfs3-int/system-jmx/src/main/java/org/jboss: system/deployers and 2 other directories.

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

Author: johnbailey
Date: 2010-01-12 10:58:01 -0500 (Tue, 12 Jan 2010)
New Revision: 99294

Modified:
   branches/vfs3-int/system-jmx/src/main/java/org/jboss/deployment/MainDeployer.java
   branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/SARArchiveFilter.java
   branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
   branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/ServiceXSLDeployer.java
   branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/metadata/ServiceMetaDataParser.java
   branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java
Log:
[JBAS-7353] - Initial VFS3 integration for jboss-as-system-jmx

Modified: branches/vfs3-int/system-jmx/src/main/java/org/jboss/deployment/MainDeployer.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/deployment/MainDeployer.java	2010-01-12 15:52:28 UTC (rev 99293)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/deployment/MainDeployer.java	2010-01-12 15:58:01 UTC (rev 99294)
@@ -41,6 +41,7 @@
 import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
 import org.jboss.deployers.client.spi.DeployerClient;
 import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.plugins.main.MainDeployerImpl;
 import org.jboss.deployers.structure.spi.DeploymentContext;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
@@ -52,8 +53,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
@@ -363,7 +364,7 @@
          try
          {
             // avoid caching
-            VirtualFile file = VFS.createNewRoot(url);
+            VirtualFile file = VFS.getChild(url);
             VFSDeployment deployment = deploymentFactory.createVFSDeployment(file);
             delegate.addDeployment(deployment);
             deploymentName = deployment.getName();
@@ -513,7 +514,7 @@
       if (name == null)
          return null;
 
-      MainDeployerStructure structure = (MainDeployerStructure) delegate;
+      MainDeployerImpl structure = (MainDeployerImpl) delegate;
       DeploymentContext dc = structure.getDeploymentContext(name);
       log.debug("getDeploymentContext, url="+url+", dc="+dc);
       return dc;

Modified: branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/SARArchiveFilter.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/SARArchiveFilter.java	2010-01-12 15:52:28 UTC (rev 99293)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/SARArchiveFilter.java	2010-01-12 15:58:01 UTC (rev 99294)
@@ -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-int/system-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java	2010-01-12 15:52:28 UTC (rev 99293)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java	2010-01-12 15:58:01 UTC (rev 99294)
@@ -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;
 
@@ -137,7 +137,7 @@
          {
             JBossASServerConfig config = ServerConfigLocator.locate();
             URL codeBaseURL = new URL(config.getServerHomeLocation(), codebase);
-            codebaseFile = VFS.getRoot(codeBaseURL);
+            codebaseFile = VFS.getChild(codeBaseURL);
          }
 
          if (codebaseFile == null)

Modified: branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/ServiceXSLDeployer.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/ServiceXSLDeployer.java	2010-01-12 15:52:28 UTC (rev 99293)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/deployers/ServiceXSLDeployer.java	2010-01-12 15:58:01 UTC (rev 99294)
@@ -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-int/system-jmx/src/main/java/org/jboss/system/metadata/ServiceMetaDataParser.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/metadata/ServiceMetaDataParser.java	2010-01-12 15:52:28 UTC (rev 99293)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/metadata/ServiceMetaDataParser.java	2010-01-12 15:58:01 UTC (rev 99294)
@@ -550,7 +550,7 @@
       ControllerState requiredState = ControllerState.INSTALLED;
       attr = el.getAttributeNode("state");
       if (attr != null)
-         requiredState = new ControllerState(attr.getValue());
+         requiredState = ControllerState.getInstance(attr.getValue());
       value = new ServiceInjectionValueMetaData(dependency, property, requiredState);
       return value;
    }
@@ -565,7 +565,7 @@
       ControllerState requiredState = ControllerState.INSTALLED;
       Attr attr = el.getAttributeNode("state");
       if (attr != null)
-         requiredState = new ControllerState(attr.getValue());
+         requiredState = ControllerState.getInstance(attr.getValue());
       
       List<ServiceValueFactoryParameterMetaData> parameters = new ArrayList<ServiceValueFactoryParameterMetaData>();
       attr = el.getAttributeNode("parameter");

Modified: branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java
===================================================================
--- branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java	2010-01-12 15:52:28 UTC (rev 99293)
+++ branches/vfs3-int/system-jmx/src/main/java/org/jboss/system/server/jmx/JMXKernel.java	2010-01-12 15:58:01 UTC (rev 99294)
@@ -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.
@@ -563,7 +563,7 @@
       for (int i = 0; i < list.size(); ++i)
       {
          URL url = list.get(i);
-         files[i] = VFS.getRoot(url);
+         files[i] = VFS.getChild(url);
       }
       
       VFSClassLoaderPolicy policy = new VFSClassLoaderPolicy(files);