10:50 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-07-28 11:49:59 -0400 (Tue, 28 Jul 2009)
New Revision: 91719
Added:
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/FrameworkLaunchTestCase.java
Removed:
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
Log:
Update to equinox 3.5
Add FrameworkLaunch test
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-28 15:48:33 UTC
(rev 91718)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-28 15:49:59 UTC
(rev 91719)
@@ -20,7 +20,7 @@
<artifactId>jboss-osgi-runtime-equinox</artifactId>
<packaging>jar</packaging>
- <version>1.0.0</version>
+ <version>3.5-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -31,9 +31,8 @@
<!-- Properties -->
<properties>
- <version.eclipse.equinox>3.4.2</version.eclipse.equinox>
- <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
- <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi>
+ <version.eclipse.equinox>3.5</version.eclipse.equinox>
+ <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi>
</properties>
<!-- Dependencies -->
@@ -48,19 +47,13 @@
<artifactId>org.eclipse.osgi</artifactId>
<version>${version.eclipse.equinox}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>${version.eclipse.equinox}</version>
</dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
- <scope>test</scope>
- </dependency>
+ -->
</dependencies>
<!-- Build -->
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
===================================================================
---
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-07-28
15:48:33 UTC (rev 91718)
+++
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-07-28
15:49:59 UTC (rev 91719)
@@ -201,7 +201,7 @@
{
if (framework != null)
{
- framework.shutdown();
+ framework.shutdown(0);
}
}
Added:
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/FrameworkLaunchTestCase.java
===================================================================
---
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/FrameworkLaunchTestCase.java
(rev 0)
+++
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/FrameworkLaunchTestCase.java 2009-07-28
15:49:59 UTC (rev 91719)
@@ -0,0 +1,48 @@
+/*
+ * 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.equinox;
+
+//$Id$
+
+import static org.junit.Assert.assertEquals;
+
+import org.jboss.osgi.spi.framework.FrameworkLoader;
+import org.junit.Test;
+import org.osgi.framework.launch.Framework;
+
+/**
+ * Test OSGi System bundle access
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 27-Jul-2009
+ */
+public class FrameworkLaunchTestCase
+{
+ @Test
+ public void testFrameworkLaunch()
+ {
+ Framework framework = FrameworkLoader.newFramework(null);
+
+ assertEquals("BundleId == 0", 0, framework.getBundleId());
+ assertEquals("SymbolicName", "org.eclipse.osgi",
framework.getSymbolicName());
+ }
+}
\ No newline at end of file
Property changes on:
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/FrameworkLaunchTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted:
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java
===================================================================
---
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java 2009-07-28
15:48:33 UTC (rev 91718)
+++
projects/jboss-osgi/projects/runtime/equinox/trunk/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java 2009-07-28
15:49:59 UTC (rev 91719)
@@ -1,67 +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.equinox;
-
-//$Id$
-
-import static org.junit.Assert.*;
-
-import org.jboss.osgi.equinox.framework.EquinoxIntegration;
-import org.jboss.osgi.spi.framework.OSGiBootstrap;
-import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.jboss.osgi.spi.testing.OSGiTest;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-
-/**
- * Test OSGi System bundle access
- *
- * @author thomas.diesler(a)jboss.com
- * @since 23-Jan-2009
- */
-public class SystemBundleTestCase extends OSGiTest
-{
- @Test
- public void testEquinoxIntegration()
- {
- EquinoxIntegration framework = new EquinoxIntegration();
- framework.create();
- framework.start();
-
- Bundle bundle = framework.getBundle();
-
- assertEquals("BundleId == 0", 0, bundle.getBundleId());
- assertEquals("SymbolicName", "org.eclipse.osgi",
bundle.getSymbolicName());
- }
-
- @Test
- public void testSystemBundle()
- {
- OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider();
- OSGiFramework framework = configProvider.getFramework();
- Bundle bundle = framework.getBundle();
-
- assertEquals("BundleId == 0", 0, bundle.getBundleId());
- assertEquals("SymbolicName", "org.eclipse.osgi",
bundle.getSymbolicName());
- }
-}
\ No newline at end of file