[jboss-cvs] JBossAS SVN: r102622 - in projects/jboss-osgi/projects/bundles/jmx/trunk: jmx-bundle and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 19 08:29:41 EDT 2010
Author: thomas.diesler at 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 -->
More information about the jboss-cvs-commits
mailing list