JBoss-OSGI SVN: r101562 - projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-26 10:42:11 -0500 (Fri, 26 Feb 2010)
New Revision: 101562
Modified:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/BundleStateMBeanExt.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ServiceStateMBeanExt.java
Log:
Add bugzilla references
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/BundleStateMBeanExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/BundleStateMBeanExt.java 2010-02-26 14:58:08 UTC (rev 101561)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/BundleStateMBeanExt.java 2010-02-26 15:42:11 UTC (rev 101562)
@@ -45,6 +45,8 @@
/**
* Answer the bundle state for a single bundle.
* Composite Data that is type by {@link BundleStateMBean#BUNDLE_TYPE}.
+ *
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1598
*
* @param bundleId the bundle identifier
* @return The composite bundle information
@@ -57,6 +59,8 @@
* Answer the headers for the bundle uniquely identified by the bundle id.
* The Tabular Data is typed by the {@link BundleStateMBean#HEADERS_TYPE}.
*
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1599
+ *
* @param bundleId the unique identifier of the bundle
* @param locale The locale name into which the header values are to be localized.
* @throws IOException if the operation fails
@@ -69,6 +73,8 @@
*
* @see JmxConstants#PROPERTIES_TYPE for the details of the CompositeType
*
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1600
+ *
* @param bundleId the unique identifier of the bundle
* @param key The name of the requested property.
* @return the property data, or null if the property is undefined.
@@ -78,8 +84,10 @@
CompositeData getProperty(long bundleId, String key) throws IOException;
/**
- * Loads the specified class using the class loader of the bundle with the given identifier.
+ * Loads the specified class using the class loader of the bundle with the given identifier.
*
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1601
+ *
* @param bundleId the unique identifier of the bundle
* @param name The name of the class to load
* @return The bundle id of the bundle that loaded the class.
@@ -90,6 +98,8 @@
/**
* Returns a string encoded URL to the entry at the specified path in the given bundle.
*
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1601
+ *
* @param bundleId the unique identifier of the bundle
* @param path The path name of the entry
* @return A URL to the entry, or null if no entry could be found
@@ -99,6 +109,8 @@
/**
* Find the specified resource from the given bundle's class loader.
*
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1601
+ *
* @param bundleId the unique identifier of the bundle
* @param name The name of the resource.
* @return A string encoded URL to the named resource, or null if the resource could not be found
@@ -108,6 +120,8 @@
/**
* Get the string encoded file path in the persistent storage area provided for the given bundle.
*
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1601
+ *
* @param bundleId the unique identifier of the bundle
* @param filename A relative name to the file to be accessed
*/
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ServiceStateMBeanExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ServiceStateMBeanExt.java 2010-02-26 14:58:08 UTC (rev 101561)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/ServiceStateMBeanExt.java 2010-02-26 15:42:11 UTC (rev 101562)
@@ -45,11 +45,16 @@
/**
* Returns a ServiceReference object for a service that implements and was registered
* under the specified class.
+ *
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1602
*/
CompositeData getService(String clazz) throws IOException;
/**
* Returns an array of ManagedServiceReference objects.
+ *
+ * https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1603
+ *
* The returned array of ManagedServiceReference objects contains services
* that were registered under the specified class, match the specified filter criteria,
* and the packages for the class names under which the services were registered.
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101559 - projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-26 09:52:58 -0500 (Fri, 26 Feb 2010)
New Revision: 101559
Modified:
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
Log:
cache the jmx proxies
Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-26 14:44:50 UTC (rev 101558)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-26 14:52:58 UTC (rev 101559)
@@ -75,6 +75,11 @@
private OSGiTestHelper helper;
private Map<String, OSGiBundle> bundles = new LinkedHashMap<String, OSGiBundle>();
private List<Capability> capabilities = new ArrayList<Capability>();
+
+ private FrameworkMBean frameworkState;
+ private BundleStateMBean bundleState;
+ private ServiceStateMBean serviceState;
+ private PackageStateMBean packageState;
public OSGiRuntimeImpl(OSGiTestHelper helper)
{
@@ -182,46 +187,78 @@
public FrameworkMBean getFrameworkMBean() throws IOException
{
- MBeanServerConnection server = getMBeanServer();
- ObjectName objectName = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME);
- if (server.isRegistered(objectName))
- return MBeanProxy.get(server, objectName, FrameworkMBeanExt.class);
-
- objectName = ObjectNameFactory.create(FrameworkMBean.OBJECTNAME);
- return MBeanProxy.get(server, objectName, FrameworkMBean.class);
+ if (frameworkState == null)
+ {
+ ObjectName objectName = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME);
+ MBeanServerConnection server = getMBeanServer();
+ if (server.isRegistered(objectName))
+ {
+ frameworkState = MBeanProxy.get(server, objectName, FrameworkMBeanExt.class);
+ }
+ else
+ {
+ objectName = ObjectNameFactory.create(FrameworkMBean.OBJECTNAME);
+ frameworkState = MBeanProxy.get(server, objectName, FrameworkMBean.class);
+ }
+ }
+ return frameworkState;
}
public BundleStateMBean getBundleStateMBean() throws IOException
{
- MBeanServerConnection server = getMBeanServer();
- ObjectName objectName = ObjectNameFactory.create(BundleStateMBeanExt.OBJECTNAME);
- if (server.isRegistered(objectName))
- return MBeanProxy.get(server, objectName, BundleStateMBeanExt.class);
-
- objectName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
- return MBeanProxy.get(server, objectName, BundleStateMBean.class);
+ if (bundleState == null)
+ {
+ MBeanServerConnection server = getMBeanServer();
+ ObjectName objectName = ObjectNameFactory.create(BundleStateMBeanExt.OBJECTNAME);
+ if (server.isRegistered(objectName))
+ {
+ bundleState = MBeanProxy.get(server, objectName, BundleStateMBeanExt.class);
+ }
+ else
+ {
+ objectName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
+ bundleState = MBeanProxy.get(server, objectName, BundleStateMBean.class);
+ }
+ }
+ return bundleState;
}
public PackageStateMBean getPackageStateMBean() throws IOException
{
- MBeanServerConnection server = getMBeanServer();
- ObjectName objectName = ObjectNameFactory.create(PackageStateMBeanExt.OBJECTNAME);
- if (server.isRegistered(objectName))
- return MBeanProxy.get(server, objectName, PackageStateMBeanExt.class);
-
- objectName = ObjectNameFactory.create(PackageStateMBean.OBJECTNAME);
- return MBeanProxy.get(server, objectName, PackageStateMBean.class);
+ if (packageState == null)
+ {
+ MBeanServerConnection server = getMBeanServer();
+ ObjectName objectName = ObjectNameFactory.create(PackageStateMBeanExt.OBJECTNAME);
+ if (server.isRegistered(objectName))
+ {
+ packageState = MBeanProxy.get(server, objectName, PackageStateMBeanExt.class);
+ }
+ else
+ {
+ objectName = ObjectNameFactory.create(PackageStateMBean.OBJECTNAME);
+ packageState = MBeanProxy.get(server, objectName, PackageStateMBean.class);
+ }
+ }
+ return packageState;
}
public ServiceStateMBean getServiceStateMBean() throws IOException
{
- MBeanServerConnection server = getMBeanServer();
- ObjectName objectName = ObjectNameFactory.create(ServiceStateMBeanExt.OBJECTNAME);
- if (server.isRegistered(objectName))
- return MBeanProxy.get(getMBeanServer(), objectName, ServiceStateMBeanExt.class);
-
- objectName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME);
- return MBeanProxy.get(server, objectName, ServiceStateMBean.class);
+ if (serviceState == null)
+ {
+ MBeanServerConnection server = getMBeanServer();
+ ObjectName objectName = ObjectNameFactory.create(ServiceStateMBeanExt.OBJECTNAME);
+ if (server.isRegistered(objectName))
+ {
+ serviceState = MBeanProxy.get(server, objectName, ServiceStateMBeanExt.class);
+ }
+ else
+ {
+ objectName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME);
+ serviceState = MBeanProxy.get(server, objectName, ServiceStateMBean.class);
+ }
+ }
+ return serviceState;
}
public InitialContext getInitialContext() throws NamingException
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101538 - in projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi: jbosgi108 and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-26 08:16:39 -0500 (Fri, 26 Feb 2010)
New Revision: 101538
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java
Log:
[ARIES-177] Update to patched Aries SNAPSHOT
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-02-26 12:57:50 UTC (rev 101537)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-02-26 13:16:39 UTC (rev 101538)
@@ -30,8 +30,10 @@
import java.net.URL;
+import org.jboss.osgi.jmx.FrameworkMBeanExt;
+import org.jboss.osgi.jmx.JMXCapability;
+import org.jboss.osgi.spi.capability.LogServiceCapability;
import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiPackageAdmin;
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiTest;
import org.jboss.test.osgi.fragments.fragA.FragBeanA;
@@ -56,6 +58,8 @@
public void setUp() throws Exception
{
runtime = getDefaultRuntime();
+ runtime.addCapability(new LogServiceCapability());
+ runtime.addCapability(new JMXCapability());
}
@After
@@ -260,8 +264,8 @@
}
// Refreshing HostA causes the FragA to get attached
- OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin();
- packageAdmin.refreshPackages(new OSGiBundle[] { hostA });
+ FrameworkMBeanExt frameworkMBean = (FrameworkMBeanExt)runtime.getFrameworkMBean();
+ frameworkMBean.refreshBundle(hostA.getBundleId());
// Wait for the fragment to get attached
int timeout = 2000;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-02-26 12:57:50 UTC (rev 101537)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-02-26 13:16:39 UTC (rev 101538)
@@ -25,13 +25,14 @@
import static org.junit.Assert.assertEquals;
+import java.io.IOException;
import java.util.List;
+import org.jboss.osgi.jmx.FrameworkMBeanExt;
import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.jmx.MBeanProxy;
import org.jboss.osgi.spi.capability.LogServiceCapability;
import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiPackageAdmin;
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiTestHelper;
import org.jboss.test.osgi.jbosgi108.bundleA.SomeBeanMBean;
@@ -72,10 +73,10 @@
}
@Before
- public void setUp()
+ public void setUp() throws IOException
{
- OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin();
- packageAdmin.refreshPackages(null);
+ FrameworkMBeanExt frameworkMBean = (FrameworkMBeanExt)runtime.getFrameworkMBean();
+ frameworkMBean.refreshBundles(null);
}
@Test
@@ -153,8 +154,8 @@
// bundleA.SomeBean
// Refresh all packages
- OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin();
- packageAdmin.refreshPackages(null);
+ FrameworkMBeanExt frameworkMBean = (FrameworkMBeanExt)runtime.getFrameworkMBean();
+ frameworkMBean.refreshBundles(null);
// Reinstall bundleA
bundleA = runtime.installBundle("jbosgi108-bundleA.jar");
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java 2010-02-26 12:57:50 UTC (rev 101537)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java 2010-02-26 13:16:39 UTC (rev 101538)
@@ -25,8 +25,10 @@
import static org.junit.Assert.fail;
+import org.jboss.osgi.jmx.FrameworkMBeanExt;
+import org.jboss.osgi.jmx.JMXCapability;
+import org.jboss.osgi.spi.capability.LogServiceCapability;
import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiPackageAdmin;
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiTest;
import org.junit.After;
@@ -52,12 +54,14 @@
private OSGiRuntime runtime;
@Before
- public void setUp()
+ public void setUp() throws Exception
{
runtime = getDefaultRuntime();
+ runtime.addCapability(new LogServiceCapability());
+ runtime.addCapability(new JMXCapability());
- OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin();
- packageAdmin.refreshPackages(null);
+ FrameworkMBeanExt frameworkMBean = (FrameworkMBeanExt)runtime.getFrameworkMBean();
+ frameworkMBean.refreshBundles(null);
}
@After
@@ -145,8 +149,8 @@
bundleB.uninstall();
// Forces the update (replacement) or removal of packages exported by the specified bundles.
- OSGiPackageAdmin packAdmin = runtime.getPackageAdmin();
- packAdmin.refreshPackages(null);
+ FrameworkMBeanExt frameworkMBean = (FrameworkMBeanExt)runtime.getFrameworkMBean();
+ frameworkMBean.refreshBundles(null);
// Install B without X
bundleB = runtime.installBundle("jbosgi39-bundleB.jar");
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101537 - in projects/jboss-osgi/projects: bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
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.osgi}</url>
- </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 -->
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101529 - in projects/jboss-osgi/projects: bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-26 06:55:48 -0500 (Fri, 26 Feb 2010)
New Revision: 101529
Added:
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/PackageStateMBeanExt.java
projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/PackageStateExt.java
Removed:
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiPackageAdmin.java
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedPackageAdmin.java
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java
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/AbstractState.java
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/JMXServiceActivator.java
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntime.java
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
Log:
Migrate OSGiPackageAdmin to FrameworkMBean
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 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/FrameworkMBeanExt.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -21,6 +21,8 @@
*/
package org.jboss.osgi.jmx;
+import java.io.IOException;
+
import org.osgi.jmx.framework.FrameworkMBean;
//$Id$
@@ -37,18 +39,18 @@
String OBJECTNAME = "jboss.osgi:service=jmx,type=Framework";
/**
- * Refresh packages through the PackageAdmin service
+ * 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://www.osgi.org/members/bugzilla/show_bug.cgi?id=1586
+ * https://issues.apache.org/jira/browse/ARIES-177
*/
- void refreshAllPackages();
+ void refreshBundles(long[] bundleIdentifiers) throws IOException;
/**
- * Resolve bundles through the PackageAdmin service
+ * 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://www.osgi.org/members/bugzilla/show_bug.cgi?id=1586
+ * https://issues.apache.org/jira/browse/ARIES-177
*/
- boolean resolveAllBundles();
+ void refreshBundle(long bundleIdentifier) throws IOException;
}
\ No newline at end of file
Added: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/PackageStateMBeanExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/PackageStateMBeanExt.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/PackageStateMBeanExt.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -0,0 +1,38 @@
+/*
+ * 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.osgi.jmx;
+
+//$Id$
+
+import org.osgi.jmx.framework.PackageStateMBean;
+
+/**
+ * An extension to {@link PackageStateMBean}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Feb-2010
+ */
+public interface PackageStateMBeanExt extends PackageStateMBean
+{
+ /** The default object name: jboss.osgi:service=jmx,type=PackageState */
+ String OBJECTNAME = "jboss.osgi:service=jmx,type=PackageState";
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-api/src/main/java/org/jboss/osgi/jmx/PackageStateMBeanExt.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/AbstractState.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/AbstractState.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/AbstractState.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -35,6 +35,7 @@
import org.osgi.framework.BundleContext;
import org.osgi.jmx.framework.BundleStateMBean;
import org.osgi.jmx.framework.FrameworkMBean;
+import org.osgi.jmx.framework.PackageStateMBean;
import org.osgi.jmx.framework.ServiceStateMBean;
/**
@@ -117,4 +118,10 @@
ObjectName objectName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME);
return MBeanProxy.get(mbeanServer, objectName, ServiceStateMBean.class);
}
+
+ PackageStateMBean getPackageStateMBean()
+ {
+ ObjectName objectName = ObjectNameFactory.create(PackageStateMBean.OBJECTNAME);
+ return MBeanProxy.get(mbeanServer, objectName, PackageStateMBean.class);
+ }
}
\ 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 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/FrameworkStateExt.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -65,21 +65,43 @@
}
@Override
- public void refreshAllPackages()
+ public void refreshBundles(long[] bundleIdentifiers) throws IOException
{
- ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
- PackageAdmin service = (PackageAdmin)context.getService(sref);
- service.refreshPackages(null);
+ // 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);
}
@Override
- public boolean resolveAllBundles()
+ public void refreshBundle(long bundleIdentifier) throws IOException
{
- ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
- PackageAdmin service = (PackageAdmin)context.getService(sref);
- return service.resolveBundles(null);
+ getFrameworkMBean().refreshPackages(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);
+ }
+
+ public boolean resolveBundle(long arg0) throws IOException
+ {
+ return getFrameworkMBean().resolveBundle(arg0);
+ }
+
public int getFrameworkStartLevel() throws IOException
{
return getFrameworkMBean().getFrameworkStartLevel();
@@ -110,26 +132,19 @@
return getFrameworkMBean().installBundles(arg0);
}
- public void refreshPackages(long arg0) throws IOException
+ @Deprecated
+ public void refreshPackages(long bundleIdentifier) throws IOException
{
- getFrameworkMBean().refreshPackages(arg0);
+ refreshBundle(bundleIdentifier);
}
- public CompositeData refreshPackages(long[] arg0) throws IOException
+ @Deprecated
+ public CompositeData refreshPackages(long[] bundleIdentifiers) throws IOException
{
- return getFrameworkMBean().refreshPackages(arg0);
+ refreshBundles(bundleIdentifiers);
+ return null;
}
- public boolean resolveBundle(long arg0) throws IOException
- {
- return getFrameworkMBean().resolveBundle(arg0);
- }
-
- public boolean resolveBundles(long[] arg0) throws IOException
- {
- return getFrameworkMBean().resolveBundles(arg0);
- }
-
public void restartFramework() throws IOException
{
getFrameworkMBean().restartFramework();
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -59,6 +59,7 @@
private FrameworkStateExt frameworkState;
private ServiceStateExt serviceState;
private BundleStateExt bundleState;
+ private PackageStateExt packageState;
public void start(BundleContext context)
{
@@ -81,6 +82,10 @@
bundleState = new BundleStateExt(sysContext, mbeanServer);
bundleState.start();
+ // Register the PackageStateMBean
+ packageState = new PackageStateExt(sysContext, mbeanServer);
+ packageState.start();
+
jmxHost = context.getProperty(JMXConstantsExt.REMOTE_JMX_HOST);
if (jmxHost == null)
jmxHost = "localhost";
@@ -109,6 +114,9 @@
// Unregister the BundleStateMBean
bundleState.stop();
+ // Unregister the PackageStateMBean
+ packageState.stop();
+
if (jmxConnector != null)
{
jmxConnector.stop();
Added: 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 (rev 0)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/PackageStateExt.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -0,0 +1,83 @@
+/*
+ * 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.osgi.jmx.internal;
+
+//$Id$
+
+import java.io.IOException;
+
+import javax.management.MBeanServer;
+import javax.management.NotCompliantMBeanException;
+import javax.management.ObjectName;
+import javax.management.StandardMBean;
+import javax.management.openmbean.TabularData;
+
+import org.jboss.osgi.jmx.ObjectNameFactory;
+import org.jboss.osgi.jmx.PackageStateMBeanExt;
+import org.osgi.framework.BundleContext;
+import org.osgi.jmx.framework.BundleStateMBean;
+
+/**
+ * An extension to {@link BundleStateMBean}.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 23-Feb-2010
+ */
+public class PackageStateExt extends AbstractState implements PackageStateMBeanExt
+{
+ public PackageStateExt(BundleContext context, MBeanServer mbeanServer)
+ {
+ super(context, mbeanServer);
+ }
+
+ @Override
+ ObjectName getObjectName()
+ {
+ return ObjectNameFactory.create(OBJECTNAME);
+ }
+
+ @Override
+ StandardMBean getStandardMBean() throws NotCompliantMBeanException
+ {
+ return new StandardMBean(this, PackageStateMBeanExt.class);
+ }
+
+ public long getExportingBundle(String arg0, String arg1) throws IOException
+ {
+ return getPackageStateMBean().getExportingBundle(arg0, arg1);
+ }
+
+ public long[] getImportingBundles(String arg0, String arg1) throws IOException
+ {
+ return getPackageStateMBean().getImportingBundles(arg0, arg1);
+ }
+
+ public boolean isRemovalPending(String arg0, String arg1) throws IOException
+ {
+ return getPackageStateMBean().isRemovalPending(arg0, arg1);
+ }
+
+ public TabularData listPackages() throws IOException
+ {
+ return getPackageStateMBean().listPackages();
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/projects/bundles/jmx/trunk/jmx-bundle/src/main/java/org/jboss/osgi/jmx/internal/PackageStateExt.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiPackageAdmin.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiPackageAdmin.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiPackageAdmin.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -1,55 +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.osgi.testing;
-
-//$Id$
-
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * An abstraction of the OSGi {@link PackageAdmin} service.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Sep-2008
- */
-public interface OSGiPackageAdmin
-{
- /**
- * Forces the update (replacement) or removal of packages exported by the specified bundles.
- *
- * @see {@link PackageAdmin#refreshPackages(org.osgi.framework.Bundle[])}
- *
- * @param bundles The bundles whose exported packages are to be updated or removed,
- * or null for all bundles updated or uninstalled since the last call to this method.
- */
- void refreshPackages(OSGiBundle[] bundles);
-
- /**
- * Resolve the specified bundles.
- *
- * @see {@link PackageAdmin#resolveBundles(org.osgi.framework.Bundle[])}
- *
- * @param bundles The bundles to resolve or null to resolve all unresolved bundles installed in the Framework.
- * @return true if all specified bundles are resolved
- */
- boolean resolveBundles(OSGiBundle[] bundles);
-}
Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntime.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntime.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiRuntime.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -21,6 +21,8 @@
*/
package org.jboss.osgi.testing;
+import java.io.IOException;
+
import javax.management.MBeanServerConnection;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -32,7 +34,6 @@
import org.osgi.jmx.framework.FrameworkMBean;
import org.osgi.jmx.framework.PackageStateMBean;
import org.osgi.jmx.framework.ServiceStateMBean;
-import org.osgi.service.packageadmin.PackageAdmin;
/**
* An abstraction of an OSGi Runtime.
@@ -61,27 +62,27 @@
* Install an {@link OSGiBundle} from the given location.
*/
OSGiBundle installBundle(String location) throws BundleException;
-
+
/**
* Get the FrameworkMBean
*/
- FrameworkMBean getFrameworkMBean();
+ FrameworkMBean getFrameworkMBean() throws IOException;
/**
* Get the BundleStateMBean
*/
- BundleStateMBean getBundleStateMBean();
-
+ BundleStateMBean getBundleStateMBean() throws IOException;
+
/**
- * Get the PackageStateMBean
+ * Get the ServiceStateMBean
*/
- PackageStateMBean getPackageStateMBean();
-
+ ServiceStateMBean getServiceStateMBean() throws IOException;
+
/**
- * Get the ServiceStateMBean
+ * Get the PackageStateMBean
*/
- ServiceStateMBean getServiceStateMBean();
-
+ PackageStateMBean getPackageStateMBean() throws IOException;
+
/**
* Get the array of installed {@link OSGiBundle}s
*/
@@ -106,18 +107,13 @@
OSGiBundle getBundle(long bundleId);
/**
- * Get an abstraction of the {@link PackageAdmin}.
- */
- OSGiPackageAdmin getPackageAdmin();
-
- /**
* Returns a ServiceReference object for a service that implements and was registered
* under the specified class.
*
* @return A ServiceReference object, or null if no services are registered which implement the named class.
*/
OSGiServiceReference getServiceReference(String clazz);
-
+
/**
* Returns a ServiceReference object for a service that implements and was registered
* under the specified class.
@@ -126,14 +122,14 @@
* @return A ServiceReference object, or null if no services are registered which implement the named class.
*/
OSGiServiceReference getServiceReference(String clazz, long timeout);
-
+
/**
* Returns an array of ServiceReference objects.
* The returned array of ServiceReference objects contains services that were registered under the specified
* class and match the specified filter criteria.
*/
OSGiServiceReference[] getServiceReferences(String clazz, String filter);
-
+
/**
* Get the initial naming context for this {@link OSGiRuntime}
*/
Deleted: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedPackageAdmin.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedPackageAdmin.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedPackageAdmin.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -1,69 +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.osgi.testing.internal;
-
-import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiPackageAdmin;
-import org.osgi.framework.Bundle;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * An embedded implementation of the {@link OSGiPackageAdmin}
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Sep-2008
- */
-public class EmbeddedPackageAdmin implements OSGiPackageAdmin
-{
- private PackageAdmin delegate;
-
- public EmbeddedPackageAdmin(PackageAdmin packAdmin)
- {
- this.delegate = packAdmin;
- }
-
- public boolean resolveBundles(OSGiBundle[] bundles)
- {
- Bundle[] bundleArr = getBundles(bundles);
- return delegate.resolveBundles(bundleArr);
- }
-
- public void refreshPackages(OSGiBundle[] bundles)
- {
- Bundle[] bundleArr = getBundles(bundles);
- delegate.refreshPackages(bundleArr);
- }
-
- private Bundle[] getBundles(OSGiBundle[] bundles)
- {
- Bundle[] bundleArr = null;
- if (bundles != null)
- {
- bundleArr = new Bundle[bundles.length];
- for (int i=0; i < bundles.length; i++)
- {
- bundleArr[i] = ((EmbeddedBundle)bundles[i]).getBundle();
- }
- }
- return bundleArr;
- }
-}
Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -37,7 +37,6 @@
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.util.BundleInfo;
import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiPackageAdmin;
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiServiceReference;
import org.jboss.osgi.testing.OSGiTestHelper;
@@ -47,7 +46,6 @@
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.launch.Framework;
-import org.osgi.service.packageadmin.PackageAdmin;
/**
* An embedded implementation of the {@link OSGiRuntime}
@@ -179,14 +177,6 @@
return server;
}
- public OSGiPackageAdmin getPackageAdmin()
- {
- BundleContext context = getSystemContext();
- ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
- PackageAdmin packAdmin = (PackageAdmin)context.getService(sref);
- return new EmbeddedPackageAdmin(packAdmin);
- }
-
public boolean isRemoteRuntime()
{
return false;
Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -23,7 +23,6 @@
import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -36,13 +35,18 @@
import java.util.jar.JarFile;
import java.util.jar.Manifest;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.jboss.logging.Logger;
+import org.jboss.osgi.jmx.BundleStateMBeanExt;
+import org.jboss.osgi.jmx.FrameworkMBeanExt;
import org.jboss.osgi.jmx.MBeanProxy;
import org.jboss.osgi.jmx.ObjectNameFactory;
+import org.jboss.osgi.jmx.PackageStateMBeanExt;
+import org.jboss.osgi.jmx.ServiceStateMBeanExt;
import org.jboss.osgi.spi.capability.Capability;
import org.jboss.osgi.spi.util.BundleInfo;
import org.jboss.osgi.testing.OSGiBundle;
@@ -71,11 +75,6 @@
private OSGiTestHelper helper;
private Map<String, OSGiBundle> bundles = new LinkedHashMap<String, OSGiBundle>();
private List<Capability> capabilities = new ArrayList<Capability>();
-
- private ServiceStateMBean serviceState;
- private PackageStateMBean packageState;
- private BundleStateMBean bundleState;
- private FrameworkMBean framework;
public OSGiRuntimeImpl(OSGiTestHelper helper)
{
@@ -121,7 +120,7 @@
log.debug("Skip bundle: " + location);
}
}
-
+
// Start the capability bundles
for (OSGiBundle bundle : installed)
{
@@ -181,56 +180,48 @@
log.debug("End Shutdown");
}
- public FrameworkMBean getFrameworkMBean()
+ public FrameworkMBean getFrameworkMBean() throws IOException
{
- if (framework == null)
- {
- ObjectName objectName = ObjectNameFactory.create(FrameworkMBean.OBJECTNAME);
- framework = MBeanProxy.get(getMBeanServer(), objectName, FrameworkMBean.class);
- }
- return framework;
- }
+ MBeanServerConnection server = getMBeanServer();
+ ObjectName objectName = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME);
+ if (server.isRegistered(objectName))
+ return MBeanProxy.get(server, objectName, FrameworkMBeanExt.class);
- public BundleStateMBean getBundleStateMBean()
- {
- if (bundleState == null)
- {
- ObjectName objectName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
- bundleState = MBeanProxy.get(getMBeanServer(), objectName, BundleStateMBean.class);
- }
- return bundleState;
+ objectName = ObjectNameFactory.create(FrameworkMBean.OBJECTNAME);
+ return MBeanProxy.get(server, objectName, FrameworkMBean.class);
}
-
- public PackageStateMBean getPackageStateMBean()
- {
- if (packageState == null)
- {
- ObjectName objectName = ObjectNameFactory.create(PackageStateMBean.OBJECTNAME);
- packageState = MBeanProxy.get(getMBeanServer(), objectName, PackageStateMBean.class);
- }
- return packageState;
- }
- public ServiceStateMBean getServiceStateMBean()
+ public BundleStateMBean getBundleStateMBean() throws IOException
{
- if (serviceState == null)
- {
- ObjectName objectName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME);
- serviceState = MBeanProxy.get(getMBeanServer(), objectName, ServiceStateMBean.class);
- }
- return serviceState;
+ MBeanServerConnection server = getMBeanServer();
+ ObjectName objectName = ObjectNameFactory.create(BundleStateMBeanExt.OBJECTNAME);
+ if (server.isRegistered(objectName))
+ return MBeanProxy.get(server, objectName, BundleStateMBeanExt.class);
+
+ objectName = ObjectNameFactory.create(BundleStateMBean.OBJECTNAME);
+ return MBeanProxy.get(server, objectName, BundleStateMBean.class);
}
- void deploy(URL archiveURL) throws Exception
+ public PackageStateMBean getPackageStateMBean() throws IOException
{
- //DeployerServiceClient deployer = new DeployerServiceClient(this, DeployerService.MBEAN_DEPLOYER_SERVICE);
- //deployer.deploy(archiveURL);
+ MBeanServerConnection server = getMBeanServer();
+ ObjectName objectName = ObjectNameFactory.create(PackageStateMBeanExt.OBJECTNAME);
+ if (server.isRegistered(objectName))
+ return MBeanProxy.get(server, objectName, PackageStateMBeanExt.class);
+
+ objectName = ObjectNameFactory.create(PackageStateMBean.OBJECTNAME);
+ return MBeanProxy.get(server, objectName, PackageStateMBean.class);
}
- void undeploy(URL archiveURL) throws Exception
+ public ServiceStateMBean getServiceStateMBean() throws IOException
{
- //DeployerServiceClient deployer = new DeployerServiceClient(this, DeployerService.MBEAN_DEPLOYER_SERVICE);
- //deployer.undeploy(archiveURL);
+ MBeanServerConnection server = getMBeanServer();
+ ObjectName objectName = ObjectNameFactory.create(ServiceStateMBeanExt.OBJECTNAME);
+ if (server.isRegistered(objectName))
+ return MBeanProxy.get(getMBeanServer(), objectName, ServiceStateMBeanExt.class);
+
+ objectName = ObjectNameFactory.create(ServiceStateMBean.OBJECTNAME);
+ return MBeanProxy.get(server, objectName, ServiceStateMBean.class);
}
public InitialContext getInitialContext() throws NamingException
Deleted: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemotePackageAdmin.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -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.osgi.testing.internal;
-
-import java.io.IOException;
-
-import javax.management.ObjectName;
-
-import org.jboss.osgi.jmx.FrameworkMBeanExt;
-import org.jboss.osgi.jmx.MBeanProxy;
-import org.jboss.osgi.jmx.ObjectNameFactory;
-import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiPackageAdmin;
-import org.jboss.osgi.testing.OSGiRuntime;
-import org.osgi.jmx.framework.FrameworkMBean;
-
-/**
- * A remote implementation of the {@link OSGiPackageAdmin}
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Sep-2008
- */
-public class RemotePackageAdmin implements OSGiPackageAdmin
-{
- private OSGiRuntime runtime;
-
- public RemotePackageAdmin(OSGiRuntime runtime)
- {
- this.runtime = runtime;
- }
-
- public boolean resolveBundles(OSGiBundle[] bundles)
- {
- // JMX FrameworkMBean does not allow to resolve/refresh all bundles
- // https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1586
- if (bundles == null)
- {
- ObjectName objectName = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME);
- FrameworkMBeanExt mbeanProxy = MBeanProxy.get(runtime.getMBeanServer(), objectName, FrameworkMBeanExt.class);
- return mbeanProxy.resolveAllBundles();
- }
-
- FrameworkMBean framework = runtime.getFrameworkMBean();
- try
- {
- long[] ids = getBundleIds(bundles);
- return framework.resolveBundles(ids);
- }
- catch (IOException ex)
- {
- throw new IllegalStateException("Cannot resolve bundles", ex);
- }
- }
-
- public void refreshPackages(OSGiBundle[] bundles)
- {
- // JMX FrameworkMBean does not allow to resolve/refresh all bundles
- // https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1586
- if (bundles == null)
- {
- ObjectName objectName = ObjectNameFactory.create(FrameworkMBeanExt.OBJECTNAME);
- FrameworkMBeanExt mbeanProxy = MBeanProxy.get(runtime.getMBeanServer(), objectName, FrameworkMBeanExt.class);
- mbeanProxy.refreshAllPackages();
- return;
- }
-
- FrameworkMBean framework = runtime.getFrameworkMBean();
- try
- {
- long[] ids = getBundleIds(bundles);
- framework.refreshPackages(ids);
- }
- catch (IOException ex)
- {
- throw new IllegalStateException("Cannot resolve bundles", ex);
- }
- }
-
- private long[] getBundleIds(OSGiBundle[] bundles)
- {
- long[] ids = new long[bundles.length];
- for (int i = 0; i < bundles.length; i++)
- ids[i] = bundles[i].getBundleId();
-
- return ids;
- }
-}
Modified: projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-02-26 11:52:33 UTC (rev 101528)
+++ projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2010-02-26 11:55:48 UTC (rev 101529)
@@ -44,7 +44,6 @@
import org.jboss.osgi.jmx.ServiceStateMBeanExt;
import org.jboss.osgi.spi.util.BundleInfo;
import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiPackageAdmin;
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiServiceReference;
import org.jboss.osgi.testing.OSGiTestHelper;
@@ -213,11 +212,6 @@
return mbeanServer;
}
- public OSGiPackageAdmin getPackageAdmin()
- {
- return new RemotePackageAdmin(this);
- }
-
public boolean isRemoteRuntime()
{
return true;
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101495 - projects/jboss-osgi/trunk/hudson/hudson-home.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-25 16:35:57 -0500 (Thu, 25 Feb 2010)
New Revision: 101495
Modified:
projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
Log:
Workspace:anonymous
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/config.xml 2010-02-25 19:40:45 UTC (rev 101494)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/config.xml 2010-02-25 21:35:57 UTC (rev 101495)
@@ -3,22 +3,23 @@
<numExecutors>2</numExecutors>
<useSecurity>true</useSecurity>
<authorizationStrategy class="hudson.security.GlobalMatrixAuthorizationStrategy">
+ <permission>hudson.model.Hudson.Administer:@hudson.username@</permission>
+ <permission>hudson.model.Hudson.Read:@hudson.username@</permission>
<permission>hudson.model.Hudson.Read:anonymous</permission>
- <permission>hudson.model.Hudson.Read:@hudson.username@</permission>
+ <permission>hudson.model.Computer.Configure:@hudson.username@</permission>
+ <permission>hudson.model.Computer.Delete:@hudson.username@</permission>
<permission>hudson.model.Item.Build:@hudson.username@</permission>
+ <permission>hudson.model.Item.Configure:@hudson.username@</permission>
+ <permission>hudson.model.Item.Create:@hudson.username@</permission>
+ <permission>hudson.model.Item.Delete:@hudson.username@</permission>
<permission>hudson.model.Item.Workspace:@hudson.username@</permission>
- <permission>hudson.model.Item.Delete:@hudson.username@</permission>
+ <permission>hudson.model.Item.Workspace:anonymous</permission>
<permission>hudson.model.View.Configure:@hudson.username@</permission>
- <permission>hudson.model.Computer.Configure:@hudson.username@</permission>
- <permission>hudson.model.Computer.Delete:@hudson.username@</permission>
+ <permission>hudson.model.View.Create:@hudson.username@</permission>
+ <permission>hudson.model.View.Delete:@hudson.username@</permission>
+ <permission>hudson.model.Run.Delete:@hudson.username@</permission>
<permission>hudson.model.Run.Update:@hudson.username@</permission>
- <permission>hudson.model.Item.Create:@hudson.username@</permission>
- <permission>hudson.model.Item.Configure:@hudson.username@</permission>
- <permission>hudson.model.View.Delete:@hudson.username@</permission>
- <permission>hudson.model.View.Create:@hudson.username@</permission>
<permission>hudson.scm.SCM.Tag:@hudson.username@</permission>
- <permission>hudson.model.Run.Delete:@hudson.username@</permission>
- <permission>hudson.model.Hudson.Administer:@hudson.username@</permission>
</authorizationStrategy>
<securityRealm class="hudson.security.HudsonPrivateSecurityRealm">
<disableSignup>false</disableSignup>
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101473 - in projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi: resolver and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-25 09:33:38 -0500 (Thu, 25 Feb 2010)
New Revision: 101473
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java
Log:
Add the missing FIXMEs
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-02-25 13:42:45 UTC (rev 101472)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-02-25 14:33:38 UTC (rev 101473)
@@ -173,7 +173,7 @@
{
if (context != null)
{
- System.out.println("[JBCL-137] Add support for OSGi Fragments");
+ System.out.println("FIXME [JBCL-137] Add support for OSGi Fragments");
return;
}
@@ -218,7 +218,7 @@
{
if (context != null)
{
- System.out.println("[JBCL-137] Add support for OSGi Fragments");
+ System.out.println("FIXME [JBCL-137] Add support for OSGi Fragments");
return;
}
@@ -298,7 +298,7 @@
{
if (context != null)
{
- System.out.println("[JBCL-137] Add support for OSGi Fragments");
+ System.out.println("FIXME [JBCL-137] Add support for OSGi Fragments");
return;
}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java 2010-02-25 13:42:45 UTC (rev 101472)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java 2010-02-25 14:33:38 UTC (rev 101473)
@@ -42,6 +42,6 @@
@Override
public void testPreferredExporterHigherVersion() throws Exception
{
- System.out.println("[JBCL-133] Implement resolver preferences");
+ System.out.println("FIXME [JBCL-133] Implement resolver preferences");
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2010-02-25 13:42:45 UTC (rev 101472)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2010-02-25 14:33:38 UTC (rev 101473)
@@ -31,7 +31,6 @@
import org.jboss.osgi.framework.bundle.OSGiBundleManager;
import org.jboss.osgi.framework.launch.OSGiFramework;
-import org.jboss.osgi.framework.plugins.PackageAdminPlugin;
import org.jboss.osgi.framework.plugins.ResolverPlugin;
import org.jboss.osgi.framework.resolver.Resolver;
import org.jboss.osgi.framework.resolver.ResolverBundle;
@@ -97,11 +96,10 @@
assertEquals("All bundles resolved", unresolved.size(), resolved.size());
}
- PackageAdminPlugin packageAdmin = bundleManager.getPlugin(PackageAdminPlugin.class);
- packageAdmin.resolveBundles(null);
-
System.out.println("FIXME [JBOSGI-151] Cannot resolve circular dependencies");
- // assertTrue("All bundles resolved", allResolved);
+ //PackageAdminPlugin packageAdmin = bundleManager.getPlugin(PackageAdminPlugin.class);
+ //boolean allResolved = packageAdmin.resolveBundles(null);
+ //assertTrue("All bundles resolved", allResolved);
}
finally
{
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101470 - in projects/jboss-osgi/trunk/distribution: javadoc/scripts and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-25 07:46:28 -0500 (Thu, 25 Feb 2010)
New Revision: 101470
Modified:
projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
projects/jboss-osgi/trunk/distribution/pom.xml
Log:
Generate javadoc for testing, jmx, jndi API
Modified: projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2010-02-25 12:06:26 UTC (rev 101469)
+++ projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2010-02-25 12:46:28 UTC (rev 101470)
@@ -19,10 +19,11 @@
<include>*:jboss-osgi-hotdeploy:jar:sources</include>
<include>*:jboss-osgi-husky:jar:sources</include>
<include>*:jboss-osgi-jaxb:jar:sources</include>
- <include>*:jboss-osgi-jmx:jar:sources</include>
- <include>*:jboss-osgi-jndi:jar:sources</include>
+ <include>*:jboss-osgi-jmx-api:jar:sources</include>
+ <include>*:jboss-osgi-jndi-api:jar:sources</include>
<include>*:jboss-osgi-jta:jar:sources</include>
<include>*:jboss-osgi-spi:jar:sources</include>
+ <include>*:jboss-osgi-testing:jar:sources</include>
<include>*:jboss-osgi-webapp:jar:sources</include>
<include>*:jboss-osgi-xml-binding:jar:sources</include>
</includes>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-25 12:06:26 UTC (rev 101469)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-25 12:46:28 UTC (rev 101470)
@@ -207,14 +207,23 @@
<version>${version.jboss.osgi.jmx}</version>
<classifier>sources</classifier>
</dependency>
- <!--
<dependency>
<groupId>org.jboss.osgi.jmx</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
+ <artifactId>jboss-osgi-jmx-api</artifactId>
<version>${version.jboss.osgi.jmx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx-api</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx-api</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
<classifier>javadoc</classifier>
</dependency>
- -->
<dependency>
<groupId>org.jboss.osgi.jndi</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
@@ -225,14 +234,23 @@
<version>${version.jboss.osgi.jndi}</version>
<classifier>sources</classifier>
</dependency>
- <!--
<dependency>
<groupId>org.jboss.osgi.jndi</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
+ <artifactId>jboss-osgi-jndi-api</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>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi-api</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
<classifier>javadoc</classifier>
</dependency>
- -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jta</artifactId>
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101469 - in projects/jboss-osgi: trunk and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-25 07:06:26 -0500 (Thu, 25 Feb 2010)
New Revision: 101469
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
Log:
Update version properties. Skip the framework tests on -Pdistro
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-25 11:49:05 UTC (rev 101468)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-02-25 12:06:26 UTC (rev 101469)
@@ -446,4 +446,26 @@
</plugins>
</build>
+ <profiles>
+
+ <!--
+ Name: distro
+ Desc: Build the distribution
+ -->
+ <profile>
+ <id>distro</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
</project>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-25 11:49:05 UTC (rev 101468)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-25 12:06:26 UTC (rev 101469)
@@ -333,7 +333,7 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.runtime.deployers}</version>
+ <version>${version.jboss.osgi.deployers}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
@@ -359,7 +359,7 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-jbossas</artifactId>
- <version>${version.jboss.osgi.runtime.jbossas}</version>
+ <version>${version.jboss.osgi.jbossas}</version>
<classifier>sources</classifier>
</dependency>
<!-- jboss-osgi-jbossas: no javadoc -->
@@ -386,7 +386,7 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
- <version>${version.jboss.osgi.runtime.equinox}</version>
+ <version>${version.jboss.osgi.equinox}</version>
<classifier>sources</classifier>
</dependency>
@@ -398,7 +398,7 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
+ <version>${version.jboss.osgi.felix}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-02-25 11:49:05 UTC (rev 101468)
+++ projects/jboss-osgi/trunk/pom.xml 2010-02-25 12:06:26 UTC (rev 101469)
@@ -59,19 +59,19 @@
<version.jboss.osgi.blueprint>1.0.0.Beta2-SNAPSHOT</version.jboss.osgi.blueprint>
<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.deployers>1.0.5-SNAPSHOT</version.jboss.osgi.deployers>
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.equinox>3.5.1.SP1-SNAPSHOT</version.jboss.osgi.equinox>
+ <version.jboss.osgi.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.felix>
<version.jboss.osgi.framework>1.0.0.Alpha4-SNAPSHOT</version.jboss.osgi.framework>
<version.jboss.osgi.hotdeploy>1.0.5-SNAPSHOT</version.jboss.osgi.hotdeploy>
<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.jbossas>1.0.3-SNAPSHOT</version.jboss.osgi.jbossas>
<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.jta>1.0.1-SNAPSHOT</version.jboss.osgi.jta>
<version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
- <version.jboss.osgi.runtime.deployers>1.0.5-SNAPSHOT</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.runtime.equinox>3.5.1.SP1-SNAPSHOT</version.jboss.osgi.runtime.equinox>
- <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
- <version.jboss.osgi.runtime.jbossas>1.0.3-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
@@ -212,7 +212,7 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.runtime.deployers}</version>
+ <version>${version.jboss.osgi.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
@@ -221,22 +221,22 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgijbossas</artifactId>
- <version>${version.jboss.osgi.runtime.jbossas}</version>
+ <artifactId>jboss-osgi-jbossas</artifactId>
+ <version>${version.jboss.osgi.jbossas}</version>
</dependency>
<!-- Equinox Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
- <version>${version.jboss.osgi.runtime.equinox}</version>
+ <version>${version.jboss.osgi.equinox}</version>
</dependency>
<!-- Felix Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
+ <version>${version.jboss.osgi.felix}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
14 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r101468 - in projects/jboss-osgi/projects/runtime: felix/trunk and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-25 06:49:05 -0500 (Thu, 25 Feb 2010)
New Revision: 101468
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/.project
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/felix/trunk/.project
projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
Log:
Update felix & equinox runtimes
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/.project
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/.project 2010-02-25 11:48:11 UTC (rev 101467)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/.project 2010-02-25 11:49:05 UTC (rev 101468)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-runtime-equinox</name>
+ <name>jboss-osgi-equinox</name>
<comment></comment>
<projects>
</projects>
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-02-25 11:48:11 UTC (rev 101467)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-02-25 11:49:05 UTC (rev 101468)
@@ -17,7 +17,7 @@
<name>JBossOSGi Equinox</name>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <artifactId>jboss-osgi-equinox</artifactId>
<packaging>jar</packaging>
<version>3.5.1.SP1-SNAPSHOT</version>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/.project
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/.project 2010-02-25 11:48:11 UTC (rev 101467)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/.project 2010-02-25 11:49:05 UTC (rev 101468)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-runtime-felix</name>
+ <name>jboss-osgi-felix</name>
<comment></comment>
<projects>
</projects>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-02-25 11:48:11 UTC (rev 101467)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-02-25 11:49:05 UTC (rev 101468)
@@ -17,7 +17,7 @@
<name>JBossOSGi Felix</name>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <artifactId>jboss-osgi-felix</artifactId>
<packaging>jar</packaging>
<version>2.0.2.SP1-SNAPSHOT</version>
14 years, 2 months
- 1
- 0