1:17 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-04-29 02:17:08 -0400 (Wed, 29 Apr 2009)
New Revision: 87981
Added:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
Removed:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MCServiceTestCase.java
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
Log:
wiring to 3rd party bundles ok
Deleted:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MCServiceTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MCServiceTestCase.java 2009-04-29
06:03:38 UTC (rev 87980)
+++
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MCServiceTestCase.java 2009-04-29
06:17:08 UTC (rev 87981)
@@ -1,75 +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.test.osgi.blueprint.mcservice;
-
-//$Id$
-
-import static
org.jboss.osgi.microcontainer.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE;
-import static
org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
-import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_MBEAN_SERVER;
-import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_KERNEL;
-
-import java.util.List;
-
-import org.jboss.osgi.microcontainer.MicrocontainerServiceMBean;
-import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.management.MBeanProxy;
-import org.jboss.test.osgi.blueprint.BlueprintTest;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * A test that checks whether the MicrocontainerService can be accessed
- *
- * @author thomas.diesler(a)jboss.com
- * @since 12-Feb-2009
- */
-public class MCServiceTestCase extends BlueprintTest
-{
- public void testMCServiceAccess() throws Exception
- {
- OSGiFramework framework = getBootstrapProvider().getFramework();
- try
- {
- BundleContext sysContext = framework.getSystemBundleContext();
-
- Bundle bundle = installBundle(sysContext, "mcservice-bundle.jar",
true);
- assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
-
- MicrocontainerServiceMBean mcService =
MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE,
getMBeanServer());
- List<String> registeredBeans = mcService.getRegisteredBeans();
- assertTrue("MicrocontainerService registered with MC",
registeredBeans.contains(BEAN_SYSTEM_BUNDLE_CONTEXT));
- assertTrue("MBeanServer registered with MC",
registeredBeans.contains(BEAN_MBEAN_SERVER));
- assertTrue("Kernel registered with MC",
registeredBeans.contains(BEAN_KERNEL));
- }
- finally
- {
- framework.stop();
- }
- }
-
- public void testBeansDeployment() throws Exception
- {
- //MicrocontainerServiceMBean mcService =
MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE,
getMBeanServer());
- //mcService.deploy(getTestArchiveURL("mcservice-beans.jar"));
- }
-}
\ No newline at end of file
Copied:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
(from rev 87977,
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MCServiceTestCase.java)
===================================================================
---
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
(rev 0)
+++
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-04-29
06:17:08 UTC (rev 87981)
@@ -0,0 +1,75 @@
+/*
+ * 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.test.osgi.blueprint.mcservice;
+
+//$Id$
+
+import static
org.jboss.osgi.microcontainer.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE;
+import static
org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_MBEAN_SERVER;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_KERNEL;
+
+import java.util.List;
+
+import org.jboss.osgi.microcontainer.MicrocontainerServiceMBean;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.management.MBeanProxy;
+import org.jboss.test.osgi.blueprint.BlueprintTest;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/**
+ * A test that checks whether the MicrocontainerService can be accessed
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 12-Feb-2009
+ */
+public class MicrocontainerServiceTestCase extends BlueprintTest
+{
+ public void testServiceAccess() throws Exception
+ {
+ OSGiFramework framework = getBootstrapProvider().getFramework();
+ try
+ {
+ BundleContext sysContext = framework.getSystemBundleContext();
+
+ Bundle bundle = installBundle(sysContext, "mcservice-bundle.jar",
true);
+ assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+
+ MicrocontainerServiceMBean mcService =
MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE,
getMBeanServer());
+ List<String> registeredBeans = mcService.getRegisteredBeans();
+ assertTrue("MicrocontainerService registered with MC",
registeredBeans.contains(BEAN_SYSTEM_BUNDLE_CONTEXT));
+ assertTrue("MBeanServer registered with MC",
registeredBeans.contains(BEAN_MBEAN_SERVER));
+ assertTrue("Kernel registered with MC",
registeredBeans.contains(BEAN_KERNEL));
+ }
+ finally
+ {
+ framework.stop();
+ }
+ }
+
+ public void testBeansDeployment() throws Exception
+ {
+ //MicrocontainerServiceMBean mcService =
MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE,
getMBeanServer());
+ //mcService.deploy(getTestArchiveURL("mcservice-beans.jar"));
+ }
+}
\ No newline at end of file
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
===================================================================
---
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-29
06:03:38 UTC (rev 87980)
+++
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-29
06:17:08 UTC (rev 87981)
@@ -11,15 +11,20 @@
# All props start with 'framework.prop'
framework.prop.org.osgi.framework.storage.clean=onFirstInit
framework.prop.org.osgi.framework.system.packages=\
+ javax.activation, \
javax.management, \
javax.naming, \
javax.naming.spi, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- org.jboss.logging, \
- org.osgi.framework; version=1.4, \
- org.w3c.dom*, \
- org.xml.sax*
+ javax.net, \
+ javax.net.ssl, \
+ javax.xml.bind.annotation, \
+ javax.xml.bind.annotation.adapters, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.transform, \
+ javax.xml.transform.sax, \
+ org.jboss.logging, \
+ org.osgi.framework; version=1.4
# Bundles that need to be installed with the Framework automatically
framework.autoInstall=\
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-29 06:03:38 UTC (rev
87980)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-29 06:17:08 UTC (rev
87981)
@@ -99,30 +99,33 @@
org.osgi.service.log,
org.osgi.util.tracker,
- <!-- import -->
+ <!-- import -->
+ javassist*,
+ org.jboss.beans.*,
+ org.jboss.classadapter.spi,
+ org.jboss.config.*,
+ org.jboss.joinpoint.*,
+ org.jboss.logging,
org.jboss.osgi.common.log,
org.jboss.osgi.jmx,
+ org.jboss.reflect.*,
org.jboss.util.*,
org.jboss.xb.*,
<!-- optional -->
- org.apache.commons.httpclient;resolution=optional,
- org.apache.webdav.lib;resolution=optional,
<!-- exclude -->
- !com.sun.jdi*,
+ !org.apache.commons.httpclient,
+ !org.apache.webdav.lib,
!org.jboss.test.*
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
- javassist;scope=test;inline=false,
jboss-dependency;inline=false,
- jboss-logging-spi;inline=false,
jboss-managed;inline=false,
jboss-metatype;inline=false,
jboss-mdr;inline=false,
jboss-kernel;inline=false,
- jboss-reflect;inline=false,
</Embed-Dependency>
</instructions>
</configuration>