[jboss-cvs] JBossAS SVN: r101381 - in projects/jboss-osgi/projects: bundles/husky/trunk/scripts and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 24 05:32:48 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-02-24 05:32:47 -0500 (Wed, 24 Feb 2010)
New Revision: 101381
Added:
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/jmx-bundle/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/FrameworkTestCase.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateTestCase.java
Removed:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateMBeanTestCase.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkMBeanTestCase.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateMBeanTestCase.java
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/scripts/assembly-bundles.xml
projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/scripts/assembly-bundles.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-all.xml
projects/jboss-osgi/projects/testing/trunk/pom.xml
projects/jboss-osgi/projects/testing/trunk/scripts/assembly-bundles.xml
Log:
Cleanup dependencies and remove dependency on stale jmx bundle
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -42,6 +42,7 @@
<properties>
<version.apache.aries.jmx>1.0.0-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.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
@@ -61,16 +62,16 @@
<version>${version.apache.aries.jmx}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx-api</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
<version>${version.jboss.osgi.deployment}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -98,6 +99,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- OSGi Dependencies -->
<dependency>
@@ -126,6 +139,11 @@
<version>${version.jboss.osgi.testing}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/scripts/assembly-bundles.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/scripts/assembly-bundles.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -15,19 +15,8 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
- <include>*:jboss-osgi-jndi:jar</include>
- </includes>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>compile</scope>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>bundles</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
<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/husky/trunk/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-24 10:32:47 UTC (rev 101381)
@@ -38,4 +38,6 @@
# Bundles that need to be started automatically
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
\ No newline at end of file
+ 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
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/pom.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -35,10 +35,6 @@
<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>
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -25,7 +25,6 @@
import javax.management.MBeanServer;
-import org.jboss.osgi.jndi.JNDICapability;
import org.jboss.osgi.spi.capability.Capability;
/**
@@ -34,7 +33,6 @@
*
* 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
@@ -57,8 +55,6 @@
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");
}
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-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -36,30 +36,12 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</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>
<!-- Provided Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.jndi</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
<scope>provided</scope>
@@ -79,6 +61,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- OSGi Dependencies -->
<dependency>
@@ -136,7 +123,6 @@
<!-- 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)",
@@ -144,13 +130,10 @@
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.net.sockets;version="[2.2,3.0)",
- org.jnp.interfaces;version="[5.0,6.0)",
+ <!-- optional jndi support -->
+ org.jboss.net.sockets;version="[2.2,3.0)";resolution:=optional,
+ org.jboss.osgi.jndi;version="[1.0,2.0)";resolution:=optional,
+ org.jnp.interfaces;version="[5.0,6.0)";resolution:=optional,
</Import-Package>
<Embed-Dependency>
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/scripts/assembly-bundles.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/scripts/assembly-bundles.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -15,18 +15,7 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:jboss-osgi-common-core:jar</include>
- </includes>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>compile</scope>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>bundles</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <includes>
<include>*:jboss-osgi-common: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>
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -1,106 +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.ServiceStateMBeanExt;
-import org.jboss.osgi.spi.framework.OSGiBootstrap;
-import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.spi.management.MBeanProxy;
-import org.jboss.osgi.spi.management.ObjectNameFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.osgi.framework.launch.Framework;
-import org.osgi.jmx.framework.BundleStateMBean;
-
-/**
- * An abstract JMX test case.
- *
- * @author thomas.diesler at jboss.com
- * @since 23-Feb-2010
- */
-public abstract class AbstractJMXTestCase
-{
- 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);
- }
- }
-
- public FrameworkMBeanExt getFramework() throws Exception
- {
- ObjectName oname = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME);
- return MBeanProxy.get(getMBeanServer(), oname, FrameworkMBeanExt.class);
- }
-
- public BundleStateMBean getBundleState() throws Exception
- {
- ObjectName oname = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
- return MBeanProxy.get(getMBeanServer(), oname, BundleStateMBean.class);
- }
-
- public ServiceStateMBeanExt getServiceState() 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
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java (from rev 101378, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractJMXTestCase.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/AbstractTestCase.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -0,0 +1,112 @@
+/*
+ * 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.ServiceStateMBeanExt;
+import org.jboss.osgi.spi.framework.OSGiBootstrap;
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
+import org.jboss.osgi.spi.management.MBeanProxy;
+import org.jboss.osgi.spi.management.ObjectNameFactory;
+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 at 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
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateMBeanTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateMBeanTestCase.java 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateMBeanTestCase.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -1,58 +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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import javax.management.ObjectName;
-import javax.management.openmbean.TabularData;
-
-import org.jboss.osgi.spi.management.ObjectNameFactory;
-import org.junit.Test;
-import org.osgi.jmx.framework.BundleStateMBean;
-
-/**
- * A test that excercises the BundleStateMBean
- *
- * @author thomas.diesler at jboss.com
- * @since 23-Feb-2010
- */
-public class BundleStateMBeanTestCase extends AbstractJMXTestCase
-{
- @Test
- public void testMBeanAccess() throws Exception
- {
- ObjectName oname = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
- assertTrue("Registerd " + oname, getMBeanServer().isRegistered(oname));
- }
-
- @Test
- public void listBundles() throws Exception
- {
- BundleStateMBean bundleState = getBundleState();
- TabularData data = bundleState.listBundles();
- assertEquals("Number of bundles", 8, data.size());
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java (from rev 101378, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateMBeanTestCase.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/BundleStateTestCase.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -0,0 +1,61 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import javax.management.ObjectName;
+import javax.management.openmbean.TabularData;
+
+import org.jboss.osgi.spi.management.ObjectNameFactory;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.jmx.framework.BundleStateMBean;
+
+/**
+ * A test that excercises the BundleStateMBean
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Feb-2010
+ */
+public class BundleStateTestCase extends AbstractTestCase
+{
+ @Test
+ public void testMBeanAccess() throws Exception
+ {
+ ObjectName oname = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
+ assertTrue("Registerd " + oname, getMBeanServer().isRegistered(oname));
+ }
+
+ @Test
+ public void listBundles() throws Exception
+ {
+ Bundle[] bundles = getSystemContext().getBundles();
+
+ BundleStateMBean bundleState = getBundleStateMBean();
+ TabularData data = bundleState.listBundles();
+ assertEquals("Number of bundles", bundles.length, data.size());
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkMBeanTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkMBeanTestCase.java 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkMBeanTestCase.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -1,52 +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 static org.junit.Assert.assertTrue;
-
-import javax.management.ObjectName;
-
-import org.jboss.osgi.jmx.FrameworkMBeanExt;
-import org.jboss.osgi.spi.management.ObjectNameFactory;
-import org.junit.Test;
-import org.osgi.jmx.framework.FrameworkMBean;
-
-/**
- * A test that excercises the FramworkMBean
- *
- * @author thomas.diesler at jboss.com
- * @since 23-Feb-2010
- */
-public class FrameworkMBeanTestCase extends AbstractJMXTestCase
-{
- @Test
- public void testMBeanAccess() throws Exception
- {
- ObjectName oname = ObjectNameFactory.create(FrameworkMBean.OBJECTNAME);
- assertTrue("Registerd " + oname, getMBeanServer().isRegistered(oname));
-
- oname = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME);
- assertTrue("Registerd " + oname, getMBeanServer().isRegistered(oname));
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java (from rev 101378, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkMBeanTestCase.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/FrameworkTestCase.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -0,0 +1,52 @@
+/*
+ * 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 static org.junit.Assert.assertTrue;
+
+import javax.management.ObjectName;
+
+import org.jboss.osgi.jmx.FrameworkMBeanExt;
+import org.jboss.osgi.spi.management.ObjectNameFactory;
+import org.junit.Test;
+import org.osgi.jmx.framework.FrameworkMBean;
+
+/**
+ * A test that excercises the FramworkMBean
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Feb-2010
+ */
+public class FrameworkTestCase extends AbstractTestCase
+{
+ @Test
+ public void testMBeanAccess() throws Exception
+ {
+ ObjectName oname = ObjectNameFactory.create(FrameworkMBean.OBJECTNAME);
+ assertTrue("Registerd " + oname, getMBeanServer().isRegistered(oname));
+
+ oname = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME);
+ assertTrue("Registerd " + oname, getMBeanServer().isRegistered(oname));
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateMBeanTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateMBeanTestCase.java 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateMBeanTestCase.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -1,79 +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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import javax.management.MBeanServer;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularData;
-
-import org.jboss.osgi.jmx.ServiceStateMBeanExt;
-import org.junit.Test;
-import org.osgi.framework.Constants;
-import org.osgi.jmx.JmxConstants;
-import org.osgi.jmx.framework.ServiceStateMBean;
-
-/**
- * A test that excercises the ServiceStateMBean
- *
- * @author thomas.diesler at jboss.com
- * @since 23-Feb-2010
- */
-public class ServiceStateMBeanTestCase extends AbstractJMXTestCase
-{
- @Test
- public void listBundles() throws Exception
- {
- ServiceStateMBeanExt serviceState = getServiceState();
- TabularData data = serviceState.listServices();
- assertEquals("Number of services", 7, data.size());
- }
-
- @Test
- public void getService() throws Exception
- {
- ServiceStateMBeanExt serviceState = getServiceState();
- CompositeData serviceData = serviceState.getService(MBeanServer.class.getName());
- assertNotNull("MBeanServer service not null", serviceData);
-
- Long serviceId = (Long)serviceData.get(ServiceStateMBean.IDENTIFIER);
- assertNotNull("service.id not null", serviceId);
-
- TabularData props = serviceState.getProperties(serviceId);
- assertNotNull("Properties not null", props);
-
- CompositeData idData = props.get(new Object[] { Constants.SERVICE_ID });
- assertEquals(serviceId.toString(), idData.get(JmxConstants.VALUE));
- }
-
- @Test
- public void getServices() throws Exception
- {
- ServiceStateMBeanExt serviceState = getServiceState();
- TabularData data = serviceState.getServices(MBeanServer.class.getName(), null);
- assertEquals("MBeanServer service not null", 1, data.size());
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateTestCase.java (from rev 101378, projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateMBeanTestCase.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateTestCase.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/java/org/jboss/test/osgi/jmx/ServiceStateTestCase.java 2010-02-24 10:32:47 UTC (rev 101381)
@@ -0,0 +1,85 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.management.MBeanServer;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.TabularData;
+
+import org.jboss.osgi.jmx.ServiceStateMBeanExt;
+import org.junit.Test;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.jmx.JmxConstants;
+import org.osgi.jmx.framework.ServiceStateMBean;
+
+/**
+ * A test that excercises the ServiceStateMBean
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 23-Feb-2010
+ */
+public class ServiceStateTestCase extends AbstractTestCase
+{
+ @Test
+ public void listServices() throws Exception
+ {
+ ServiceReference[] srefs = getSystemContext().getServiceReferences(null, null);
+
+ ServiceStateMBeanExt serviceState = getServiceStateMBean();
+ TabularData data = serviceState.listServices();
+ assertEquals("Number of services", srefs.length, data.size());
+ }
+
+ @Test
+ public void getService() throws Exception
+ {
+ ServiceStateMBeanExt serviceState = getServiceStateMBean();
+ CompositeData serviceData = serviceState.getService(MBeanServer.class.getName());
+ assertNotNull("MBeanServer service not null", serviceData);
+
+ Long serviceId = (Long)serviceData.get(ServiceStateMBean.IDENTIFIER);
+ assertNotNull("service.id not null", serviceId);
+
+ TabularData props = serviceState.getProperties(serviceId);
+ assertNotNull("Properties not null", props);
+
+ CompositeData idData = props.get(new Object[] { Constants.SERVICE_ID });
+ assertEquals(serviceId.toString(), idData.get(JmxConstants.VALUE));
+ }
+
+ @Test
+ public void getServices() throws Exception
+ {
+ ServiceReference sref = getSystemContext().getServiceReference(MBeanServer.class.getName());
+ Long serviceID = (Long)sref.getProperty(Constants.SERVICE_ID);
+
+ ServiceStateMBeanExt serviceState = getServiceStateMBean();
+ TabularData data = serviceState.getServices(null, "(service.id=" + serviceID + ")");
+ assertEquals("MBeanServer service not null", 1, data.size());
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/resources/jboss-osgi-framework.properties 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/test/resources/jboss-osgi-framework.properties 2010-02-24 10:32:47 UTC (rev 101381)
@@ -32,7 +32,5 @@
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/jboss-osgi-common-core.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-jndi.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
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -42,10 +42,8 @@
<version.apache.aries.jmx>1.0.0-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.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.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
+ <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -63,26 +61,6 @@
<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.jndi</groupId>
- <artifactId>jboss-osgi-jndi-api</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- </dependency>
- <dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
<version>${version.apache.aries.jmx}</version>
@@ -98,6 +76,11 @@
<version>${version.apache.felix.log}</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.runtime</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
<version>${version.jboss.osgi.runtime.felix}</version>
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/jndi-bundle/pom.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -36,15 +36,8 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- </dependency>
-
- <!-- Provided Dependencies -->
- <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
- <scope>provided</scope>
</dependency>
<!-- OSGi Dependencies -->
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -58,6 +58,7 @@
<version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
+ <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi>
<version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
<version.jboss.osgi.runtime.deployers>1.0.4</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
@@ -191,13 +192,6 @@
<version>${version.osgi}</version>
</dependency>
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Test bundles dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -278,12 +272,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jmx</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<version>${version.jboss.osgi.jmx}</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-reflect</artifactId>
<version>${version.jboss.osgi.reflect}</version>
@@ -325,6 +325,11 @@
<version>${version.jboss.osgi.testing}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-all.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-all.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/scripts/assembly-all.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -55,7 +55,7 @@
<include>*:jboss-logging-log4j:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
+ <scope>test</scope>
<unpack>true</unpack>
</dependencySet>
</dependencySets>
Modified: projects/jboss-osgi/projects/testing/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/pom.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/testing/trunk/pom.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -44,7 +44,6 @@
<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.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
- <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.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.osgi>4.2.0</version.osgi>
@@ -106,12 +105,6 @@
<version>${version.jboss.osgi.jmx}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.jndi</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- <scope>provided</scope>
- </dependency>
<!-- OSGi Dependencies -->
<dependency>
Modified: projects/jboss-osgi/projects/testing/trunk/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/scripts/assembly-bundles.xml 2010-02-24 10:31:14 UTC (rev 101380)
+++ projects/jboss-osgi/projects/testing/trunk/scripts/assembly-bundles.xml 2010-02-24 10:32:47 UTC (rev 101381)
@@ -15,10 +15,8 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-jmx: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>
More information about the jboss-cvs-commits
mailing list