November 2009 - jboss-osgi-commits

JBoss-OSGI SVN: r96949 - in projects/jboss-osgi/projects/bundles/husky/trunk: harness and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-25 08:54:08 -0500 (Wed, 25 Nov 2009) New Revision: 96949 Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml Log: Remove call to PackageAdmin.refresh in remote runtime shutdown Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-11-25 13:38:06 UTC (rev 96948) +++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml 2009-11-25 13:54:08 UTC (rev 96949) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-husky-parent</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> </parent>  Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2009-11-25 13:38:06 UTC (rev 96948) +++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/RemoteRuntime.java 2009-11-25 13:54:08 UTC (rev 96949) @@ -196,13 +196,6 @@ return new RemotePackageAdmin(this); } - @Override - public void shutdown() - { - super.shutdown(); - getPackageAdmin().refreshPackages(null); - } - private RemoteFramework getRemoteFramework() { try Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-25 13:38:06 UTC (rev 96948) +++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2009-11-25 13:54:08 UTC (rev 96949) @@ -22,7 +22,7 @@ <artifactId>jboss-osgi-husky-parent</artifactId> <packaging>pom</packaging> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version>  <parent> Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-11-25 13:38:06 UTC (rev 96948) +++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml 2009-11-25 13:54:08 UTC (rev 96949) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-husky-parent</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> </parent>

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96948 - in projects/jboss-osgi/projects/spi: tags and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-25 08:38:06 -0500 (Wed, 25 Nov 2009) New Revision: 96948 Added: projects/jboss-osgi/projects/spi/branches/1.0.3/ Removed: projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/ Log: spi-1.0.3-SNAPSHOT Copied: projects/jboss-osgi/projects/spi/branches/1.0.3 (from rev 96947, projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3)

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96947 - projects/jboss-osgi/projects/spi.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-25 08:36:57 -0500 (Wed, 25 Nov 2009) New Revision: 96947 Added: projects/jboss-osgi/projects/spi/branches/ Log: mkdir branches

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96946 - in projects/jboss-osgi/trunk: testsuite and 4 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-25 08:19:45 -0500 (Wed, 25 Nov 2009) New Revision: 96946 Added: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: examples run on embedded equinox Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-11-25 12:49:11 UTC (rev 96945) +++ projects/jboss-osgi/trunk/pom.xml 2009-11-25 13:19:45 UTC (rev 96946) @@ -43,7 +43,7 @@  <properties> - <version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin> + <version.apache.felix.configadmin>1.2.4</version.apache.felix.configadmin> <version.apache.felix.core>1.4.0</version.apache.felix.core> <version.apache.felix.eventadmin>1.0.0</version.apache.felix.eventadmin> <version.apache.felix.log>1.0.0</version.apache.felix.log> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-11-25 12:49:11 UTC (rev 96945) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-11-25 13:19:45 UTC (rev 96946) @@ -186,17 +186,9 @@ <exclude>org/jboss/test/osgi/example/interceptor/**</exclude> <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude> <exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude> -  +  <exclude>org/jboss/test/osgi/example/blueprint/**</exclude> - <exclude>org/jboss/test/osgi/example/http/**</exclude> - <exclude>org/jboss/test/osgi/example/interceptor/**</exclude> - <exclude>org/jboss/test/osgi/example/jmx/**</exclude> - <exclude>org/jboss/test/osgi/example/jndi/**</exclude> - <exclude>org/jboss/test/osgi/example/jta/**</exclude> <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude> - <exclude>org/jboss/test/osgi/example/simple/**</exclude> - <exclude>org/jboss/test/osgi/example/webapp/**</exclude> - <exclude>org/jboss/test/osgi/example/xml/**</exclude> </excludes> </configuration> </plugin> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2009-11-25 12:49:11 UTC (rev 96945) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2009-11-25 13:19:45 UTC (rev 96946) @@ -15,6 +15,7 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>org.eclipse.equinox:org.eclipse.osgi.services:jar</include> + <include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include> </includes> <useStrictFiltering>false</useStrictFiltering> <scope>provided</scope> Added: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties 2009-11-25 13:19:45 UTC (rev 96946) @@ -0,0 +1,9 @@ +# +# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider +# +# $Id$ +# + +# Equinox debug properties +org.eclipse.osgi/debug=true +org.eclipse.osgi/debug/loader=false Property changes on: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-11-25 12:49:11 UTC (rev 96945) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-11-25 13:19:45 UTC (rev 96946) @@ -5,9 +5,7 @@ # # Equinox properties -org.eclipse.osgi/debug=true -org.eclipse.osgi/debug/loader=true -osgi.support.class.certificate=false +# osgi.debug=target/test-classes/equinox-debug.properties # Properties to configure the Framework org.osgi.framework.storage=${basedir}/target/osgi-store @@ -36,11 +34,12 @@ org.jboss.util.id, \ org.jboss.util.threadpool, \ org.jboss.util.propertyeditor, \ - org.osgi.framework;version\=1.4 + org.osgi.framework;version=1.4 # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ - file://${test.archive.directory}/bundles/org.eclipse.osgi.services.jar + file://${test.archive.directory}/bundles/org.eclipse.osgi.services.jar \ + file://${test.archive.directory}/bundles/org.eclipse.osgi.util.jar \ # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 12:49:11 UTC (rev 96945) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 13:19:45 UTC (rev 96946) @@ -208,11 +208,6 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> - <exclude>org/jboss/test/osgi/capabilities/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi38/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi142/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi143/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi151/**</exclude> </excludes> </configuration> </plugin> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-11-25 12:49:11 UTC (rev 96945) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-11-25 13:19:45 UTC (rev 96946) @@ -60,21 +60,6 @@  <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.compendium</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> <scope>provided</scope> <exclusions> @@ -225,6 +210,24 @@ </dependency> </dependencies> </profile> + <profile> + <id>framework-equinox-default</id> + <activation> + <property> + <name>!framework</name> + </property> + </activation> + <properties> + <jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-runtime-equinox</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile>  + <property> + <name>user.home</name> + </property> + </activation> + <dependencies> +  + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </profile> + <!-- Name: embedded-testing Descr: Setup for embedded integration testing

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96940 - projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-25 04:36:36 -0500 (Wed, 25 Nov 2009) New Revision: 96940 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java Log: Use refresh in setUp 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 2009-11-25 09:24:18 UTC (rev 96939) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java 2009-11-25 09:36:36 UTC (rev 96940) @@ -24,13 +24,14 @@ //$Id: OSGI39TestCase.java 87103 2009-04-09 22:18:31Z thomas.diesler(a)jboss.com $ import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; 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; +import org.junit.Before; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; @@ -49,39 +50,48 @@ */ public class OSGI39TestCase extends OSGiTest { + private OSGiRuntime runtime; + + @Before + public void setUp() + { + runtime = getDefaultRuntime(); + + OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin(); + packageAdmin.refreshPackages(null); + } + + @After + public void tearDown() + { + runtime.shutdown(); + } + @Test public void testVerifyUnresolved() throws Exception { - OSGiRuntime runtime = getDefaultRuntime(); + OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); + assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); + try { - OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); - assertEquals("Bundle installed", Bundle.INSTALLED, bundleB.getState()); - - try - { - bundleB.start(); - fail("Unresolved constraint expected"); - } - catch (BundleException ex) - { - // expected - } - - OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); - bundleB.start(); - - assertTrue("Bundle resolved", bundleX.getState() <= Bundle.ACTIVE); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - - bundleB.uninstall(); - bundleX.uninstall(); + fail("Unresolved constraint expected"); } - finally + catch (BundleException ex) { - runtime.shutdown(); + // expected } + + OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); + + bundleB.start(); + + assertEquals("Bundle resolved", Bundle.RESOLVED, bundleX.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + + bundleB.uninstall(); + bundleX.uninstall(); } /* @@ -98,84 +108,68 @@ @Test public void testWiringToUninstalled() throws Exception { - OSGiRuntime runtime = getDefaultRuntime(); - try - { - OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); - OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); - - bundleB.start(); - - assertTrue("Bundle resolved", + Bundle.RESOLVED == bundleX.getState() || Bundle.ACTIVE == bundleX.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); - // Uninstall X before B - bundleX.uninstall(); - bundleB.uninstall(); - - // Install B without X - bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); - - bundleB.start(); - - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + bundleB.start(); - bundleB.uninstall(); - } - finally - { - runtime.shutdown(); - } + assertEquals("Bundle resolved", Bundle.RESOLVED, bundleX.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + + // Uninstall X before B + bundleX.uninstall(); + bundleB.uninstall(); + + // Install B without X + bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); + + bundleB.start(); + + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + + bundleB.uninstall(); } @Test public void testWiringToUninstalledPackageAdmin() throws Exception { - OSGiRuntime runtime = getDefaultRuntime(); + OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); + OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); + + bundleB.start(); + + assertEquals("Bundle resolved", Bundle.RESOLVED, bundleX.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + + // Uninstall X before B + bundleX.uninstall(); + bundleB.uninstall(); + + // Forces the update (replacement) or removal of packages exported by the specified bundles. + OSGiPackageAdmin packAdmin = runtime.getPackageAdmin(); + packAdmin.refreshPackages(null); + + // Install B without X + bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); + try { - OSGiBundle bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); - OSGiBundle bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); - bundleB.start(); - - assertTrue("Bundle resolved", + Bundle.RESOLVED == bundleX.getState() || Bundle.ACTIVE == bundleX.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - - // Uninstall X before B - bundleX.uninstall(); - bundleB.uninstall(); - - // Forces the update (replacement) or removal of packages exported by the specified bundles. - OSGiPackageAdmin packAdmin = runtime.getPackageAdmin(); - packAdmin.refreshPackages(null); - - // Install B without X - bundleB = runtime.installBundle("jbosgi39-bundleB.jar"); - - try - { - bundleB.start(); - fail("Unresolved constraint expected"); - } - catch (BundleException ex) - { - // expected - } - - bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); - - bundleB.start(); - - assertTrue("Bundle resolved", + Bundle.RESOLVED == bundleX.getState() || Bundle.ACTIVE == bundleX.getState()); - assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); - - bundleB.uninstall(); - bundleX.uninstall(); + fail("Unresolved constraint expected"); } - finally + catch (BundleException ex) { - runtime.shutdown(); + // expected } + + bundleX = runtime.installBundle("jbosgi39-bundleX.jar"); + + bundleB.start(); + + assertEquals("Bundle resolved", Bundle.RESOLVED, bundleX.getState()); + assertEquals("Bundle active", Bundle.ACTIVE, bundleB.getState()); + + bundleB.uninstall(); + bundleX.uninstall(); } } \ No newline at end of file

14 years, 7 months

1
0
0 / 0

Returned mail: Data format error

by Mail Administrator

This message was not delivered due to the following reason: Your message was not delivered because the destination computer was unreachable within the allowed queue period. The amount of time a message is queued before it is returned depends on local configura- tion parameters. Most likely there is a network problem that prevented delivery, but it is also possible that the computer is turned off, or does not have a mail system running right now. Your message was not delivered within 3 days: Server 122.14.49.195 is not responding. The following recipients did not receive this message: <jboss-osgi-commits(a)lists.jboss.org> Please reply to postmaster(a)lists.jboss.org if you feel this message to be in error.

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96908 - in projects/jboss-osgi/trunk/testsuite: example and 1 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-24 20:03:26 -0500 (Tue, 24 Nov 2009) New Revision: 96908 Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/pom.xml Log: Run examples on equinox - WIP Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-11-25 01:00:42 UTC (rev 96907) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-11-25 01:03:26 UTC (rev 96908) @@ -181,8 +181,12 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> -  <exclude>${target.container.excludes}</exclude> +  + <exclude>org/jboss/test/osgi/example/interceptor/**</exclude> + <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude> + <exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude> +  <exclude>org/jboss/test/osgi/example/blueprint/**</exclude> <exclude>org/jboss/test/osgi/example/http/**</exclude> <exclude>org/jboss/test/osgi/example/interceptor/**</exclude> @@ -239,7 +243,6 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> -  <exclude>org/jboss/test/osgi/example/interceptor/**</exclude> <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-11-25 01:00:42 UTC (rev 96907) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-11-25 01:03:26 UTC (rev 96908) @@ -4,8 +4,10 @@ # $Id$ # -# The OSGiFramework implementation -org.jboss.osgi.spi.framework.impl=org.jboss.osgi.equinox.framework.EquinoxIntegration +# Equinox properties +org.eclipse.osgi/debug=true +org.eclipse.osgi/debug/loader=true +osgi.support.class.certificate=false # Properties to configure the Framework org.osgi.framework.storage=${basedir}/target/osgi-store @@ -38,7 +40,7 @@ # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ - file://${test.archive.directory}/bundles/org.osgi.compendium.jar + file://${test.archive.directory}/bundles/org.eclipse.osgi.services.jar # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-11-25 01:00:42 UTC (rev 96907) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-11-25 01:03:26 UTC (rev 96908) @@ -223,13 +223,6 @@ <artifactId>jboss-osgi-runtime-equinox</artifactId> <scope>provided</scope> </dependency> -  - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> - </dependency> </dependencies> </profile>

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96907 - projects/jboss-osgi/projects/runtime/equinox/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-24 20:00:42 -0500 (Tue, 24 Nov 2009) New Revision: 96907 Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml Log: Add org.eclipse.osgi.util Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-11-25 00:45:40 UTC (rev 96906) +++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-11-25 01:00:42 UTC (rev 96907) @@ -67,6 +67,11 @@ <artifactId>org.eclipse.osgi.services</artifactId> <version>${version.eclipse.equinox}</version> </dependency> + <dependency> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.osgi.util</artifactId> + <version>${version.eclipse.equinox}</version> + </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId>

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96906 - projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle.

by jboss-osgi-commits＠lists.jboss.org

Author: alesj Date: 2009-11-24 19:45:40 -0500 (Tue, 24 Nov 2009) New Revision: 96906 Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java Log: javadocs Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-25 00:31:50 UTC (rev 96905) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-25 00:45:40 UTC (rev 96906) @@ -351,9 +351,15 @@ /** * Get the key for a given plugin + * + * @param plugin the plugin + * @return the class */ private Class<?> getPluginKey(Plugin plugin) { + if (plugin == null) + throw new IllegalArgumentException("Null plugin"); + Class<?> clazz = plugin.getClass(); Class<?> key = getPluginKey(plugin, clazz); @@ -363,6 +369,9 @@ /** * Get the plugin key by scanning the interfaces for the given clazz. + * + * @param plugin the plugin + * @param clazz the class * @return The first interface that extends Plugin. */ private Class<?> getPluginKey(Plugin plugin, Class<?> clazz)

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96905 - projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle.

by jboss-osgi-commits＠lists.jboss.org

Author: alesj Date: 2009-11-24 19:31:50 -0500 (Tue, 24 Nov 2009) New Revision: 96905 Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java Log: No need for more lookups. Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java 2009-11-25 00:31:50 UTC (rev 96904) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java 2009-11-25 00:31:50 UTC (rev 96905) @@ -345,7 +345,8 @@ for (OSGiServiceState service : getUsedContexts(OSGiServiceState.class)) { - while (getUsedByCount(service, this) > 0) + int count = getUsedByCount(service, this); + while (count > 0) { try { @@ -355,6 +356,7 @@ { log.debug("Error ungetting service: " + service, t); } + count--; } service.unregister();

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits November 2009