[jboss-osgi-commits] JBoss-OSGI SVN: r97984 - in projects/jboss-osgi/trunk: distribution/javadoc/scripts and 5 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Fri Dec 18 05:47:40 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-12-18 05:47:39 -0500 (Fri, 18 Dec 2009)
New Revision: 97984
Removed:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/bundle/
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi212/
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
projects/jboss-osgi/trunk/reactor/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml
Log:
Fix embedded for Felix/Equinox
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-12-18 10:29:18 UTC (rev 97983)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-12-18 10:47:39 UTC (rev 97984)
@@ -324,6 +324,7 @@
<include name="jboss-osgi-framework.jar" />
<include name="jboss-reflect.jar" />
<include name="jbossxb.jar" />
+ <include name="mcann-core.jar" />
<include name="xercesImpl.jar" />
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/lib" override="true">
Modified: projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2009-12-18 10:29:18 UTC (rev 97983)
+++ projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2009-12-18 10:47:39 UTC (rev 97984)
@@ -22,7 +22,6 @@
<include>*:jboss-osgi-jmx:jar:sources</include>
<include>*:jboss-osgi-jndi:jar:sources</include>
<include>*:jboss-osgi-jta:jar:sources</include>
- <include>*:jboss-osgi-microcontainer:jar:sources</include>
<include>*:jboss-osgi-spi:jar:sources</include>
<include>*:jboss-osgi-webapp:jar:sources</include>
<include>*:jboss-osgi-xml-binding:jar:sources</include>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-12-18 10:29:18 UTC (rev 97983)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-jbossmc/config.xml 2009-12-18 10:47:39 UTC (rev 97984)
@@ -41,7 +41,6 @@
<name>container</name>
<values>
<string>runtime</string>
- <string>jboss600</string>
<string>jboss601</string>
</values>
</axis>
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-12-18 10:29:18 UTC (rev 97983)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-12-18 10:47:39 UTC (rev 97984)
@@ -48,14 +48,14 @@
<profiles>
<!--
- Name: framework-equinox
- Descr: Setup for Equinox framework integration testing
+ Name: noframework
+ Descr: Build the MC based framework when no other framework is specified
-->
<profile>
<id>noframework</id>
<activation>
<property>
- <name>!noframework</name>
+ <name>!framework</name>
</property>
</activation>
<modules>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-12-18 10:29:18 UTC (rev 97983)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-12-18 10:47:39 UTC (rev 97984)
@@ -137,9 +137,6 @@
<!-- jbosgi161 -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi161-bundle.jar" files="${tests.resources.dir}/jbosgi161/jbosgi161-bundle.bnd" />
- <!-- jbosgi212 -->
- <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi212-bundle.jar" files="${tests.resources.dir}/jbosgi212/jbosgi212-bundle.bnd" />
-
<!-- jbosgi214 -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi214-bundle.jar" files="${tests.resources.dir}/jbosgi214/jbosgi214-bundle.bnd" />
Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java 2009-12-18 10:29:18 UTC (rev 97983)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java 2009-12-18 10:47:39 UTC (rev 97984)
@@ -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.jbosgi212;
-
-//$Id:$
-
-import static org.junit.Assert.assertNotNull;
-
-import org.jboss.osgi.jmx.JMXCapability;
-import org.jboss.osgi.spi.service.MicrocontainerService;
-import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiServiceReference;
-import org.jboss.osgi.testing.OSGiTest;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-
-/**
- * [JBOSGI-212] Cannot refresh Microcontainer service
- *
- * https://jira.jboss.org/jira/browse/JBOSGI-212
- *
- * @author thomas.diesler at jboss.com
- * @since 25-Nov-2009
- */
-public class OSGI212TestCase extends OSGiTest
-{
- @Test
- public void testServiceRestart() throws Exception
- {
- OSGiRuntime runtime = getDefaultRuntime();
- try
- {
- runtime.addCapability(new JMXCapability());
-
- // On the MC Framework there is no such bundle. The service should still be available.
- OSGiBundle bundle = runtime.getBundle("jboss-osgi-microcontainer", null);
- if (bundle != null)
- {
- assertNotNull("MicrocontainerService available", bundle);
- assertBundleState(Bundle.ACTIVE, bundle.getState());
-
- // Update the MC bundle
- bundle.stop();
- bundle.start();
- }
-
- OSGiServiceReference sref = runtime.getServiceReference(MicrocontainerService.class.getName());
- assertNotNull("MicrocontainerService still available", sref);
- }
- finally
- {
- runtime.shutdown();
- }
- }
-}
\ No newline at end of file
More information about the jboss-osgi-commits
mailing list