[jboss-cvs] JBossAS SVN: r99487 - in projects/demos/microcontainer/trunk: bootstrap and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 15 11:26:12 EST 2010
Author: alesj
Date: 2010-01-15 11:26:10 -0500 (Fri, 15 Jan 2010)
New Revision: 99487
Modified:
projects/demos/microcontainer/trunk/bootstrap/pom.xml
projects/demos/microcontainer/trunk/classloading/pom.xml
projects/demos/microcontainer/trunk/jmx/pom.xml
projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/system/jmx/JBossJMXKernel.java
projects/demos/microcontainer/trunk/models/pom.xml
projects/demos/microcontainer/trunk/pom.xml
projects/demos/microcontainer/trunk/vfs/src/main/java/org/jboss/demos/bootstrap/vfs/VFSMain.java
Log:
Use extracted JBossMX instead of JBossAS modules.
Modified: projects/demos/microcontainer/trunk/bootstrap/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/pom.xml 2010-01-15 16:24:40 UTC (rev 99486)
+++ projects/demos/microcontainer/trunk/bootstrap/pom.xml 2010-01-15 16:26:10 UTC (rev 99487)
@@ -81,10 +81,12 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</dependency>
+<!--
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
+-->
</dependencies>
</project>
\ No newline at end of file
Modified: projects/demos/microcontainer/trunk/classloading/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/classloading/pom.xml 2010-01-15 16:24:40 UTC (rev 99486)
+++ projects/demos/microcontainer/trunk/classloading/pom.xml 2010-01-15 16:26:10 UTC (rev 99487)
@@ -69,8 +69,8 @@
<artifactId>jboss-aop</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
</dependencies>
Modified: projects/demos/microcontainer/trunk/jmx/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/jmx/pom.xml 2010-01-15 16:24:40 UTC (rev 99486)
+++ projects/demos/microcontainer/trunk/jmx/pom.xml 2010-01-15 16:26:10 UTC (rev 99487)
@@ -61,10 +61,22 @@
<artifactId>jboss-deployers-vfs</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-jmx</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-aop-mc-int</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-core-spi</artifactId>
</dependency>
@@ -85,8 +97,8 @@
<artifactId>jboss-aop-asintegration-jmx</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
</dependencies>
Modified: projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/system/jmx/JBossJMXKernel.java
===================================================================
--- projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/system/jmx/JBossJMXKernel.java 2010-01-15 16:24:40 UTC (rev 99486)
+++ projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/system/jmx/JBossJMXKernel.java 2010-01-15 16:26:10 UTC (rev 99487)
@@ -28,12 +28,20 @@
import org.jboss.classloader.spi.ClassLoaderSystem;
/**
+ * Sets up MBeanServer impl.
+ *
+ * JDK = org.jboss.jmx.mbeanserver.JBossMBeanServerBuilder
+ * JBossMX = org.jboss.mx.server.MBeanServerBuilderImpl
+ *
+ * by default we use JDK's.
+ *
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
public class JBossJMXKernel extends JMXKernel
{
private static final String MBEAN_SERVER_BUILDER_CLASS_PROPERTY = "javax.management.builder.initial";
- private static final String DEFAULT_MBEAN_SERVER_BUILDER_CLASS = "org.jboss.mx.server.MBeanServerBuilderImpl";
+ private static final String DEFAULT_MBEAN_SERVER_BUILDER_CLASS = "org.jboss.jmx.mbeanserver.JBossMBeanServerBuilder";
+ private String builderClass;
@Constructor
public JBossJMXKernel(@Inject(bean = KernelConstants.KERNEL_NAME) Kernel kernel, @Inject ClassLoaderSystem system)
@@ -43,8 +51,10 @@
protected void addProperties()
{
- System.setProperty(MBEAN_SERVER_BUILDER_CLASS_PROPERTY, DEFAULT_MBEAN_SERVER_BUILDER_CLASS);
super.addProperties();
+ if (builderClass == null)
+ builderClass = DEFAULT_MBEAN_SERVER_BUILDER_CLASS;
+ System.setProperty(MBEAN_SERVER_BUILDER_CLASS_PROPERTY, builderClass);
}
protected void removeProperties()
@@ -52,4 +62,9 @@
System.clearProperty(MBEAN_SERVER_BUILDER_CLASS_PROPERTY);
super.removeProperties();
}
+
+ public void setBuilderClass(String builderClass)
+ {
+ this.builderClass = builderClass;
+ }
}
\ No newline at end of file
Modified: projects/demos/microcontainer/trunk/models/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/models/pom.xml 2010-01-15 16:24:40 UTC (rev 99486)
+++ projects/demos/microcontainer/trunk/models/pom.xml 2010-01-15 16:26:10 UTC (rev 99487)
@@ -42,10 +42,6 @@
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: projects/demos/microcontainer/trunk/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/pom.xml 2010-01-15 16:24:40 UTC (rev 99486)
+++ projects/demos/microcontainer/trunk/pom.xml 2010-01-15 16:26:10 UTC (rev 99487)
@@ -38,29 +38,28 @@
</modules>
<properties>
- <version.jboss.jbossas>5.1.0.GA</version.jboss.jbossas>
- <version.jboss.vfs>2.2.0.Alpha2</version.jboss.vfs>
- <version.jboss.man>2.1.1.SP1</version.jboss.man>
- <version.jboss.mdr>2.2.0.Alpha1</version.jboss.mdr>
- <version.jboss.kernel>2.2.0.Alpha2</version.jboss.kernel>
- <version.jboss.classloader>2.0.8.GA</version.jboss.classloader>
- <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
- <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
- <version.jboss.common.logging.spi>2.1.1.GA</version.jboss.common.logging.spi>
- <version.jboss.common.logging.log4j>2.1.1.GA</version.jboss.common.logging.log4j>
+ <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
+ <version.org.jboss.vfs>2.2.0.Alpha2</version.org.jboss.vfs>
+ <version.org.jboss.man>2.1.1.SP1</version.org.jboss.man>
+ <version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
+ <version.org.jboss.kernel>2.2.0.Alpha2</version.org.jboss.kernel>
+ <version.org.jboss.classloader>2.0.8.GA</version.org.jboss.classloader>
+ <version.org.jboss.deployers>2.2.0.Alpha1</version.org.jboss.deployers>
+ <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
+ <version.org.jboss.common.logging.spi>2.1.1.GA</version.org.jboss.common.logging.spi>
+ <version.org.jboss.common.logging.log4j>2.1.1.GA</version.org.jboss.common.logging.log4j>
<version.jbossxb>2.0.2.Beta4</version.jbossxb>
- <version.jboss.aop>2.0.1.GA</version.jboss.aop>
+ <version.org.jboss.aop>2.0.1.GA</version.org.jboss.aop>
<version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
<version.javassist>3.11.0.GA</version.javassist>
<version.xerces>2.9.1</version.xerces>
<version.spring>2.5.6</version.spring>
<!-- OSGi Facade-->
- <version.jboss.osgi.runtime.mc>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.mc>
- <version.jboss.osgi.common>1.0.1-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.osgi.runtime.deployers>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi>
+ <version.org.jboss.osgi.runtime.mc>1.0.2-SNAPSHOT</version.org.jboss.osgi.runtime.mc>
+ <version.org.jboss.osgi.common>1.0.1-SNAPSHOT</version.org.jboss.osgi.common>
+ <version.org.jboss.osgi.runtime.deployers>1.0.1-SNAPSHOT</version.org.jboss.osgi.runtime.deployers>
+ <version.org.jboss.osgi.spi>1.0.1-SNAPSHOT</version.org.jboss.osgi.spi>
<version.osgi>r4v42-20090728</version.osgi>
</properties>
@@ -194,47 +193,57 @@
<dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>${version.jboss.kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.jboss.kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-spring-int</artifactId>
- <version>${version.jboss.kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-guice-int</artifactId>
- <version>${version.jboss.kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ <version>${version.org.jboss.kernel}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-aop-mc-int</artifactId>
+ <version>${version.org.jboss.kernel}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client</artifactId>
- <version>${version.jboss.deployers}</version>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
- <version>${version.jboss.deployers}</version>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-core-spi</artifactId>
- <version>${version.jboss.deployers}</version>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-impl</artifactId>
- <version>${version.jboss.deployers}</version>
+ <version>${version.org.jboss.deployers}</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -245,32 +254,37 @@
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-spi</artifactId>
- <version>${version.jboss.deployers}</version>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${version.jboss.deployers}</version>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.jboss.deployers}</version>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-jmx</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.jboss.deployers}</version>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloader</artifactId>
- <version>${version.jboss.classloader}</version>
+ <version>${version.org.jboss.classloader}</version>
</dependency>
<dependency>
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading</artifactId>
- <version>${version.jboss.classloader}</version>
+ <version>${version.org.jboss.classloader}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -285,7 +299,7 @@
<dependency>
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading-vfs</artifactId>
- <version>${version.jboss.classloader}</version>
+ <version>${version.org.jboss.classloader}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -300,7 +314,7 @@
<dependency>
<groupId>org.jboss.man</groupId>
<artifactId>jboss-managed</artifactId>
- <version>${version.jboss.man}</version>
+ <version>${version.org.jboss.man}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -315,7 +329,7 @@
<dependency>
<groupId>org.jboss.man</groupId>
<artifactId>jboss-metatype</artifactId>
- <version>${version.jboss.man}</version>
+ <version>${version.org.jboss.man}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -330,22 +344,22 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
- <version>${version.jboss.mdr}</version>
+ <version>${version.org.jboss.mdr}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
+ <version>${version.org.jboss.common.core}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.common.logging.spi}</version>
+ <version>${version.org.jboss.common.logging.spi}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.common.logging.log4j}</version>
+ <version>${version.org.jboss.common.logging.log4j}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -355,17 +369,17 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
+ <version>${version.org.jboss.vfs}</version>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
+ <version>${version.org.jboss.aop}</version>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-asintegration-core</artifactId>
- <version>${version.jboss.aop}</version>
+ <version>${version.org.jboss.aop}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.jbossas</groupId>
@@ -380,7 +394,7 @@
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-asintegration-jmx</artifactId>
- <version>${version.jboss.aop}</version>
+ <version>${version.org.jboss.aop}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.jbossas</groupId>
@@ -403,7 +417,7 @@
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop-asintegration-mc</artifactId>
- <version>${version.jboss.aop}</version>
+ <version>${version.org.jboss.aop}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.jbossas</groupId>
@@ -411,22 +425,38 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- <version>${version.jboss.jbossas}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>${version.org.jboss.mx}</version>
</dependency>
+
<dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx-annotations</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-mbeans</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-mbeanserver</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>javassist</artifactId>
<version>${version.javassist}</version>
@@ -465,17 +495,17 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
+ <version>${version.org.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.runtime.deployers}</version>
+ <version>${version.org.jboss.osgi.runtime.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-runtime-microcontainer</artifactId>
- <version>${version.jboss.osgi.runtime.mc}</version>
+ <version>${version.org.jboss.osgi.runtime.mc}</version>
</dependency>
<!-- test dependencies -->
<dependency>
Modified: projects/demos/microcontainer/trunk/vfs/src/main/java/org/jboss/demos/bootstrap/vfs/VFSMain.java
===================================================================
--- projects/demos/microcontainer/trunk/vfs/src/main/java/org/jboss/demos/bootstrap/vfs/VFSMain.java 2010-01-15 16:24:40 UTC (rev 99486)
+++ projects/demos/microcontainer/trunk/vfs/src/main/java/org/jboss/demos/bootstrap/vfs/VFSMain.java 2010-01-15 16:26:10 UTC (rev 99487)
@@ -61,7 +61,7 @@
if (resources.exists() == false)
throw new FileNotFoundException(resources.getAbsolutePath());
- VirtualFile root = VFS.getRoot(resources.toURL());
+ VirtualFile root = VFS.getRoot(resources.toURI());
VirtualFile file = root.getChild("compressed.gzip");
System.out.println();
More information about the jboss-cvs-commits
mailing list