[jboss-osgi-commits] JBoss-OSGI SVN: r101168 - in projects/jboss-osgi/projects/bundles/jmx/trunk: jmx-api and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-02-19 10:04:13 -0500 (Fri, 19 Feb 2010) New Revision: 101168 Added: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/ Removed: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/internal/ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/osgi/ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/Constants.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/osgi/ Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml Log: slpit jmx into modules Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api (from rev 101161, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle) Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.classpath 2010-02-19 12:57:10 UTC (rev 101161) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.classpath 2010-02-19 15:04:13 UTC (rev 101168) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/.settings/org.eclipse.jdt.core.prefs 2010-02-19 12:57:10 UTC (rev 101161) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/.settings/org.eclipse.jdt.core.prefs 2010-02-19 15:04:13 UTC (rev 101168) @@ -1,13 +1,6 @@ -#Fri Feb 19 13:54:44 CET 2010 +#Fri Feb 19 14:10:33 CET 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-02-19 12:57:10 UTC (rev 101161) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml 2010-02-19 15:04:13 UTC (rev 101168) @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, the OpenSource J2EE webOS --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> - - <!-- $Id$ --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>JBossOSGi - JMX Bundle</name> - <description>The JBossOSGi Management</description> - - <groupId>org.jboss.osgi.jmx</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <packaging>bundle</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.osgi.jmx</groupId> - <artifactId>jboss-osgi-jmx-parent</artifactId> - <version>1.0.4-SNAPSHOT</version> - </parent> - - <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jndi</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.jmx</groupId> - <artifactId>org.apache.aries.jmx.api</artifactId> - </dependency> - - <!-- OSGi Dependencies --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.jmx.internal.JMXServiceActivator</Bundle-Activator> - <Export-Package> - org.jboss.osgi.jmx;version=${version} - </Export-Package> - <Import-Package> - - <!-- system --> - javax.management*, - javax.naming, - javax.naming.spi, - - <!-- jboss-osgi --> - org.jboss.osgi.spi*;version="[1.0,2.0)", - - <!-- osgi --> - org.osgi.framework;version="[1.5,2.0)", - org.osgi.service.packageadmin;version="[1.2,2.0)", - org.osgi.util.tracker;version="[1.4,2.0)", - - <!-- FIXME: make optional - org.jboss.osgi.jndi;resolution:=optional, - org.jboss.net.sockets;resolution:=optional, - org.jnp.interfaces;resolution:=optional, - --> - org.jboss.osgi.jndi;version="[1.0,2.0)", - org.jboss.net.sockets;version="[2.2,3.0)", - org.jnp.interfaces;version="[5.0,6.0)", - - </Import-Package> - <DynamicImport-Package>*</DynamicImport-Package> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <!-- For some reason the distribution javadoc module needs this --> - <file>target/${artifactId}-${version}-sources.jar</file> - <classifier>sources</classifier> - <type>jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml (from rev 101160, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml) =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml (rev 0) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml 2010-02-19 15:04:13 UTC (rev 101168) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> + + <!-- ====================================================================== --> + <!-- --> + <!-- JBoss, the OpenSource J2EE webOS --> + <!-- --> + <!-- Distributable under LGPL license. --> + <!-- See terms of license at http://www.gnu.org. --> + <!-- --> + <!-- ====================================================================== --> + + <!-- $Id$ --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBossOSGi - JMX API</name> + <description>The JBossOSGi Management</description> + + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx-api</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx-parent</artifactId> + <version>1.0.4-SNAPSHOT</version> + </parent> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.jmx</groupId> + <artifactId>org.apache.aries.jmx.api</artifactId> + </dependency> + + <!-- OSGi Dependencies --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + </plugins> + </build> + +</project> Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src (from rev 101160, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src) Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-02-19 14:57:28 UTC (rev 101167) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-02-19 15:04:13 UTC (rev 101168) @@ -31,12 +31,17 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx-api</artifactId> + <version>${version}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> </dependency> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jndi</artifactId> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi-api</artifactId> </dependency> <dependency> <groupId>org.apache.aries.jmx</groupId> @@ -76,8 +81,13 @@ javax.naming, javax.naming.spi, + <!-- logging --> + org.jboss.logging;version="[2.1,3.0)", + <!-- jboss-osgi --> org.jboss.osgi.spi*;version="[1.0,2.0)", + org.jboss.osgi.jmx;version="[1.0,2.0)", + org.jboss.osgi.jndi;version="[1.0,2.0)", <!-- osgi --> org.osgi.framework;version="[1.5,2.0)", @@ -89,12 +99,17 @@ org.jboss.net.sockets;resolution:=optional, org.jnp.interfaces;resolution:=optional, --> - org.jboss.osgi.jndi;version="[1.0,2.0)", org.jboss.net.sockets;version="[2.2,3.0)", org.jnp.interfaces;version="[5.0,6.0)", </Import-Package> - <DynamicImport-Package>*</DynamicImport-Package> + <Embed-Dependency> + jboss-osgi-jmx-api;inline=false + </Embed-Dependency> + <_exportcontents> + org.jboss.osgi.jmx;version=${version} + </_exportcontents> + <!-- DynamicImport-Package>*</DynamicImport-Package --> </instructions> </configuration> </plugin> Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/Constants.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/Constants.java 2010-02-19 14:57:28 UTC (rev 101167) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/Constants.java 2010-02-19 15:04:13 UTC (rev 101168) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.jmx; - -//$Id$ - -/** - * The JMX service contants - * - * @author thomas.diesler(a)jboss.com - * @since 24-Apr-2009 - */ -public interface Constants -{ - /** The property that sets the host that the RMIAdaptor binds to: org.jboss.osgi.jmx.host */ - String REMOTE_JMX_HOST = "org.jboss.osgi.jmx.host"; - /** The property that sets the port that the RMIAdaptor binds to: org.jboss.osgi.jmx.port */ - String REMOTE_JMX_RMI_PORT = "org.jboss.osgi.jmx.rmi.port"; - /** The property that sets the JNDI name the RMIAdaptor binds to: org.jboss.osgi.jmx.rmi.adaptor */ - String REMOTE_JMX_RMI_ADAPTOR = "org.jboss.osgi.jmx.rmi.adaptor"; -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-02-19 14:57:28 UTC (rev 101167) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-02-19 15:04:13 UTC (rev 101168) @@ -1,65 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.jmx; - -//$Id$ - -import javax.management.MBeanServer; - -import org.jboss.osgi.jndi.JNDICapability; -import org.jboss.osgi.spi.capability.Capability; - -/** - * Adds the JMX capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link MBeanServer} is already registered. - * - * Dependent Capability: {@link JNDICapability} - * Installed bundles: jboss-osgi-jmx.jar - * - * Default properties set by this capability - * - * <table> - * <tr><th>Property</th><th>Value</th></tr> - * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr> - * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr> - * </table> - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class JMXCapability extends Capability -{ - public JMXCapability() - { - super(MBeanServer.class.getName()); - - addSystemProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost")); - addSystemProperty("org.jboss.osgi.jmx.rmi.port", "1198"); - - addDependency(new JNDICapability()); - - addBundle("bundles/jboss-osgi-jmx.jar"); - addBundle("bundles/org.apache.aries.jmx.jar"); - } -} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-19 14:57:28 UTC (rev 101167) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-19 15:04:13 UTC (rev 101168) @@ -42,10 +42,12 @@ <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi> + <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>4.2.0</version.osgi> </properties> <modules> + <module>jmx-api</module> <module>jmx-bundle</module> </modules> @@ -53,13 +55,18 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> <version>${version.jboss.osgi.common.core}</version> </dependency> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jndi</artifactId> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi-api</artifactId> <version>${version.jboss.osgi.jndi}</version> </dependency> <dependency>