[jboss-cvs] JBossAS SVN: r63732 - in trunk/system-jmx: src/main/org/jboss/deployment and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 28 13:25:43 EDT 2007
Author: adrian at jboss.org
Date: 2007-06-28 13:25:43 -0400 (Thu, 28 Jun 2007)
New Revision: 63732
Modified:
trunk/system-jmx/.classpath
trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java
trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceClassLoaderDeployer.java
trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceDeployer.java
trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceDeploymentDeployer.java
trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceXSLDeployer.java
trunk/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContextAction.java
trunk/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContextActions.java
Log:
Deployers reloaded
Modified: trunk/system-jmx/.classpath
===================================================================
--- trunk/system-jmx/.classpath 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/.classpath 2007-06-28 17:25:43 UTC (rev 63732)
@@ -12,9 +12,9 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-container-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-src.zip"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer-src.zip"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-container-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
@@ -23,8 +23,13 @@
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/jmx"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-impl.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-impl-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployer.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -51,11 +51,12 @@
import javax.management.Notification;
import javax.management.ObjectName;
-import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
-import org.jboss.deployers.spi.IncompleteDeploymentException;
-import org.jboss.deployers.spi.IncompleteDeployments;
-import org.jboss.deployers.spi.IncompleteDeploymentsBuilder;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.system.server.ServerConfig;
@@ -76,6 +77,7 @@
* @author <a href="mailto:scott.stark at jboss.org">Scott Stark</a>
* @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
+ * @author adrian at jboss.org
* @version $Revision$
*/
public class MainDeployer extends ServiceMBeanSupport
@@ -83,9 +85,12 @@
{
/** The controller */
private KernelController controller;
- private org.jboss.deployers.spi.deployment.MainDeployer delegate;
+ private DeployerClient delegate;
private Map<URL, String> contextMap = Collections.synchronizedMap(new HashMap<URL, String>());
+ /** The deployment factory */
+ private VFSDeploymentFactory deploymentFactory = VFSDeploymentFactory.getInstance();
+
/**
* The variable <code>serviceController</code> is used by the
* checkIncompleteDeployments method to ask for lists of mbeans
@@ -140,11 +145,11 @@
}
}
- public org.jboss.deployers.spi.deployment.MainDeployer getKernelMainDeployer()
+ public DeployerClient getKernelMainDeployer()
{
return delegate;
}
- public void setKernelMainDeployer(org.jboss.deployers.spi.deployment.MainDeployer delegate)
+ public void setKernelMainDeployer(DeployerClient delegate)
{
this.delegate = delegate;
}
@@ -629,7 +634,7 @@
{
try
{
- delegate.removeDeploymentContext(deploymentName);
+ delegate.removeDeployment(deploymentName);
delegate.process();
}
catch(Exception e)
@@ -801,12 +806,12 @@
try
{
VirtualFile file = VFS.getRoot(url);
- DeploymentContext deployment = new AbstractDeploymentContext(file);
- delegate.addDeploymentContext(deployment);
+ VFSDeployment deployment = deploymentFactory.createVFSDeployment(file);
+ delegate.addDeployment(deployment);
deploymentName = deployment.getName();
delegate.process();
// TODO: JBAS-4292
- // checkIncomplete();
+ delegate.checkComplete();
contextMap.put(url, deploymentName);
}
catch(Exception e)
@@ -1320,31 +1325,44 @@
*/
public boolean isDeployed(URL url)
{
- DeploymentContext di = delegate.getDeploymentContext(url.toString());
- if (di == null)
- {
- return false;
- } // end of if ()
- return di.getState() == org.jboss.deployers.spi.structure.DeploymentState.DEPLOYED;
+ return delegate.getDeploymentState(url.toString()) == org.jboss.deployers.spi.DeploymentState.DEPLOYED;
}
/**
- * The <code>getDeployment</code> method returns the DeploymentInfo
+ * The <code>getDeployment</code> method returns the Deployment
* object for the URL supplied.
*
* @param url an <code>URL</code> value
- * @return a <code>DeploymentInfo</code> value
+ * @return a <code>Deployment</code> value
* @jmx.managed-operation
*/
- public DeploymentContext getDeployment(URL url)
+ public Deployment getDeployment(URL url)
{
String name = contextMap.get(url);
- DeploymentContext dc = delegate.getDeploymentContext(name);
+ Deployment dc = delegate.getDeployment(name);
log.info("getDeploymen, url="+url+", dc="+dc);
return dc;
}
/**
+ * The <code>getDeploymentContext</code> method returns the DeploymentContext
+ * object for the URL supplied.
+ *
+ * @param url an <code>URL</code> value
+ * @return a <code>DeploymentContext</code> value
+ * @jmx.managed-operation
+ */
+ @Deprecated
+ public DeploymentContext getDeploymentContext(URL url)
+ {
+ String name = contextMap.get(url);
+ MainDeployerStructure structure = (MainDeployerStructure) delegate;
+ DeploymentContext dc = structure.getDeploymentContext(name);
+ log.info("getDeploymen, url="+url+", dc="+dc);
+ return dc;
+ }
+
+ /**
* The <code>getWatchUrl</code> method returns the URL that, when modified,
* indicates that a redeploy is needed.
*
@@ -1364,6 +1382,14 @@
*/
public void checkIncompleteDeployments() throws DeploymentException
{
+ try
+ {
+ delegate.checkComplete();
+ }
+ catch (Exception e)
+ {
+ throw new DeploymentException("Deployments are incomplete", e);
+ }
}
/**
@@ -1394,11 +1420,4 @@
}
return sdi;
}
-
- private void checkIncomplete() throws IncompleteDeploymentException
- {
- IncompleteDeployments incomplete = IncompleteDeploymentsBuilder.build(delegate, controller);
- if (incomplete.isIncomplete())
- throw new IncompleteDeploymentException(incomplete);
- }
}
Modified: trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/deployment/MainDeployerMBean.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -28,7 +28,10 @@
import javax.management.ObjectName;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.system.ServiceMBean;
@@ -45,9 +48,9 @@
ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.system:service=MainDeployer");
// Attributes ----------------------------------------------------
- public org.jboss.deployers.spi.deployment.MainDeployer getKernelMainDeployer();
+ public DeployerClient getKernelMainDeployer();
/** set the kernel MainDeployer which will handle deployments */
- public void setKernelMainDeployer(org.jboss.deployers.spi.deployment.MainDeployer delegate);
+ public void setKernelMainDeployer(DeployerClient delegate);
public KernelController getController();
public void setController(KernelController controller);
@@ -232,12 +235,20 @@
boolean isDeployed(URL url);
/**
- * The <code>getDeployment</code> method returns the DeploymentInfo object
+ * The <code>getDeployment</code> method returns the Deployment object
* for the URL supplied.
* @param url an <code>URL</code> value
+ * @return a <code>Deployment</code> value
+ */
+ Deployment getDeployment(URL url);
+
+ /**
+ * The <code>getDeploymentContext</code> method returns the DeploymentContext object
+ * for the URL supplied.
+ * @param url an <code>URL</code> value
* @return a <code>DeploymentContext</code> value
*/
- DeploymentContext getDeployment(URL url);
+ DeploymentContext getDeploymentContext(URL url);
/**
* The <code>getWatchUrl</code> method returns the URL that,
Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -25,10 +25,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.deployers.plugins.deployers.helpers.JAXPDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.vfs.spi.deployer.JAXPDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
import org.jboss.system.metadata.ServiceDeployment;
import org.jboss.system.metadata.ServiceDeploymentClassPath;
@@ -60,6 +59,7 @@
public SARDeployer()
{
super(ServiceDeployment.class);
+ setSuffix("-service.xml");
}
/**
@@ -68,7 +68,7 @@
* @param document - the jaxp document for the jboss-service.xml descriptor
*/
@Override
- protected ServiceDeployment parse(DeploymentUnit unit, VirtualFile file, Document document) throws Exception
+ protected ServiceDeployment parse(VFSDeploymentUnit unit, VirtualFile file, Document document) throws Exception
{
ServiceDeploymentParser parser = new ServiceDeploymentParser(document);
ServiceDeployment parsed = parser.parse();
@@ -77,7 +77,7 @@
List<ServiceDeploymentClassPath> classPaths = parsed.getClassPaths();
if (classPaths != null)
- processXMLClasspath(unit.getDeploymentContext(), classPaths);
+ processXMLClasspath(unit, classPaths);
LoaderRepositoryConfig config = parsed.getLoaderRepositoryConfig();
if (config != null)
@@ -85,19 +85,14 @@
return parsed;
}
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- createMetaData(unit, null, "-service.xml");
- }
-
/**
* Process the xml classpath
*
- * @param context the context
+ * @param unit the unit
* @param classpaths the classpaths
* @throws Exception for any error
*/
- private void processXMLClasspath(DeploymentContext context, List<ServiceDeploymentClassPath> classpaths) throws Exception
+ private void processXMLClasspath(VFSDeploymentUnit unit, List<ServiceDeploymentClassPath> classpaths) throws Exception
{
ArrayList<VirtualFile> classpath = new ArrayList<VirtualFile>();
@@ -106,8 +101,8 @@
String codebase = path.getCodeBase();
String archives = path.getArchives();
- log.debug("Processing classpath: " + context.getName() + " codebase=" + codebase + " archives=" + archives);
- VirtualFile codebaseFile = context.getRoot();
+ log.debug("Processing classpath: " + unit.getName() + " codebase=" + codebase + " archives=" + archives);
+ VirtualFile codebaseFile = unit.getRoot();
if (".".equals(codebase) == false)
{
ServerConfig config = ServerConfigLocator.locate();
@@ -116,12 +111,12 @@
}
if (codebaseFile == null)
- throw new DeploymentException("Cannot use classpath without a root: " + context.getName());
+ throw new DeploymentException("Cannot use classpath without a root: " + unit.getName());
if (archives == null)
{
classpath.add(codebaseFile);
- log.debug("Using codebase as classpath: " + context.getName());
+ log.debug("Using codebase as classpath: " + unit.getName());
}
else
{
@@ -132,9 +127,9 @@
}
- List<VirtualFile> origClassPath = context.getClassPath();
+ List<VirtualFile> origClassPath = unit.getClassPath();
if (origClassPath != null)
classpath.addAll(origClassPath);
- context.setClassPath(classpath);
+ unit.setClassPath(classpath);
}
}
Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceClassLoaderDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceClassLoaderDeployer.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceClassLoaderDeployer.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -28,11 +28,12 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractTopLevelClassLoaderDeployer;
-import org.jboss.deployers.plugins.deployers.helpers.ClassPathVisitor;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.deployer.helpers.AbstractTopLevelClassLoaderDeployer;
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
+import org.jboss.deployers.vfs.spi.structure.helpers.ClassPathVisitor;
import org.jboss.mx.loading.LoaderRepositoryFactory;
import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
@@ -71,19 +72,25 @@
{
MBeanServer server = controller.getMBeanServer();
DeploymentUnit unit = context.getDeploymentUnit();
-
- // Try to determine a root url
- VirtualFile root = context.getRoot();
+
+ VirtualFile root = null;
URL url = null;
- try
+ if (context instanceof VFSDeploymentContext)
{
- if (root != null)
- url = trimJARURL(root.toURL());
+ VFSDeploymentContext vfsContext = (VFSDeploymentContext) context;
+
+ // Try to determine a root url
+ root = vfsContext.getRoot();
+ try
+ {
+ if (root != null)
+ url = trimJARURL(root.toURL());
+ }
+ catch (Exception ignored)
+ {
+ log.debug("Unable to get URL for " + context.getName() + " reason=" + ignored);
+ }
}
- catch (Exception ignored)
- {
- log.debug("Unable to get URL for " + context.getName() + " reason=" + ignored);
- }
// Check the loader repository config
LoaderRepositoryConfig loaderConfig = unit.getAttachment(LoaderRepositoryConfig.class);
@@ -117,7 +124,7 @@
if (path != root)
ucl.addURL(trimJARURL(path.toURL()));
}
-
+
// Register the classloader with the MBeanServer
ObjectName uclName = ucl.getObjectName();
if (server.isRegistered(uclName) == false)
Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceDeployer.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceDeployer.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -23,12 +23,11 @@
import javax.management.ObjectName;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.mx.server.ServerConstants;
import org.jboss.system.ServiceContext;
import org.jboss.system.ServiceController;
import org.jboss.system.metadata.ServiceDeployment;
@@ -63,6 +62,7 @@
if (controller == null)
throw new IllegalArgumentException("Null controller");
this.controller = controller;
+ setComponentsOnly(true);
}
Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceDeploymentDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceDeploymentDeployer.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceDeploymentDeployer.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -25,10 +25,10 @@
import javax.management.ObjectName;
-import org.jboss.deployers.plugins.deployers.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.plugins.deployers.helpers.SimpleDeploymentVisitor;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
+import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.system.metadata.ServiceDeployment;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.system.metadata.ServiceMetaDataParser;
@@ -73,7 +73,7 @@
/**
* ServiceDeploymentVisitor.
*/
- public class ServiceDeploymentVisitor implements SimpleDeploymentVisitor<ServiceDeployment>
+ public class ServiceDeploymentVisitor implements DeploymentVisitor<ServiceDeployment>
{
public Class<ServiceDeployment> getVisitorType()
{
@@ -129,7 +129,7 @@
/**
* ServiceMetaDataVisitor.
*/
- public static class ServiceMetaDataVisitor implements SimpleDeploymentVisitor<ServiceMetaData>
+ public static class ServiceMetaDataVisitor implements DeploymentVisitor<ServiceMetaData>
{
public Class<ServiceMetaData> getVisitorType()
{
Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceXSLDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceXSLDeployer.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/ServiceXSLDeployer.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -21,9 +21,8 @@
*/
package org.jboss.system.deployers;
-import org.jboss.deployers.plugins.deployers.helpers.XSLDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.deployer.XSLDeployer;
+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;
@@ -31,9 +30,6 @@
public class ServiceXSLDeployer extends XSLDeployer<ServiceDeployment>
{
- /** The suffix */
- private String suffix;
-
/**
* Create a new ServiceXSLDeployer.
*/
@@ -41,33 +37,13 @@
{
super(ServiceDeployment.class);
}
-
- /**
- * Get the suffix.
- *
- * @return the suffix.
- */
- public String getSuffix()
- {
- return suffix;
- }
- /**
- * Set the suffix.
- *
- * @param suffix the suffix.
- */
- public void setSuffix(String suffix)
- {
- this.suffix = suffix;
- }
-
protected boolean allowsReparse()
{
return true;
}
- protected ServiceDeployment parse(DeploymentUnit unit, VirtualFile file, Document document) throws Exception
+ protected ServiceDeployment parse(VFSDeploymentUnit unit, VirtualFile file, Document document) throws Exception
{
ServiceDeploymentParser parser = new ServiceDeploymentParser(document);
ServiceDeployment parsed = parser.parse();
@@ -75,9 +51,4 @@
parsed.setName(name);
return parsed;
}
-
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- createMetaData(unit, null, getSuffix());
- }
}
Modified: trunk/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContextAction.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContextAction.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContextAction.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -26,7 +26,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import org.jboss.dependency.plugins.spi.action.ControllerContextAction;
+import org.jboss.dependency.plugins.action.ControllerContextAction;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.logging.Logger;
Modified: trunk/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContextActions.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContextActions.java 2007-06-28 17:24:45 UTC (rev 63731)
+++ trunk/system-jmx/src/main/org/jboss/system/microcontainer/ServiceControllerContextActions.java 2007-06-28 17:25:43 UTC (rev 63732)
@@ -25,7 +25,7 @@
import java.util.Map;
import org.jboss.dependency.plugins.AbstractControllerContextActions;
-import org.jboss.dependency.plugins.spi.action.ControllerContextAction;
+import org.jboss.dependency.plugins.action.ControllerContextAction;
import org.jboss.dependency.spi.ControllerState;
/**
More information about the jboss-cvs-commits
mailing list