[jboss-cvs] JBossAS SVN: r85361 - in projects/jboss-deployers/trunk: deployers-jmx and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 5 16:31:09 EST 2009
Author: adrian at jboss.org
Date: 2009-03-05 16:31:09 -0500 (Thu, 05 Mar 2009)
New Revision: 85361
Modified:
projects/jboss-deployers/trunk/deployers-jmx/
projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/system/deployers/test/ServiceUnitNameTestCase.java
projects/jboss-deployers/trunk/pom.xml
Log:
[JBDEPLOY-171] - Update the classes to work without the JBossAS Server/Config stuff
Property changes on: projects/jboss-deployers/trunk/deployers-jmx
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java 2009-03-05 21:21:21 UTC (rev 85360)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/SARDeployer.java 2009-03-05 21:31:09 UTC (rev 85361)
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.deployer.JAXPDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
@@ -34,7 +33,6 @@
import org.jboss.system.metadata.ServiceDeploymentParser;
import org.jboss.system.metadata.ServiceMetaData;
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;
@@ -57,6 +55,9 @@
*/
public class SARDeployer extends JAXPDeployer<ServiceDeployment>
{
+ /** The default codebase root */
+ private URL defaultCodeBaseRoot;
+
/**
* Create a new SARDeployer.
*
@@ -72,6 +73,26 @@
}
/**
+ * Get the defaultCodeBaseRoot.
+ *
+ * @return the defaultCodeBaseRoot.
+ */
+ public URL getDefaultCodeBaseRoot()
+ {
+ return defaultCodeBaseRoot;
+ }
+
+ /**
+ * Set the defaultCodeBaseRoot.
+ *
+ * @param defaultCodeBaseRoot the defaultCodeBaseRoot.
+ */
+ public void setDefaultCodeBaseRoot(URL defaultCodeBaseRoot)
+ {
+ this.defaultCodeBaseRoot = defaultCodeBaseRoot;
+ }
+
+ /**
* @param unit - the deployment unit
* @param file - the vf for the jboss-service.xml descriptor
* @param document - the jaxp document for the jboss-service.xml descriptor
@@ -135,8 +156,9 @@
VirtualFile codebaseFile = unit.getRoot();
if (".".equals(codebase) == false)
{
- ServerConfig config = ServerConfigLocator.locate();
- URL codeBaseURL = new URL(config.getServerHomeURL(), codebase);
+ if (defaultCodeBaseRoot == null)
+ throw new DeploymentException("No default codebase root for " + codebase + " in " + unit.getName());
+ URL codeBaseURL = new URL(defaultCodeBaseRoot, codebase);
codebaseFile = VFS.getRoot(codeBaseURL);
}
Modified: projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/system/deployers/test/ServiceUnitNameTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/system/deployers/test/ServiceUnitNameTestCase.java 2009-03-05 21:21:21 UTC (rev 85360)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/system/deployers/test/ServiceUnitNameTestCase.java 2009-03-05 21:31:09 UTC (rev 85361)
@@ -21,14 +21,16 @@
*/
package org.jboss.test.system.deployers.test;
+import java.lang.reflect.Method;
import java.util.Collections;
import java.util.Set;
-import java.lang.reflect.Method;
+
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
import junit.framework.Test;
+
import org.jboss.dependency.plugins.AbstractController;
import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
import org.jboss.deployers.client.spi.Deployment;
@@ -43,20 +45,19 @@
import org.jboss.deployers.structure.spi.helpers.AbstractDeploymentContext;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.mx.server.ServerConstants;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.system.ServiceController;
-import org.jboss.system.server.jmx.LazyMBeanServer;
import org.jboss.system.deployers.ServiceDeployer;
import org.jboss.system.deployers.ServiceDeploymentDeployer;
-import org.jboss.system.metadata.ServiceDeployment;
-import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.system.metadata.ServiceConstructorMetaData;
import org.jboss.system.metadata.ServiceDependencyMetaData;
+import org.jboss.system.metadata.ServiceDeployment;
+import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.test.AbstractSystemTest;
import org.jboss.test.system.deployers.support.CLDeployer;
-import org.jboss.test.system.deployers.support.Tester;
import org.jboss.test.system.deployers.support.JmxCL;
-import org.jboss.mx.server.ServerConstants;
-import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.test.system.deployers.support.Tester;
/**
* Test component name usage.
@@ -201,9 +202,6 @@
server = (MBeanServer)method.invoke(null, args);
// Tell the MBeanServerLocator to point to this mbeanServer
MBeanServerLocator.setJBoss(server);
- /* If the LazyMBeanServer was used, we need to reset to the jboss
- MBeanServer to use our implementation for the jboss services.
- */
- return LazyMBeanServer.resetToJBossServer(server);
+ return server;
}
}
Modified: projects/jboss-deployers/trunk/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml 2009-03-05 21:21:21 UTC (rev 85360)
+++ projects/jboss-deployers/trunk/pom.xml 2009-03-05 21:31:09 UTC (rev 85361)
@@ -48,6 +48,7 @@
<module>deployers-impl</module>
<module>deployers-vfs-spi</module>
<module>deployers-vfs</module>
+ <module>deployers-jmx</module>
<module>build</module>
</modules>
@@ -229,6 +230,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-jmx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
<version>${version.jboss.microcontainer}</version>
@@ -239,6 +245,11 @@
<version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jmx-mc-int</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloader</artifactId>
<version>${version.jboss.classloader}</version>
More information about the jboss-cvs-commits
mailing list