April 2010 - jboss-osgi-commits - Jboss List Archives

JBoss-OSGI SVN: r103570 - in projects/jboss-osgi/projects/bundles/jmx/trunk: api and 4 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-06 09:51:42 -0400 (Tue, 06 Apr 2010) New Revision: 103570 Added: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/JSR160TestCase.java Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/api/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/impl/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/impl/scripts/assembly-bundles.xml projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml Log: Add JSR160 test coverage. Deprecate jmx/invoker/RMIAdaptor JNDI binding. Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/api/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/api/pom.xml 2010-04-06 13:11:35 UTC (rev 103569) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/api/pom.xml 2010-04-06 13:51:42 UTC (rev 103570) @@ -19,14 +19,13 @@ <groupId>org.jboss.osgi.jmx</groupId> <artifactId>jboss-osgi-jmx-api</artifactId> - <version>1.0.5-SNAPSHOT</version> <packaging>jar</packaging>  <parent> <groupId>org.jboss.osgi.jmx</groupId> <artifactId>jboss-osgi-jmx-parent</artifactId> - <version>1.0.4</version> + <version>1.0.5-SNAPSHOT</version> </parent>  Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/impl/pom.xml 2010-04-06 13:11:35 UTC (rev 103569) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/pom.xml 2010-04-06 13:51:42 UTC (rev 103570) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi.jmx</groupId> <artifactId>jboss-osgi-jmx-parent</artifactId> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.5-SNAPSHOT</version> </parent>  @@ -66,6 +66,16 @@ <artifactId>jboss-osgi-common</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi</artifactId> + <scope>provided</scope> + </dependency>  <dependency> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/impl/scripts/assembly-bundles.xml 2010-04-06 13:11:35 UTC (rev 103569) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/scripts/assembly-bundles.xml 2010-04-06 13:51:42 UTC (rev 103570) @@ -16,6 +16,8 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:jboss-osgi-common:jar</include> + <include>*:jboss-osgi-common-core:jar</include> + <include>*:jboss-osgi-jndi:jar</include> <include>*:org.apache.aries.jmx:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.osgi.compendium:jar</include> Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2010-04-06 13:11:35 UTC (rev 103569) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2010-04-06 13:51:42 UTC (rev 103570) @@ -26,12 +26,8 @@ import java.io.IOException; import javax.management.MBeanServer; -import javax.management.MBeanServerConnection; import javax.management.remote.JMXServiceURL; import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.StringRefAddr; import org.jboss.logging.Logger; import org.jboss.osgi.jmx.JMXConstantsExt; @@ -54,7 +50,6 @@ private JMXConnectorService jmxConnector; private String jmxHost; private String jmxRmiPort; - private String rmiAdaptorPath; private MBeanServer mbeanServer; private FrameworkStateExt frameworkState; private ServiceStateExt serviceState; @@ -94,12 +89,8 @@ if (jmxRmiPort == null) jmxRmiPort = "1098"; - rmiAdaptorPath = context.getProperty(JMXConstantsExt.REMOTE_JMX_RMI_ADAPTOR); - if (rmiAdaptorPath == null) - rmiAdaptorPath = "jmx/invoker/RMIAdaptor"; - // Start tracking the NamingService - InitialContextTracker tracker = new InitialContextTracker(context, rmiAdaptorPath); + InitialContextTracker tracker = new InitialContextTracker(context); tracker.open(); } @@ -126,13 +117,9 @@ class InitialContextTracker extends ServiceTracker { - private String rmiAdaptorPath; - private boolean rmiAdaptorBound; - - public InitialContextTracker(BundleContext context, String rmiAdaptorPath) + public InitialContextTracker(BundleContext context) { super(context, InitialContext.class.getName(), null); - this.rmiAdaptorPath = rmiAdaptorPath; } @Override @@ -153,59 +140,18 @@ // Assume that the JMXConnector is already running if we cannot start it log.debug("Assume JMXConnectorServer already running on: " + serviceURL); } - - try - { - // Check if the RMIAdaptor is already bound - iniCtx.lookup(rmiAdaptorPath); - } - catch (NamingException lookupEx) - { - // Bind the RMIAdaptor - try - { - iniCtx.createSubcontext("jmx").createSubcontext("invoker"); - StringRefAddr addr = new StringRefAddr(JMXServiceURL.class.getName(), serviceURL.toString()); - Reference ref = new Reference(MBeanServerConnection.class.getName(), addr, RMIAdaptorFactory.class.getName(), null); - iniCtx.bind(rmiAdaptorPath, ref); - rmiAdaptorBound = true; - - log.info("MBeanServerConnection bound to: " + rmiAdaptorPath); - } - catch (NamingException ex) - { - log.error("Cannot bind RMIAdaptor", ex); - } - } return iniCtx; } @Override public void removedService(ServiceReference reference, Object service) { - InitialContext iniCtx = (InitialContext)service; - // Stop JMXConnectorService if (jmxConnector != null) { jmxConnector.stop(); jmxConnector = null; } - - // Unbind the RMIAdaptor - if (rmiAdaptorBound == true) - { - try - { - iniCtx.unbind(rmiAdaptorPath); - log.info("MBeanServerConnection unbound from: " + rmiAdaptorPath); - } - catch (NamingException ex) - { - log.error("Cannot unbind RMIAdaptor", ex); - } - } - super.removedService(reference, service); } } Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java 2010-04-06 13:11:35 UTC (rev 103569) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java 2010-04-06 13:51:42 UTC (rev 103570) @@ -24,10 +24,12 @@ //$Id$ import java.io.File; +import java.io.IOException; import java.net.URL; import java.util.ArrayList; import javax.management.MBeanServer; +import javax.management.MBeanServerConnection; import javax.management.MBeanServerFactory; import javax.management.ObjectName; @@ -109,7 +111,7 @@ return server; } - private void assertMBeanRegistration(boolean state) + private void assertMBeanRegistration(boolean state) throws IOException { log.debug("assertMBeanRegistration: " + state); @@ -121,9 +123,9 @@ int timeout = 5000; while (0 < (timeout -= 200)) { - boolean fwkCheck = checkMBean(server, fwkName, state); - boolean bndCheck = checkMBean(server, bndName, state); - boolean srvCheck = checkMBean(server, srvName, state); + boolean fwkCheck = isMBeanRegistered(server, fwkName, state); + boolean bndCheck = isMBeanRegistered(server, bndName, state); + boolean srvCheck = isMBeanRegistered(server, srvName, state); if (fwkCheck == true && bndCheck == true && srvCheck == true) break; @@ -137,15 +139,15 @@ } } - if (checkMBean(server, fwkName, state) == false) + if (isMBeanRegistered(server, fwkName, state) == false) log.warn("FrameworkMBean " + (state ? "not" : "still") + " registered"); - if (checkMBean(server, bndName, state) == false) + if (isMBeanRegistered(server, bndName, state) == false) log.warn("BundleStateMBean " + (state ? "not" : "still") + " registered"); - if (checkMBean(server, srvName, state) == false) + if (isMBeanRegistered(server, srvName, state) == false) log.warn("ServiceStateMBean " + (state ? "not" : "still") + " registered"); } - private boolean checkMBean(MBeanServer server, ObjectName oname, boolean state) + protected boolean isMBeanRegistered(MBeanServerConnection server, ObjectName oname, boolean state) throws IOException { boolean registered = server.isRegistered(oname); log.debug(oname + " registered: " + registered); Added: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/JSR160TestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/JSR160TestCase.java (rev 0) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/JSR160TestCase.java 2010-04-06 13:51:42 UTC (rev 103570) @@ -0,0 +1,88 @@ +/* + * 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.test.osgi.jmx; + +//$Id: ServiceStateTestCase.java 103562 2010-04-06 10:25:15Z thomas.diesler(a)jboss.com $ + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.net.URL; +import java.util.Map; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; + +import org.jboss.osgi.jmx.ObjectNameFactory; +import org.junit.Test; +import org.osgi.framework.Bundle; +import org.osgi.jmx.framework.BundleStateMBean; +import org.osgi.jmx.framework.FrameworkMBean; +import org.osgi.jmx.framework.ServiceStateMBean; + +/** + * Test JSR160 remote connectivity. + * + * @author thomas.diesler(a)jboss.com + * @since 06-Apr-2010 + */ +public class JSR160TestCase extends AbstractJMXTestCase +{ + @Test + public void testJMXConnector() throws Exception + { + URL url = getTestArchiveURL("bundles/jboss-osgi-common-core.jar"); + Bundle bundle = systemContext.installBundle(url.toExternalForm()); + bundle.start(); + + url = getTestArchiveURL("bundles/jboss-osgi-jndi.jar"); + bundle = systemContext.installBundle(url.toExternalForm()); + bundle.start(); + + // The address of the connector server + JMXServiceURL address = new JMXServiceURL("service:jmx:rmi://localhost/jndi/rmi://localhost:1098/jmxconnector"); + + // The environment map, null in this case + Map<String, ?> environment = null; + + // Create the JMXCconnectorServer + JMXConnector cntor = JMXConnectorFactory.connect(address, environment); + + // Obtain a "stub" for the remote MBeanServer + MBeanServerConnection mbsc = cntor.getMBeanServerConnection(); + + // Call the remote MBeanServer + String domain = mbsc.getDefaultDomain(); + assertEquals("DefaultDomain", domain); + + ObjectName fwkName = ObjectNameFactory.create(FrameworkMBean.OBJECTNAME); + ObjectName bndName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME); + ObjectName srvName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME); + + assertTrue(isMBeanRegistered(mbsc, fwkName, true)); + assertTrue(isMBeanRegistered(mbsc, bndName, true)); + assertTrue(isMBeanRegistered(mbsc, srvName, true)); + } +} \ 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-04-06 13:11:35 UTC (rev 103569) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-04-06 13:51:42 UTC (rev 103570) @@ -21,7 +21,7 @@ <artifactId>jboss-osgi-jmx-parent</artifactId> <packaging>pom</packaging> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.5-SNAPSHOT</version>  <parent> @@ -41,9 +41,11 @@ <properties> <version.apache.aries.jmx>0.1-incubating-SNAPSHOT</version.apache.aries.jmx> <version.apache.felix.log>1.0.0</version.apache.felix.log> - <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common> - <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.felix> + <version.jboss.osgi.common>1.0.4</version.jboss.osgi.common> + <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> + <version.jboss.osgi.jndi>1.0.3</version.jboss.osgi.jndi> + <version.jboss.osgi.spi>1.0.5</version.jboss.osgi.spi> + <version.jboss.osgi.felix>2.0.4</version.jboss.osgi.felix> <version.osgi>4.2.0</version.osgi> </properties> @@ -56,11 +58,6 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - <dependency> <groupId>org.apache.aries.jmx</groupId> <artifactId>org.apache.aries.jmx</artifactId> <version>${version.apache.aries.jmx}</version> @@ -76,11 +73,26 @@ <version>${version.apache.felix.log}</version> </dependency> <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</artifactId> <version>${version.jboss.osgi.common}</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.jndi</groupId> + <artifactId>jboss-osgi-jndi</artifactId> + <version>${version.jboss.osgi.jndi}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi.felix</groupId> <artifactId>jboss-osgi-felix</artifactId> <version>${version.jboss.osgi.felix}</version>

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103565 - projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-06 07:07:48 -0400 (Tue, 06 Apr 2010) New Revision: 103565 Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java Log: Fix dependency on jboss-osg-jmx Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java 2010-04-06 10:57:16 UTC (rev 103564) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java 2010-04-06 11:07:48 UTC (rev 103565) @@ -31,14 +31,18 @@ import javax.management.MBeanServerFactory; import javax.management.ObjectName; +import org.jboss.logging.Logger; import org.jboss.osgi.jmx.FrameworkMBeanExt; import org.jboss.osgi.jmx.MBeanProxy; import org.jboss.osgi.jmx.ObjectNameFactory; import org.jboss.osgi.jmx.ServiceStateMBeanExt; import org.jboss.osgi.testing.OSGiFrameworkTest; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.junit.Before; import org.junit.BeforeClass; +import org.osgi.framework.Bundle; import org.osgi.jmx.framework.BundleStateMBean; +import org.osgi.jmx.framework.FrameworkMBean; +import org.osgi.jmx.framework.ServiceStateMBean; /** * An abstract JMX test case. @@ -48,16 +52,28 @@ */ public abstract class AbstractJMXTestCase extends OSGiFrameworkTest { + // Provide logging + private static final Logger log = Logger.getLogger(AbstractJMXTestCase.class); + private MBeanServer server; @BeforeClass public static void setUpClass() throws Exception { + // Install/Start the jboss-osgi-jmx bundle String bundleName = System.getProperty("project.build.finalName"); URL bundleURL = new File("target/" + bundleName + ".jar").toURI().toURL(); - systemContext.installBundle(bundleURL.toExternalForm()); + Bundle bundle = systemContext.installBundle(bundleURL.toExternalForm()); + bundle.start(); } + @Before + public void setUp() throws Exception + { + super.setUp(); + assertMBeanRegistration(true); + } + protected FrameworkMBeanExt getFrameworkMBean() throws Exception { ObjectName oname = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME); @@ -92,4 +108,47 @@ } return server; } + + private void assertMBeanRegistration(boolean state) + { + log.debug("assertMBeanRegistration: " + state); + + MBeanServer server = (MBeanServer)getMBeanServer(); + ObjectName fwkName = ObjectNameFactory.create(FrameworkMBean.OBJECTNAME); + ObjectName bndName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME); + ObjectName srvName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME); + + int timeout = 5000; + while (0 < (timeout -= 200)) + { + boolean fwkCheck = checkMBean(server, fwkName, state); + boolean bndCheck = checkMBean(server, bndName, state); + boolean srvCheck = checkMBean(server, srvName, state); + if (fwkCheck == true && bndCheck == true && srvCheck == true) + break; + + try + { + Thread.sleep(200); + } + catch (InterruptedException e) + { + // ignore + } + } + + if (checkMBean(server, fwkName, state) == false) + log.warn("FrameworkMBean " + (state ? "not" : "still") + " registered"); + if (checkMBean(server, bndName, state) == false) + log.warn("BundleStateMBean " + (state ? "not" : "still") + " registered"); + if (checkMBean(server, srvName, state) == false) + log.warn("ServiceStateMBean " + (state ? "not" : "still") + " registered"); + } + + private boolean checkMBean(MBeanServer server, ObjectName oname, boolean state) + { + boolean registered = server.isRegistered(oname); + log.debug(oname + " registered: " + registered); + return registered == state; + } } \ No newline at end of file

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103562 - in projects/jboss-osgi/projects/bundles/jmx/trunk: api/src/main/java/org/jboss/osgi/jmx and 4 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-06 06:25:15 -0400 (Tue, 06 Apr 2010) New Revision: 103562 Added: projects/jboss-osgi/projects/bundles/jmx/trunk/api/ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java Removed: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/scripts/antrun-test-jars.xml projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/ Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/api/src/main/java/org/jboss/osgi/jmx/MBeanProxy.java projects/jboss-osgi/projects/bundles/jmx/trunk/api/src/main/java/org/jboss/osgi/jmx/ObjectNameFactory.java projects/jboss-osgi/projects/bundles/jmx/trunk/impl/pom.xml projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/ServiceStateTestCase.java projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/resources/jboss-osgi-framework.properties projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml Log: wip Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/api (from rev 103561, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api) Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/api/src/main/java/org/jboss/osgi/jmx/MBeanProxy.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/MBeanProxy.java 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/api/src/main/java/org/jboss/osgi/jmx/MBeanProxy.java 2010-04-06 10:25:15 UTC (rev 103562) @@ -21,7 +21,7 @@ */ package org.jboss.osgi.jmx; -// $Id: MBeanProxy.java 101072 2010-02-17 13:55:15Z thomas.diesler(a)jboss.com $ +// $Id$ import javax.management.MBeanServerConnection; import javax.management.MBeanServerInvocationHandler; Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/api/src/main/java/org/jboss/osgi/jmx/ObjectNameFactory.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ObjectNameFactory.java 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/api/src/main/java/org/jboss/osgi/jmx/ObjectNameFactory.java 2010-04-06 10:25:15 UTC (rev 103562) @@ -21,7 +21,7 @@ */ package org.jboss.osgi.jmx; -// $Id: ObjectNameFactory.java 101072 2010-02-17 13:55:15Z thomas.diesler(a)jboss.com $ +// $Id$ import java.util.Hashtable; Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/impl (from rev 103561, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle) Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/pom.xml 2010-04-06 10:25:15 UTC (rev 103562) @@ -168,27 +168,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-test-jars</id> - <phase>integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="artifactId" value="${artifactId}" /> - <property name="tests.output.dir" value="${project.build.directory}" /> - <property name="build.artifact" value="${project.build.finalName}" /> - <ant antfile="scripts/antrun-test-jars.xml" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> @@ -213,6 +192,10 @@ <value>${project.build.directory}</value> </property> <property> + <name>project.build.finalName</name> + <value>${project.build.finalName}</value> + </property> + <property> <name>test.archive.directory</name> <value>${project.build.directory}/test-libs</value> </property> Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/scripts/antrun-test-jars.xml 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/scripts/antrun-test-jars.xml 2010-04-06 10:25:15 UTC (rev 103562) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project default="build-test-jars"> - - <description>OSGi test archive builder</description> - -  -  -  - - <target name="init"> - -  - <property name="maven.runtime.classpath" value="/usr/java/bnd.jar" /> - <property name="tests.output.dir" value="${basedir}/../target" /> - - <mkdir dir="${tests.output.dir}/test-libs" /> - <property name="tests.classes.dir" value="${tests.output.dir}/test-classes" /> - <property name="tests.resources.dir" value="${tests.output.dir}/test-classes" /> - - <taskdef resource="aQute/bnd/ant/taskdef.properties"> - <classpath> - <pathelement path="${maven.runtime.classpath}" /> - </classpath> - </taskdef> - -  - <copy file="${tests.output.dir}/${build.artifact}.jar" tofile="${tests.output.dir}/test-libs/bundles/${artifactId}.jar" overwrite="true"/> - - </target> - -  -  -  - - <target name="build-test-jars" depends="init" description="Build the test deployments"> - -  - -  - - </target> - -</project> Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java (from rev 103561, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java) =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java (rev 0) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java 2010-04-06 10:25:15 UTC (rev 103562) @@ -0,0 +1,95 @@ +/* + * 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.test.osgi.jmx; + +//$Id$ + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.ObjectName; + +import org.jboss.osgi.jmx.FrameworkMBeanExt; +import org.jboss.osgi.jmx.MBeanProxy; +import org.jboss.osgi.jmx.ObjectNameFactory; +import org.jboss.osgi.jmx.ServiceStateMBeanExt; +import org.jboss.osgi.testing.OSGiFrameworkTest; +import org.jboss.osgi.testing.OSGiTestHelper; +import org.junit.BeforeClass; +import org.osgi.jmx.framework.BundleStateMBean; + +/** + * An abstract JMX test case. + * + * @author thomas.diesler(a)jboss.com + * @since 23-Feb-2010 + */ +public abstract class AbstractJMXTestCase extends OSGiFrameworkTest +{ + private MBeanServer server; + + @BeforeClass + public static void setUpClass() throws Exception + { + String bundleName = System.getProperty("project.build.finalName"); + URL bundleURL = new File("target/" + bundleName + ".jar").toURI().toURL(); + systemContext.installBundle(bundleURL.toExternalForm()); + } + + protected FrameworkMBeanExt getFrameworkMBean() throws Exception + { + ObjectName oname = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME); + return MBeanProxy.get(getMBeanServer(), oname, FrameworkMBeanExt.class); + } + + protected BundleStateMBean getBundleStateMBean() throws Exception + { + ObjectName oname = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME); + return MBeanProxy.get(getMBeanServer(), oname, BundleStateMBean.class); + } + + protected ServiceStateMBeanExt getServiceStateMBean() throws Exception + { + ObjectName oname = ObjectNameFactory.create(ServiceStateMBeanExt.OBJECTNAME); + return MBeanProxy.get(getMBeanServer(), oname, ServiceStateMBeanExt.class); + } + + protected MBeanServer getMBeanServer() + { + if (server == null) + { + ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null); + if (serverArr.size() > 1) + throw new IllegalStateException("Multiple MBeanServer instances not supported"); + + if (serverArr.size() == 1) + server = serverArr.get(0); + + if (server == null) + server = MBeanServerFactory.createMBeanServer(); + } + return server; + } +} \ No newline at end of file Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java 2010-04-06 10:25:15 UTC (rev 103562) @@ -1,112 +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.test.osgi.jmx; - -//$Id$ - -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.ObjectName; - -import org.jboss.osgi.jmx.FrameworkMBeanExt; -import org.jboss.osgi.jmx.MBeanProxy; -import org.jboss.osgi.jmx.ObjectNameFactory; -import org.jboss.osgi.jmx.ServiceStateMBeanExt; -import org.jboss.osgi.spi.framework.OSGiBootstrap; -import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.osgi.framework.BundleContext; -import org.osgi.framework.launch.Framework; -import org.osgi.jmx.framework.BundleStateMBean; - -/** - * An abstract JMX test case. - * - * @author thomas.diesler(a)jboss.com - * @since 23-Feb-2010 - */ -public abstract class AbstractTestCase -{ - private static Framework framework; - private MBeanServer server; - - @BeforeClass - public static void setUpClass() throws Exception - { - OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); - framework = bootProvider.getFramework(); - framework.start(); - } - - @AfterClass - public static void tearDownClass() throws Exception - { - if (framework != null) - { - framework.stop(); - framework.waitForStop(3000); - } - } - - protected BundleContext getSystemContext() - { - return framework.getBundleContext(); - } - - protected FrameworkMBeanExt getFrameworkMBean() throws Exception - { - ObjectName oname = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME); - return MBeanProxy.get(getMBeanServer(), oname, FrameworkMBeanExt.class); - } - - protected BundleStateMBean getBundleStateMBean() throws Exception - { - ObjectName oname = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME); - return MBeanProxy.get(getMBeanServer(), oname, BundleStateMBean.class); - } - - protected ServiceStateMBeanExt getServiceStateMBean() throws Exception - { - ObjectName oname = ObjectNameFactory.create(ServiceStateMBeanExt.OBJECTNAME); - return MBeanProxy.get(getMBeanServer(), oname, ServiceStateMBeanExt.class); - } - - protected MBeanServer getMBeanServer() - { - if (server == null) - { - ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null); - if (serverArr.size() > 1) - throw new IllegalStateException("Multiple MBeanServer instances not supported"); - - if (serverArr.size() == 1) - server = serverArr.get(0); - - if (server == null) - server = MBeanServerFactory.createMBeanServer(); - } - return server; - } -} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java 2010-04-06 10:25:15 UTC (rev 103562) @@ -41,7 +41,7 @@ * @author thomas.diesler(a)jboss.com * @since 23-Feb-2010 */ -public class BundleStateTestCase extends AbstractTestCase +public class BundleStateTestCase extends AbstractJMXTestCase { @Test public void testMBeanAccess() throws Exception @@ -53,7 +53,7 @@ @Test public void listBundles() throws Exception { - Bundle[] bundles = getSystemContext().getBundles(); + Bundle[] bundles = systemContext.getBundles(); BundleStateMBean bundleState = getBundleStateMBean(); TabularData data = bundleState.listBundles(); assertEquals("Number of bundles", bundles.length, data.size()); Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java 2010-04-06 10:25:15 UTC (rev 103562) @@ -38,7 +38,7 @@ * @author thomas.diesler(a)jboss.com * @since 23-Feb-2010 */ -public class FrameworkTestCase extends AbstractTestCase +public class FrameworkTestCase extends AbstractJMXTestCase { @Test public void testMBeanAccess() throws Exception Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/ServiceStateTestCase.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateTestCase.java 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/java/org/jboss/test/osgi/jmx/ServiceStateTestCase.java 2010-04-06 10:25:15 UTC (rev 103562) @@ -43,12 +43,12 @@ * @author thomas.diesler(a)jboss.com * @since 23-Feb-2010 */ -public class ServiceStateTestCase extends AbstractTestCase +public class ServiceStateTestCase extends AbstractJMXTestCase { @Test public void listServices() throws Exception { - ServiceReference[] srefs = getSystemContext().getServiceReferences(null, null); + ServiceReference[] srefs = systemContext.getServiceReferences(null, null); ServiceStateMBeanExt serviceState = getServiceStateMBean(); TabularData data = serviceState.listServices(); @@ -75,7 +75,7 @@ @Test public void getServices() throws Exception { - ServiceReference sref = getSystemContext().getServiceReference(MBeanServer.class.getName()); + ServiceReference sref = systemContext.getServiceReference(MBeanServer.class.getName()); Long serviceID = (Long)sref.getProperty(Constants.SERVICE_ID); ServiceStateMBeanExt serviceState = getServiceStateMBean(); Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/resources/jboss-osgi-framework.properties 2010-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/impl/src/test/resources/jboss-osgi-framework.properties 2010-04-06 10:25:15 UTC (rev 103562) @@ -32,5 +32,4 @@ org.jboss.osgi.spi.framework.autoStart=\ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \ file://${test.archive.directory}/bundles/jboss-osgi-common.jar \ - file://${test.archive.directory}/bundles/org.apache.aries.jmx.jar \ - file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar \ No newline at end of file + file://${test.archive.directory}/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-04-06 07:41:11 UTC (rev 103561) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-04-06 10:25:15 UTC (rev 103562) @@ -48,8 +48,8 @@ </properties> <modules> - <module>jmx-api</module> - <module>jmx-bundle</module> + <module>api</module> + <module>impl</module> </modules>

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103475 - projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-02 06:37:41 -0400 (Fri, 02 Apr 2010) New Revision: 103475 Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml Log: Verify that host:8090/jboss-osgi comes up in the 'osgi' profile Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml 2010-04-02 10:10:15 UTC (rev 103474) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/JBoss-6.0.1/config.xml 2010-04-02 10:37:41 UTC (rev 103475) @@ -38,7 +38,7 @@ HUDSONBIN=$HUDSONDIR/hudson-home/bin JBOSS_VERSION=jboss-6.0.0-SNAPSHOT -SERVER_NAME=default +SERVER_NAME=osgi JBOSS_HOME=$WORKSPACE/jbossas/build/target/$JBOSS_VERSION JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_VERSION.zip @@ -59,7 +59,7 @@ # # Was it successfully started? # -$HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE +$HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then tail -n 200 $JBOSS_HOME/server/default/log/server.log $HUDSONBIN/startup.sh $JBOSS_HOME stop

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103473 - in projects/jboss-osgi/trunk/testsuite: example/src/test/resources and 1 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-02 06:04:24 -0400 (Fri, 02 Apr 2010) New Revision: 103473 Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Use jboss601 client SNAPSHOT Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2010-04-02 09:37:28 UTC (rev 103472) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2010-04-02 10:04:24 UTC (rev 103473) @@ -9,7 +9,7 @@ <appender name="FILE" class="org.apache.log4j.FileAppender"> <param name="File" value="${log4j.output.dir}/test.log"/> - <param name="Append" value="true"/> + <param name="Append" value="false"/> <layout class="org.apache.log4j.PatternLayout">  <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> @@ -32,11 +32,10 @@   -  + <category name="org.jboss"> <priority value="TRACE" /> </category> - -->   Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml 2010-04-02 09:37:28 UTC (rev 103472) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml 2010-04-02 10:04:24 UTC (rev 103473) @@ -9,7 +9,7 @@ <appender name="FILE" class="org.apache.log4j.FileAppender"> <param name="File" value="${log4j.output.dir}/test.log"/> - <param name="Append" value="true"/> + <param name="Append" value="false"/> <layout class="org.apache.log4j.PatternLayout">  <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-04-02 09:37:28 UTC (rev 103472) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-04-02 10:04:24 UTC (rev 103473) @@ -540,7 +540,7 @@ <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> - <version>6.0.0.20100216-M2</version> + <version>6.0.0-SNAPSHOT</version> <scope>test</scope> <type>pom</type> <exclusions>

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103471 - projects/jboss-osgi/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-02 03:43:42 -0400 (Fri, 02 Apr 2010) New Revision: 103471 Modified: projects/jboss-osgi/trunk/pom.xml Log: Remove all SNAPSHOTS Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-04-02 07:23:43 UTC (rev 103470) +++ projects/jboss-osgi/trunk/pom.xml 2010-04-02 07:43:42 UTC (rev 103471) @@ -58,11 +58,11 @@ <version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.4</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> - <version.jboss.osgi.deployers>1.0.6-SNAPSHOT</version.jboss.osgi.deployers> + <version.jboss.osgi.deployers>1.0.6</version.jboss.osgi.deployers> <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment> <version.jboss.osgi.equinox>3.5.2</version.jboss.osgi.equinox> <version.jboss.osgi.felix>2.0.4</version.jboss.osgi.felix> - <version.jboss.osgi.framework>1.0.0.Alpha5-SNAPSHOT</version.jboss.osgi.framework> + <version.jboss.osgi.framework>1.0.0.Alpha4</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.5</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.4</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP4</version.jboss.osgi.jaxb> @@ -75,7 +75,7 @@ <version.jboss.osgi.spi>1.0.5.SP1</version.jboss.osgi.spi> <version.jboss.osgi.vfs>1.0.0</version.jboss.osgi.vfs> <version.jboss.osgi.webapp>0.7.2.SP2</version.jboss.osgi.webapp> - <version.jboss.osgi.webconsole>1.0.3-SNAPSHOT</version.jboss.osgi.webconsole> + <version.jboss.osgi.webconsole>1.0.3</version.jboss.osgi.webconsole> <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP1</version.jboss.osgi.xml.binding> <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi>

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103470 - projects/jboss-osgi/projects/bundles/webconsole/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-02 03:23:43 -0400 (Fri, 02 Apr 2010) New Revision: 103470 Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2010-04-02 07:23:33 UTC (rev 103469) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2010-04-02 07:23:43 UTC (rev 103470) @@ -21,7 +21,7 @@ <artifactId>jboss-osgi-webconsole</artifactId> <packaging>bundle</packaging> - <version>1.0.3</version> + <version>1.0.4-SNAPSHOT</version>  <parent> @@ -32,9 +32,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> - <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-webconsole-1.0.3</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> + <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> </scm>

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103469 - in projects/jboss-osgi/projects/bundles/webconsole/tags: jboss-osgi-webconsole-1.0.3 and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-02 03:23:33 -0400 (Fri, 02 Apr 2010) New Revision: 103469 Added: projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3/ projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3/pom.xml Removed: projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3/pom.xml Log: [maven-release-plugin] copy for tag jboss-osgi-webconsole-1.0.3 Copied: projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3 (from rev 103467, projects/jboss-osgi/projects/bundles/webconsole/trunk) Property changes on: projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3 ___________________________________________________________________ Name: svn:ignore + target Name: svn:mergeinfo + Deleted: projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2010-04-02 00:45:38 UTC (rev 103467) +++ projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3/pom.xml 2010-04-02 07:23:33 UTC (rev 103469) @@ -1,223 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  -  -  -  -  -  -  -  - -  - -<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 WebConsole</name> - <description>The JBossOSGi Web Console</description> - - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-webconsole</artifactId> - <packaging>bundle</packaging> - - <version>1.0.3-SNAPSHOT</version> - -  - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.5</version> - </parent> - -  - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> - </scm> - -  - <properties> - <version.commons.fileupload>1.1.1</version.commons.fileupload> - <version.commons.io>1.4</version.commons.io> - <version.felix.bundlerepository>1.0.3</version.felix.bundlerepository> - <version.felix.osgi.core>1.4.0</version.felix.osgi.core> - <version.felix.scr>1.0.0</version.felix.scr> - <version.felix.webconsole>1.2.10</version.felix.webconsole> - <version.javax.servlet>2.4</version.javax.servlet> - <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment> - <version.jboss.osgi.spi>1.0.5</version.jboss.osgi.spi> - <version.json>20070829</version.json> - <version.osgi>4.2.0</version.osgi> - </properties> - -  - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.deployment</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${version.javax.servlet}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>${version.commons.fileupload}</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${version.commons.io}</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.webconsole</artifactId> - <version>${version.felix.webconsole}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>${version.json}</version> - <scope>compile</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr</artifactId> - <version>${version.felix.scr}</version> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.compendium</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.bundlerepository</artifactId> - <version>${version.felix.bundlerepository}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> - -  - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${version.osgi}</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${version.osgi}</version> - </dependency> - </dependencies> - -  - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <showDeprecation>false</showDeprecation> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - </execution> - </executions> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.webconsole</artifactId> - <type>jar</type> - <outputDirectory>target/classes</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </plugin> - <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.webconsole.internal.WebConsoleActivator</Bundle-Activator> - <Export-Package> - org.apache.felix.webconsole;version=${version.felix.webconsole}, - org.osgi.service.obr - </Export-Package> - <Private-Package> - !org.apache.felix.webconsole, - org.apache.felix.webconsole.*, - org.jboss.osgi.webconsole.internal* - </Private-Package> - <Import-Package> - org.apache.felix.scr; - org.apache.felix.shell; - org.osgi.service.*;resolution:=optional, - -  - org.ops4j.pax.web.service;version=0.7, - - javax.portlet;resolution:=optional,* - </Import-Package> - <Embed-Dependency> -  - org.apache.felix.bundlerepository, - -  - json, - -  - commons-fileupload, - -  - commons-io - </Embed-Dependency> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3/pom.xml (from rev 103468, projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3/pom.xml (rev 0) +++ projects/jboss-osgi/projects/bundles/webconsole/tags/jboss-osgi-webconsole-1.0.3/pom.xml 2010-04-02 07:23:33 UTC (rev 103469) @@ -0,0 +1,223 @@ +<?xml version="1.0" encoding="UTF-8"?> + +  +  +  +  +  +  +  +  + +  + +<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 WebConsole</name> + <description>The JBossOSGi Web Console</description> + + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-webconsole</artifactId> + <packaging>bundle</packaging> + + <version>1.0.3</version> + +  + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-parent</artifactId> + <version>1.0.5</version> + </parent> + +  + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> + <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-webconsole-1.0.3</url> + </scm> + +  + <properties> + <version.commons.fileupload>1.1.1</version.commons.fileupload> + <version.commons.io>1.4</version.commons.io> + <version.felix.bundlerepository>1.0.3</version.felix.bundlerepository> + <version.felix.osgi.core>1.4.0</version.felix.osgi.core> + <version.felix.scr>1.0.0</version.felix.scr> + <version.felix.webconsole>1.2.10</version.felix.webconsole> + <version.javax.servlet>2.4</version.javax.servlet> + <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment> + <version.jboss.osgi.spi>1.0.5</version.jboss.osgi.spi> + <version.json>20070829</version.json> + <version.osgi>4.2.0</version.osgi> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.deployment</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + <version>${version.jboss.osgi.deployment}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${version.javax.servlet}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>${version.commons.fileupload}</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${version.commons.io}</version> + <scope>provided</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <version>${version.felix.webconsole}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>${version.json}</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr</artifactId> + <version>${version.felix.scr}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + <version>${version.felix.bundlerepository}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + </exclusions> + <optional>true</optional> + </dependency> + +  + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.osgi}</version> + </dependency> + </dependencies> + +  + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <showDeprecation>false</showDeprecation> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + </execution> + </executions> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <type>jar</type> + <outputDirectory>target/classes</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </plugin> + <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.webconsole.internal.WebConsoleActivator</Bundle-Activator> + <Export-Package> + org.apache.felix.webconsole;version=${version.felix.webconsole}, + org.osgi.service.obr + </Export-Package> + <Private-Package> + !org.apache.felix.webconsole, + org.apache.felix.webconsole.*, + org.jboss.osgi.webconsole.internal* + </Private-Package> + <Import-Package> + org.apache.felix.scr; + org.apache.felix.shell; + org.osgi.service.*;resolution:=optional, + +  + org.ops4j.pax.web.service;version=0.7, + + javax.portlet;resolution:=optional,* + </Import-Package> + <Embed-Dependency> +  + org.apache.felix.bundlerepository, + +  + json, + +  + commons-fileupload, + +  + commons-io + </Embed-Dependency> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project>

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103468 - projects/jboss-osgi/projects/bundles/webconsole/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-02 03:23:10 -0400 (Fri, 02 Apr 2010) New Revision: 103468 Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml Log: [maven-release-plugin] prepare release jboss-osgi-webconsole-1.0.3 Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2010-04-02 00:45:38 UTC (rev 103467) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2010-04-02 07:23:10 UTC (rev 103468) @@ -21,7 +21,7 @@ <artifactId>jboss-osgi-webconsole</artifactId> <packaging>bundle</packaging> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.3</version>  <parent> @@ -32,9 +32,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> + <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-webconsole-1.0.3</url> </scm>

14 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r103446 - projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-04-01 11:28:43 -0400 (Thu, 01 Apr 2010) New Revision: 103446 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java Log: Cleanup event logging Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2010-04-01 15:28:39 UTC (rev 103445) +++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2010-04-01 15:28:43 UTC (rev 103446) @@ -92,6 +92,8 @@ private boolean synchronous; /** The set of bundle events that are delivered to an (asynchronous) BundleListener */ private Set<Integer> asyncBundleEvents = new HashSet<Integer>(); + /** The set of events that are logged at INFO level */ + private Set<String> infoEvents = new HashSet<String>(); public FrameworkEventsPluginImpl(OSGiBundleManager bundleManager) { @@ -104,6 +106,11 @@ asyncBundleEvents.add(new Integer(BundleEvent.UPDATED)); asyncBundleEvents.add(new Integer(BundleEvent.UNRESOLVED)); asyncBundleEvents.add(new Integer(BundleEvent.UNINSTALLED)); + infoEvents.add(ConstantsHelper.frameworkEvent(FrameworkEvent.PACKAGES_REFRESHED)); + infoEvents.add(ConstantsHelper.bundleEvent(BundleEvent.INSTALLED)); + infoEvents.add(ConstantsHelper.bundleEvent(BundleEvent.STARTED)); + infoEvents.add(ConstantsHelper.bundleEvent(BundleEvent.STOPPED)); + infoEvents.add(ConstantsHelper.bundleEvent(BundleEvent.UNINSTALLED)); } public void setSynchronous(boolean synchronous) @@ -394,7 +401,7 @@ final BundleEvent event = new OSGiBundleEvent(type, assertBundle(bundle)); final String typeName = ConstantsHelper.bundleEvent(event.getType()); - if (asyncBundleEvents.contains(event.getType())) + if (infoEvents.contains(ConstantsHelper.bundleEvent(event.getType()))) log.info("Bundle " + typeName + ": " + bundle); else log.debug("Bundle " + typeName + ": " + bundle); @@ -481,7 +488,10 @@ FrameworkEvent event = new OSGiFrameworkEvent(type, assertBundle(bundle), throwable); String typeName = ConstantsHelper.frameworkEvent(event.getType()); - log.info("Framwork " + typeName); + if (infoEvents.contains(ConstantsHelper.frameworkEvent(event.getType()))) + log.info("Framwork " + typeName); + else + log.debug("Framwork " + typeName); // Nobody is interested if (frameworkListeners.isEmpty()) @@ -544,7 +554,10 @@ ServiceEvent event = new OSGiServiceEvent(type, service.getReferenceInternal()); String typeName = ConstantsHelper.serviceEvent(event.getType()); - log.info("Service " + typeName + ": " + service); + if (infoEvents.contains(ConstantsHelper.serviceEvent(event.getType()))) + log.info("Service " + typeName + ": " + service); + else + log.debug("Service " + typeName + ": " + service); // Do nothing if the Framework is not active if (getBundleManager().isFrameworkActive() == false)

14 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits April 2010