[jboss-cvs] JBossAS SVN: r97881 - in projects/jboss-osgi/projects/runtime: jbossas/trunk and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-12-16 06:51:28 -0500 (Wed, 16 Dec 2009)
New Revision: 97881

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java
   projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
Log:
Update AS integration

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java	2009-12-16 11:50:41 UTC (rev 97880)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java	2009-12-16 11:51:28 UTC (rev 97881)
@@ -67,7 +67,6 @@
  * @author <a href="ales.justin at jboss.org">Ales Justin</a>
  * @version $Revision: 1.1 $
  */
- at SuppressWarnings({"ThrowableInstanceNeverThrown"})
 public class OSGiServiceState extends AbstractControllerContext implements ServiceReference, ServiceRegistration, InvokeDispatchContext
 {
    /** The alias constant */
@@ -118,7 +117,7 @@
     * @param properties the properties
     * @throws IllegalArgumentException for a null parameter
     */
-   @SuppressWarnings("unchecked")
+   @SuppressWarnings({ "rawtypes", "unchecked" })
    public OSGiServiceState(AbstractBundleState bundleState, String[] clazzes, Object service, Dictionary properties)
    {
       // name is random / unique, we use aliases
@@ -517,7 +516,7 @@
       return result.toArray(new String[result.size()]);
    }
 
-   @SuppressWarnings("unchecked")
+   @SuppressWarnings({ "unchecked", "rawtypes" })
    public void setProperties(Dictionary properties)
    {
       checkUnregistered();

Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml	2009-12-16 11:50:41 UTC (rev 97880)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml	2009-12-16 11:51:28 UTC (rev 97881)
@@ -39,7 +39,7 @@
   <!-- Properties -->
   <properties>
     <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
-    <version.jboss.osgi.microcontainer>2.0.9</version.jboss.osgi.microcontainer>
+    <version.jboss.osgi.microcontainer>2.2.0-SNAPSHOT</version.jboss.osgi.microcontainer>
     <version.osgi>4.2.0</version.osgi>
   </properties>