Author: thomas.diesler(a)jboss.com
Date: 2010-02-26 07:57:50 -0500 (Fri, 26 Feb 2010)
New Revision: 101537
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/FrameworkMBeanExt.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java
projects/jboss-osgi/projects/parent/trunk/pom.xml
Log:
[ARIES-177] Update to patched Aries SNAPSHOT
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/FrameworkMBeanExt.java
===================================================================
---
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/FrameworkMBeanExt.java 2010-02-26
12:36:17 UTC (rev 101536)
+++
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/FrameworkMBeanExt.java 2010-02-26
12:57:50 UTC (rev 101537)
@@ -21,8 +21,6 @@
*/
package org.jboss.osgi.jmx;
-import java.io.IOException;
-
import org.osgi.jmx.framework.FrameworkMBean;
//$Id$
@@ -37,20 +35,4 @@
{
/** The default object name: jboss.osgi:service=jmx,type=Framework */
String OBJECTNAME = "jboss.osgi:service=jmx,type=Framework";
-
- /**
- * Force the update, replacement or removal of the packages identified by the list of
bundles.
- *
- * JMX FrameworkMBean does not allow to resolve/refresh all bundles
- *
https://issues.apache.org/jira/browse/ARIES-177
- */
- void refreshBundles(long[] bundleIdentifiers) throws IOException;
-
- /**
- * Force the update, replacement or removal of the packages identified by the
specified bundle.
- *
- * JMX FrameworkMBean does not allow to resolve/refresh all bundles
- *
https://issues.apache.org/jira/browse/ARIES-177
- */
- void refreshBundle(long bundleIdentifier) throws IOException;
}
\ No newline at end of file
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-02-26
12:36:17 UTC (rev 101536)
+++
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java 2010-02-26
12:57:50 UTC (rev 101537)
@@ -34,9 +34,7 @@
import org.jboss.osgi.jmx.FrameworkMBeanExt;
import org.jboss.osgi.jmx.ObjectNameFactory;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
import org.osgi.jmx.framework.FrameworkMBean;
-import org.osgi.service.packageadmin.PackageAdmin;
/**
* An extension to {@link FrameworkMBean}.
@@ -67,33 +65,17 @@
@Override
public void refreshBundles(long[] bundleIdentifiers) throws IOException
{
- //
https://issues.apache.org/jira/browse/ARIES-177
- if (bundleIdentifiers == null)
- {
- ServiceReference sref =
context.getServiceReference(PackageAdmin.class.getName());
- PackageAdmin service = (PackageAdmin)context.getService(sref);
- service.refreshPackages(null);
- return;
- }
-
- getFrameworkMBean().refreshPackages(bundleIdentifiers);
+ getFrameworkMBean().refreshBundles(bundleIdentifiers);
}
@Override
public void refreshBundle(long bundleIdentifier) throws IOException
{
- getFrameworkMBean().refreshPackages(bundleIdentifier);
+ getFrameworkMBean().refreshBundle(bundleIdentifier);
}
public boolean resolveBundles(long[] bundleIdentifiers) throws IOException
{
- //
https://issues.apache.org/jira/browse/ARIES-177
- if (bundleIdentifiers == null)
- {
- ServiceReference sref =
context.getServiceReference(PackageAdmin.class.getName());
- PackageAdmin service = (PackageAdmin)context.getService(sref);
- return service.resolveBundles(null);
- }
return getFrameworkMBean().resolveBundles(bundleIdentifiers);
}
@@ -132,19 +114,6 @@
return getFrameworkMBean().installBundles(arg0);
}
- @Deprecated
- public void refreshPackages(long bundleIdentifier) throws IOException
- {
- refreshBundle(bundleIdentifier);
- }
-
- @Deprecated
- public CompositeData refreshPackages(long[] bundleIdentifiers) throws IOException
- {
- refreshBundles(bundleIdentifiers);
- return null;
- }
-
public void restartFramework() throws IOException
{
getFrameworkMBean().restartFramework();
Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/pom.xml 2010-02-26 12:36:17 UTC (rev
101536)
+++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2010-02-26 12:57:50 UTC (rev
101537)
@@ -198,17 +198,6 @@
<name>JBoss Snapshot Repository</name>
<
url>dav:https://snapshots.jboss.org/maven2</url>
</snapshotRepository>
- <!--
- To do a site deploy run:
- mvn -Dversion.jboss.osgi=1.0.x site-deploy
- -->
- <site>
- <id>jbmuc.dyndns.org</id>
-
<
url>scp://jbmuc.dyndns.org/var/www/html/jboss-osgi-${version.jboss.osg...
- </site>
- <!--
- To copy the userguide run: scp -r docbook/target/docbook/publish/en-US/*
jbmuc.dyndns.org:/var/www/html/jboss-osgi-${version.jboss.osgi}/userguide/
- -->
</distributionManagement>
<!-- Reporting -->