JBoss-OSGI SVN: r102631 - in projects/jboss-osgi/projects/bundles: jboss-xml-binding/trunk and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 12:33:26 -0400 (Fri, 19 Mar 2010)
New Revision: 102631
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
Log:
Upgrade to aries-jmx 0.1-incubating-SNAPSHOT
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-19 16:07:08 UTC (rev 102630)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-19 16:33:26 UTC (rev 102631)
@@ -40,7 +40,7 @@
<!-- Properties -->
<properties>
- <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx>
+ <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.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2010-03-19 16:07:08 UTC (rev 102630)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2010-03-19 16:33:26 UTC (rev 102631)
@@ -32,8 +32,8 @@
<!-- Properties -->
<properties>
- <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx>
- <version.apache.aries.util>1.0.0-incubating-SNAPSHOT</version.apache.aries.util>
+ <version.apache.aries.jmx>0.1-incubating-SNAPSHOT</version.apache.aries.jmx>
+ <version.apache.aries.util>0.1-incubating-SNAPSHOT</version.apache.aries.util>
<version.jboss.xb>2.0.2.Beta4</version.jboss.xb>
<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>
14 years, 3 months
JBoss-OSGI SVN: r102623 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 08:30:28 -0400 (Fri, 19 Mar 2010)
New Revision: 102623
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
Log:
Upgrade to aries-jmx 0.1-incubating-SNAPSHOT
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-03-19 12:29:39 UTC (rev 102622)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-03-19 12:30:28 UTC (rev 102623)
@@ -77,7 +77,7 @@
{
String location = info.getLocation();
String streamURL = info.getRoot().getStreamURL().toExternalForm();
- long bundleId = getFrameworkMBean().installBundle(location, streamURL);
+ long bundleId = getFrameworkMBean().installBundleFromURL(location, streamURL);
return new RemoteBundle(this, bundleId);
}
catch (RuntimeException rte)
14 years, 3 months
JBoss-OSGI SVN: r102622 - in projects/jboss-osgi/projects/bundles/jmx/trunk: jmx-bundle and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 08:29:39 -0400 (Fri, 19 Mar 2010)
New Revision: 102622
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/PackageStateExt.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/ServiceStateExt.java
projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
Log:
Upgrade to aries-jmx 0.1-incubating-SNAPSHOT
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-03-19 11:03:34 UTC (rev 102621)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/pom.xml 2010-03-19 12:29:39 UTC (rev 102622)
@@ -81,8 +81,8 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <groupId>org.jboss.osgi.felix</groupId>
+ <artifactId>jboss-osgi-felix</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java 2010-03-19 11:03:34 UTC (rev 102621)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java 2010-03-19 12:29:39 UTC (rev 102622)
@@ -74,126 +74,151 @@
getFrameworkMBean().refreshBundle(bundleIdentifier);
}
+ @Override
public boolean resolveBundles(long[] bundleIdentifiers) throws IOException
{
return getFrameworkMBean().resolveBundles(bundleIdentifiers);
}
+ @Override
public boolean resolveBundle(long arg0) throws IOException
{
return getFrameworkMBean().resolveBundle(arg0);
}
+ @Override
public int getFrameworkStartLevel() throws IOException
{
return getFrameworkMBean().getFrameworkStartLevel();
}
+ @Override
public int getInitialBundleStartLevel() throws IOException
{
return getFrameworkMBean().getInitialBundleStartLevel();
}
- public long installBundle(String arg0, String arg1) throws IOException
+ @Override
+ public long installBundleFromURL(String arg0, String arg1) throws IOException
{
- return getFrameworkMBean().installBundle(arg0, arg1);
+ return getFrameworkMBean().installBundleFromURL(arg0, arg1);
}
+ @Override
public long installBundle(String arg0) throws IOException
{
return getFrameworkMBean().installBundle(arg0);
}
- public CompositeData installBundles(String[] arg0, String[] arg1) throws IOException
+ @Override
+ public CompositeData installBundlesFromURL(String[] arg0, String[] arg1) throws IOException
{
- return getFrameworkMBean().installBundles(arg0, arg1);
+ return getFrameworkMBean().installBundlesFromURL(arg0, arg1);
}
+ @Override
public CompositeData installBundles(String[] arg0) throws IOException
{
return getFrameworkMBean().installBundles(arg0);
}
+ @Override
public void restartFramework() throws IOException
{
getFrameworkMBean().restartFramework();
}
+ @Override
public void setBundleStartLevel(long arg0, int arg1) throws IOException
{
getFrameworkMBean().setBundleStartLevel(arg0, arg1);
}
+ @Override
public CompositeData setBundleStartLevels(long[] arg0, int[] arg1) throws IOException
{
return getFrameworkMBean().setBundleStartLevels(arg0, arg1);
}
+ @Override
public void setFrameworkStartLevel(int arg0) throws IOException
{
getFrameworkMBean().setFrameworkStartLevel(arg0);
}
+ @Override
public void setInitialBundleStartLevel(int arg0) throws IOException
{
getFrameworkMBean().setInitialBundleStartLevel(arg0);
}
+ @Override
public void shutdownFramework() throws IOException
{
getFrameworkMBean().shutdownFramework();
}
+ @Override
public void startBundle(long arg0) throws IOException
{
getFrameworkMBean().startBundle(arg0);
}
+ @Override
public CompositeData startBundles(long[] arg0) throws IOException
{
return getFrameworkMBean().startBundles(arg0);
}
+ @Override
public void stopBundle(long arg0) throws IOException
{
getFrameworkMBean().stopBundle(arg0);
}
+ @Override
public CompositeData stopBundles(long[] arg0) throws IOException
{
return getFrameworkMBean().stopBundles(arg0);
}
+ @Override
public void uninstallBundle(long arg0) throws IOException
{
getFrameworkMBean().uninstallBundle(arg0);
}
+ @Override
public CompositeData uninstallBundles(long[] arg0) throws IOException
{
return getFrameworkMBean().uninstallBundles(arg0);
}
- public void updateBundle(long arg0, String arg1) throws IOException
+ @Override
+ public void updateBundleFromURL(long arg0, String arg1) throws IOException
{
- getFrameworkMBean().updateBundle(arg0, arg1);
+ getFrameworkMBean().updateBundleFromURL(arg0, arg1);
}
+ @Override
public void updateBundle(long arg0) throws IOException
{
getFrameworkMBean().updateBundle(arg0);
}
- public CompositeData updateBundles(long[] arg0, String[] arg1) throws IOException
+ @Override
+ public CompositeData updateBundlesFromURL(long[] arg0, String[] arg1) throws IOException
{
- return getFrameworkMBean().updateBundles(arg0, arg1);
+ return getFrameworkMBean().updateBundlesFromURL(arg0, arg1);
}
+ @Override
public CompositeData updateBundles(long[] arg0) throws IOException
{
return getFrameworkMBean().updateBundles(arg0);
}
+ @Override
public void updateFramework() throws IOException
{
getFrameworkMBean().updateFramework();
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/PackageStateExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/PackageStateExt.java 2010-03-19 11:03:34 UTC (rev 102621)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/PackageStateExt.java 2010-03-19 12:29:39 UTC (rev 102622)
@@ -61,21 +61,25 @@
return new StandardMBean(this, PackageStateMBeanExt.class);
}
- public long getExportingBundle(String arg0, String arg1) throws IOException
+ @Override
+ public long[] getExportingBundles(String arg0, String arg1) throws IOException
{
- return getPackageStateMBean().getExportingBundle(arg0, arg1);
+ return getPackageStateMBean().getExportingBundles(arg0, arg1);
}
- public long[] getImportingBundles(String arg0, String arg1) throws IOException
+ @Override
+ public long[] getImportingBundles(String arg0, String arg1, long arg2) throws IOException
{
- return getPackageStateMBean().getImportingBundles(arg0, arg1);
+ return getPackageStateMBean().getImportingBundles(arg0, arg1, arg2);
}
- public boolean isRemovalPending(String arg0, String arg1) throws IOException
+ @Override
+ public boolean isRemovalPending(String arg0, String arg1, long arg2) throws IOException
{
- return getPackageStateMBean().isRemovalPending(arg0, arg1);
+ return getPackageStateMBean().isRemovalPending(arg0, arg1, arg2);
}
+ @Override
public TabularData listPackages() throws IOException
{
return getPackageStateMBean().listPackages();
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/ServiceStateExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/ServiceStateExt.java 2010-03-19 11:03:34 UTC (rev 102621)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/ServiceStateExt.java 2010-03-19 12:29:39 UTC (rev 102622)
@@ -130,7 +130,7 @@
items.put(USING_BUNDLES, usingArr);
// [TODO] Remove once ServiceType does not require this item any more
- items.put(PROPERTIES, getProperties(serviceId));
+ //items.put(PROPERTIES, getProperties(serviceId));
CompositeDataSupport compData;
try
@@ -144,26 +144,31 @@
return compData;
}
+ @Override
public long getBundleIdentifier(long arg0) throws IOException
{
return getServiceStateMBean().getBundleIdentifier(arg0);
}
+ @Override
public String[] getObjectClass(long arg0) throws IOException
{
return getServiceStateMBean().getObjectClass(arg0);
}
+ @Override
public TabularData getProperties(long arg0) throws IOException
{
return getServiceStateMBean().getProperties(arg0);
}
+ @Override
public long[] getUsingBundles(long arg0) throws IOException
{
return getServiceStateMBean().getUsingBundles(arg0);
}
+ @Override
public TabularData listServices() throws IOException
{
return getServiceStateMBean().listServices();
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-03-19 11:03:34 UTC (rev 102621)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-03-19 12:29:39 UTC (rev 102622)
@@ -39,11 +39,11 @@
<!-- Properties -->
<properties>
- <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx>
+ <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.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
+ <version.jboss.osgi.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.felix>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -81,9 +81,9 @@
<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>
+ <groupId>org.jboss.osgi.felix</groupId>
+ <artifactId>jboss-osgi-felix</artifactId>
+ <version>${version.jboss.osgi.felix}</version>
</dependency>
<!-- OSGi Dependencies -->
14 years, 3 months
JBoss-OSGI SVN: r102605 - projects/jboss-osgi/projects/bundles/blueprint/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 00:55:14 -0400 (Fri, 19 Mar 2010)
New Revision: 102605
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
Log:
Upgrade to aries-blueprint-0.1-incubating-SNAPSHOT
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-03-19 04:41:08 UTC (rev 102604)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-03-19 04:55:14 UTC (rev 102605)
@@ -39,9 +39,9 @@
<!-- Properties -->
<properties>
- <version.apache.aries.blueprint>1.0.0-incubating-SNAPSHOT</version.apache.aries.blueprint>
- <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx>
- <version.apache.aries.util>1.0.0-incubating-SNAPSHOT</version.apache.aries.util>
+ <version.apache.aries.blueprint>0.1-incubating-SNAPSHOT</version.apache.aries.blueprint>
+ <version.apache.aries.jmx>0.1-incubating-SNAPSHOT</version.apache.aries.jmx>
+ <version.apache.aries.util>0.1-incubating-SNAPSHOT</version.apache.aries.util>
<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.framework>1.0.0.Alpha4-SNAPSHOT</version.jboss.osgi.framework>
@@ -180,7 +180,7 @@
javax.xml.transform*,
javax.xml.validation,
- org.apache.aries.util.tracker;version="[1.0,2.0)",
+ org.apache.aries.util.tracker;version="[0.1,2.0)",
org.jboss.logging;version="[2.1,3.0)",
14 years, 3 months
JBoss-OSGI SVN: r102604 - projects/jboss-osgi/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 00:41:08 -0400 (Fri, 19 Mar 2010)
New Revision: 102604
Modified:
projects/jboss-osgi/trunk/pom.xml
Log:
Upgrade to aries-blueprint-0.1-incubating-SNAPSHOT
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-19 04:18:40 UTC (rev 102603)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-19 04:41:08 UTC (rev 102604)
@@ -44,7 +44,7 @@
<!-- Properties -->
<properties>
<version.apache.ant>1.7.0</version.apache.ant>
- <version.apache.aries.blueprint>1.0.0-incubating-SNAPSHOT</version.apache.aries.blueprint>
+ <version.apache.aries.blueprint>0.1-incubating-SNAPSHOT</version.apache.aries.blueprint>
<version.apache.aries.jmx>0.1-incubating-SNAPSHOT</version.apache.aries.jmx>
<version.apache.aries.util>0.1-incubating-SNAPSHOT</version.apache.aries.util>
<version.apache.felix.configadmin>1.2.4</version.apache.felix.configadmin>
14 years, 3 months
JBoss-OSGI SVN: r102603 - in projects/jboss-osgi/trunk: distribution and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 00:18:40 -0400 (Fri, 19 Mar 2010)
New Revision: 102603
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Upgrade aries-jmx 0.1-incubating-SNAPSHOT
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-19 04:00:53 UTC (rev 102602)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-19 04:18:40 UTC (rev 102603)
@@ -406,10 +406,6 @@
<artifactId>org.apache.aries.jmx</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
</dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-19 04:00:53 UTC (rev 102602)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-19 04:18:40 UTC (rev 102603)
@@ -45,9 +45,8 @@
<properties>
<version.apache.ant>1.7.0</version.apache.ant>
<version.apache.aries.blueprint>1.0.0-incubating-SNAPSHOT</version.apache.aries.blueprint>
- <version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx>
- <version.apache.aries.jndi>1.0.0-incubating-SNAPSHOT</version.apache.aries.jndi>
- <version.apache.aries.util>1.0.0-incubating-SNAPSHOT</version.apache.aries.util>
+ <version.apache.aries.jmx>0.1-incubating-SNAPSHOT</version.apache.aries.jmx>
+ <version.apache.aries.util>0.1-incubating-SNAPSHOT</version.apache.aries.util>
<version.apache.felix.configadmin>1.2.4</version.apache.felix.configadmin>
<version.apache.felix.core>1.4.0</version.apache.felix.core>
<version.apache.felix.eventadmin>1.0.0</version.apache.felix.eventadmin>
@@ -109,11 +108,6 @@
<version>${version.apache.aries.jmx}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- <version>${version.apache.aries.jndi}</version>
- </dependency>
- <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>${version.apache.aries.util}</version>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2010-03-19 04:00:53 UTC (rev 102602)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2010-03-19 04:18:40 UTC (rev 102603)
@@ -30,7 +30,6 @@
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.aries.blueprint:jar</include>
<include>*:org.apache.aries.jmx:jar</include>
- <include>*:org.apache.aries.jndi:jar</include>
<include>*:org.apache.aries.util:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.eventadmin:jar</include>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2010-03-19 04:00:53 UTC (rev 102602)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2010-03-19 04:18:40 UTC (rev 102603)
@@ -28,7 +28,6 @@
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.aries.blueprint:jar</include>
<include>*:org.apache.aries.jmx:jar</include>
- <include>*:org.apache.aries.jndi:jar</include>
<include>*:org.apache.aries.util:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
<include>*:org.apache.felix.eventadmin:jar</include>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java 2010-03-19 04:00:53 UTC (rev 102602)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi298/OSGi298TestCase.java 2010-03-19 04:18:40 UTC (rev 102603)
@@ -30,12 +30,15 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.jboss.logging.Logger;
import org.jboss.osgi.jmx.JMXCapability;
-import org.jboss.osgi.spi.capability.CompendiumCapability;
+import org.jboss.osgi.spi.capability.LogServiceCapability;
+import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiRuntimeTest;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.osgi.jmx.framework.BundleStateMBean;
import org.osgi.jmx.framework.FrameworkMBean;
@@ -51,19 +54,24 @@
*/
public class OSGi298TestCase extends OSGiRuntimeTest
{
+ // Provide logging
+ private static final Logger log = Logger.getLogger(OSGi298TestCase.class);
+
private OSGiRuntime runtime;
@Before
public void setUp() throws Exception
{
+ super.setUp();
runtime = getEmbeddedRuntime();
- runtime.addCapability(new CompendiumCapability());
+ runtime.addCapability(new LogServiceCapability());
}
@After
- public void tearDown()
+ public void tearDown() throws Exception
{
runtime.shutdown();
+ super.tearDown();
}
@Test
@@ -78,14 +86,34 @@
runtime.removeCapability(capability);
- assertFalse("FrameworkMBean registered", isRegistered(FrameworkMBean.OBJECTNAME));
- assertFalse("BundleStateMBean registered", isRegistered(BundleStateMBean.OBJECTNAME));
- assertFalse("ServiceStateMBean registered", isRegistered(ServiceStateMBean.OBJECTNAME));
+ assertFalse("FrameworkMBean not registered", isRegistered(FrameworkMBean.OBJECTNAME));
+ assertFalse("BundleStateMBean not registered", isRegistered(BundleStateMBean.OBJECTNAME));
+ assertFalse("ServiceStateMBean not registered", isRegistered(ServiceStateMBean.OBJECTNAME));
}
+/*
+ @Test
+ public void testJMXBundles() throws Exception
+ {
+ OSGiBundle jbossJMX = runtime.installBundle("bundles/jboss-osgi-jmx.jar");
+ OSGiBundle ariesJMX = runtime.installBundle("bundles/org.apache.aries.jmx.jar");
+
+ jbossJMX.start();
+ ariesJMX.start();
+
+ Thread.sleep(2000);
+
+ ariesJMX.stop();
+
+ Thread.sleep(2000);
+ }
+*/
+
private boolean isRegistered(String oname) throws MalformedObjectNameException
{
MBeanServer server = (MBeanServer)runtime.getMBeanServer();
- return server.isRegistered(ObjectName.getInstance(oname));
+ boolean registered = server.isRegistered(ObjectName.getInstance(oname));
+ log.debug(oname + " registered: " + registered);
+ return registered;
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-19 04:00:53 UTC (rev 102602)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-19 04:18:40 UTC (rev 102603)
@@ -70,11 +70,6 @@
<artifactId>org.apache.aries.jmx</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Bundle Dependencies -->
<dependency>
14 years, 3 months
JBoss-OSGI SVN: r102602 - projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-19 00:00:53 -0400 (Fri, 19 Mar 2010)
New Revision: 102602
Modified:
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java
Log:
unregister vfsFile
Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-19 02:29:00 UTC (rev 102601)
+++ projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-19 04:00:53 UTC (rev 102602)
@@ -55,7 +55,9 @@
{
try
{
- return adapt(org.jboss.vfs.VFS.getChild(url));
+ org.jboss.vfs.VirtualFile vfsFile = org.jboss.vfs.VFS.getChild(url);
+ VirtualFileAdaptor30 absFile = (VirtualFileAdaptor30)adapt(vfsFile);
+ return absFile;
}
catch (URISyntaxException ex)
{
@@ -77,13 +79,13 @@
return absFile;
// Accept the file for mounting
- Closeable closeable = null;
- if (acceptForMount((org.jboss.vfs.VirtualFile)other) == true)
+ Closeable mount = null;
+ if (acceptForMount(vfsFile) == true)
{
try
{
TempFileProvider tmp = TempFileProvider.create("osgimount-", null);
- closeable = VFS.mountZip(vfsFile, vfsFile, tmp);
+ mount = VFS.mountZip(vfsFile, vfsFile, tmp);
}
catch (IOException ex)
{
@@ -92,7 +94,7 @@
}
// Register the VirtualFile abstraction
- absFile = new VirtualFileAdaptor30(vfsFile, closeable);
+ absFile = new VirtualFileAdaptor30(vfsFile, mount);
registry.put(vfsFile, absFile);
return absFile;
}
@@ -124,7 +126,7 @@
return adaptor.getDelegate();
}
- static void safeClose(VirtualFileAdaptor30 absFile)
+ static void unregister(VirtualFileAdaptor30 absFile)
{
registry.remove(absFile.getDelegate());
}
Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java 2010-03-19 02:29:00 UTC (rev 102601)
+++ projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java 2010-03-19 04:00:53 UTC (rev 102602)
@@ -49,14 +49,14 @@
class VirtualFileAdaptor30 implements VirtualFile
{
private org.jboss.vfs.VirtualFile delegate;
- private Closeable closeable;
+ private Closeable mount;
private TempDir streamDir;
private File streamFile;
- VirtualFileAdaptor30(org.jboss.vfs.VirtualFile root, Closeable closeable)
+ VirtualFileAdaptor30(org.jboss.vfs.VirtualFile root, Closeable mount)
{
this(root);
- this.closeable = closeable;
+ this.mount = mount;
}
VirtualFileAdaptor30(org.jboss.vfs.VirtualFile delegate)
@@ -190,7 +190,7 @@
@Override
public InputStream openStream() throws IOException
{
- if (closeable != null)
+ if (mount != null)
return getStreamURL().openStream();
return delegate.openStream();
@@ -199,8 +199,8 @@
@Override
public void close()
{
- VFSUtils.safeClose(closeable);
- VFSAdaptor30.safeClose(this);
+ VFSUtils.safeClose(mount);
+ VFSAdaptor30.unregister(this);
if (streamFile != null)
{
streamFile.delete();
14 years, 3 months
JBoss-OSGI SVN: r102593 - in projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx: internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-18 17:42:45 -0400 (Thu, 18 Mar 2010)
New Revision: 102593
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java
Log:
Add more logging
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-03-18 21:18:15 UTC (rev 102592)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-03-18 21:42:45 UTC (rev 102593)
@@ -58,16 +58,16 @@
{
// Provide logging
private static final Logger log = Logger.getLogger(JMXCapability.class);
-
+
public JMXCapability()
{
super(MBeanServer.class.getName());
-
+
addSystemProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost"));
addSystemProperty("org.jboss.osgi.jmx.rmi.port", "1198");
-
+
addDependency(new CompendiumCapability());
-
+
addBundle("bundles/jboss-osgi-jmx.jar");
addBundle("bundles/org.apache.aries.jmx.jar");
}
@@ -75,6 +75,10 @@
@Override
public void start(OSGiRuntime runtime) throws BundleException
{
+ // Explicitly create the MBeanServer, so we don't get into
+ // a race condition with jboss-osgi-jmx also creating one
+ runtime.getMBeanServer();
+
super.start(runtime);
assertMBeanRegistration(runtime, true);
}
@@ -88,32 +92,44 @@
private void assertMBeanRegistration(OSGiRuntime runtime, boolean state)
{
+ log.debug("assertMBeanRegistration: " + state);
+
MBeanServer server = (MBeanServer)runtime.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))
+ while (0 < (timeout -= 200))
{
- if (server.isRegistered(fwkName) != state || server.isRegistered(bndName) != state || server.isRegistered(srvName) != state)
+ 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
{
- try
- {
- Thread.sleep(200);
- }
- catch (InterruptedException e)
- {
- // ignore
- }
+ Thread.sleep(200);
}
+ catch (InterruptedException e)
+ {
+ // ignore
+ }
}
-
- if (server.isRegistered(fwkName) != state)
+
+ if (checkMBean(server, fwkName, state) == false)
log.warn("FrameworkMBean " + (state ? "not" : "still") + " registered");
- if (server.isRegistered(bndName) != state)
+ if (checkMBean(server, bndName, state) == false)
log.warn("BundleStateMBean " + (state ? "not" : "still") + " registered");
- if (server.isRegistered(srvName) != state)
+ if (checkMBean(server, srvName, state) == false)
log.warn("ServiceStateMBean " + (state ? "not" : "still") + " registered");
}
+
+ protected 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
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2010-03-18 21:18:15 UTC (rev 102592)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2010-03-18 21:42:45 UTC (rev 102593)
@@ -23,6 +23,7 @@
//$Id$
+
import java.util.ArrayList;
import javax.management.MBeanServer;
@@ -52,37 +53,46 @@
public MBeanServer registerMBeanServer()
{
- MBeanServer mbeanServer = null;
-
// Check if there is an MBeanServer service already
ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
if (sref != null)
{
- mbeanServer = (MBeanServer)context.getService(sref);
+ MBeanServer mbeanServer = (MBeanServer)context.getService(sref);
log.debug("Found MBeanServer fom service: " + mbeanServer.getDefaultDomain());
return mbeanServer;
}
+ // Get or create th MBeanServer
+ MBeanServer mbeanServer = getMBeanServer();
+
+ // Register the MBeanServer
+ context.registerService(MBeanServer.class.getName(), mbeanServer, null);
+ log.debug("MBeanServer registered");
+
+ return mbeanServer;
+ }
+
+ private MBeanServer getMBeanServer()
+ {
+ MBeanServer mbeanServer = null;
+
ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null);
if (serverArr.size() > 1)
log.warn("Multiple MBeanServer instances: " + serverArr);
-
+
if (serverArr.size() > 0)
{
mbeanServer = serverArr.get(0);
- log.debug("Found MBeanServer: " + mbeanServer.getDefaultDomain());
+ log.debug("Found MBeanServer: " + mbeanServer);
}
-
+
if (mbeanServer == null)
{
log.debug("No MBeanServer, create one ...");
mbeanServer = MBeanServerFactory.createMBeanServer();
+ log.debug("Created MBeanServer: " + mbeanServer);
}
-
- // Register the MBeanServer
- context.registerService(MBeanServer.class.getName(), mbeanServer, null);
- log.debug("MBeanServer registered");
-
+
return mbeanServer;
}
}
\ No newline at end of file
14 years, 3 months
JBoss-OSGI SVN: r102591 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-18 17:12:35 -0400 (Thu, 18 Mar 2010)
New Revision: 102591
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
Log:
Add more logging
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2010-03-18 21:05:13 UTC (rev 102590)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2010-03-18 21:12:35 UTC (rev 102591)
@@ -60,13 +60,12 @@
// Provide logging
private static final Logger log = Logger.getLogger(EmbeddedRuntime.class);
- private MBeanServer server;
-
public EmbeddedRuntime(OSGiRuntimeHelper helper)
{
super(helper);
}
+ @Override
OSGiBundle installBundleInternal(BundleInfo info) throws BundleException
{
try
@@ -82,6 +81,7 @@
}
}
+ @Override
public OSGiBundle[] getBundles()
{
List<OSGiBundle> absBundles = new ArrayList<OSGiBundle>();
@@ -94,18 +94,21 @@
return bundleArr;
}
+ @Override
public OSGiBundle getBundle(long bundleId)
{
Bundle bundle = getSystemContext().getBundle(bundleId);
return bundle != null ? new EmbeddedBundle(this, bundle) : null;
}
+ @Override
public OSGiServiceReference getServiceReference(String clazz)
{
ServiceReference sref = getSystemContext().getServiceReference(clazz);
return (sref != null ? new EmbeddedServiceReference(sref) : null);
}
+ @Override
public OSGiServiceReference[] getServiceReferences(String clazz, String filter)
{
OSGiServiceReference[] retRefs = null;
@@ -140,7 +143,6 @@
if (value == null)
System.setProperty(entry.getKey(), entry.getValue());
}
-
super.addCapability(capability);
}
@@ -169,23 +171,32 @@
}
}
+ @Override
public MBeanServerConnection getMBeanServer()
{
- if (server == null)
+ MBeanServer mbeanServer = null;
+
+ ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null);
+ if (serverArr.size() > 1)
+ log.warn("Multiple MBeanServer instances: " + serverArr);
+
+ if (serverArr.size() > 0)
{
- 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();
+ mbeanServer = serverArr.get(0);
+ log.debug("Found MBeanServer: " + mbeanServer);
}
- return server;
+
+ if (mbeanServer == null)
+ {
+ log.debug("No MBeanServer, create one ...");
+ mbeanServer = MBeanServerFactory.createMBeanServer();
+ log.debug("Created MBeanServer: " + mbeanServer);
+ }
+
+ return mbeanServer;
}
+ @Override
public boolean isRemoteRuntime()
{
return false;
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-03-18 21:05:13 UTC (rev 102590)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-03-18 21:12:35 UTC (rev 102591)
@@ -70,6 +70,7 @@
super(helper);
}
+ @Override
OSGiBundle installBundleInternal(BundleInfo info) throws BundleException
{
try
@@ -103,6 +104,7 @@
deployer.undeploy(archiveURL);
}
+ @Override
public OSGiBundle[] getBundles()
{
Set<OSGiBundle> bundles = new HashSet<OSGiBundle>();
@@ -137,6 +139,7 @@
}
}
+ @Override
public OSGiBundle getBundle(long bundleId)
{
for (OSGiBundle bundle : getBundles())
@@ -147,6 +150,7 @@
return null;
}
+ @Override
public OSGiServiceReference getServiceReference(String clazz)
{
CompositeData serviceData;
@@ -168,6 +172,7 @@
return new RemoteServiceReference(serviceData, propertiesData);
}
+ @Override
@SuppressWarnings("unchecked")
public OSGiServiceReference[] getServiceReferences(String clazz, String filter)
{
@@ -201,6 +206,7 @@
return MBeanProxy.get(getMBeanServer(), objectName, ServiceStateMBeanExt.class);
}
+ @Override
public MBeanServerConnection getMBeanServer()
{
if (mbeanServer == null)
@@ -218,6 +224,7 @@
return mbeanServer;
}
+ @Override
public boolean isRemoteRuntime()
{
return true;
14 years, 3 months
JBoss-OSGI SVN: r102538 - in projects/jboss-osgi/projects: spi/trunk/src/main/java/org/jboss/osgi/testing/internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-17 23:57:37 -0400 (Wed, 17 Mar 2010)
New Revision: 102538
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
Log:
Prevent NPE on uninstall.
Give JMX more time to register MBeans.
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-03-18 00:54:03 UTC (rev 102537)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/JMXCapability.java 2010-03-18 03:57:37 UTC (rev 102538)
@@ -93,7 +93,7 @@
ObjectName bndName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
ObjectName srvName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME);
- int timeout = 2000;
+ int timeout = 5000;
while ( 0 < (timeout -= 200))
{
if (server.isRegistered(fwkName) != state || server.isRegistered(bndName) != state || server.isRegistered(srvName) != state)
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-03-18 00:54:03 UTC (rev 102537)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-03-18 03:57:37 UTC (rev 102538)
@@ -339,7 +339,8 @@
String location = bundle.getLocation();
BundleTuple tuple = bundles.get(location);
- tuple.uninstall();
+ if (tuple != null)
+ tuple.uninstall();
}
private VirtualFile toVirtualFile(Archive<?> archive) throws IOException, MalformedURLException
14 years, 3 months