JBoss-OSGI SVN: r96994 - in projects/jboss-osgi/trunk: testsuite/functional/src/test/java/org/jboss/test/osgi and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-25 15:14:14 -0500 (Wed, 25 Nov 2009)
New Revision: 96994
Added:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java
Removed:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI161TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/bundle/
Modified:
projects/jboss-osgi/trunk/pom.xml
Log:
Use microcontainer 2.0.9-SNAPSHOT
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-11-25 20:10:01 UTC (rev 96993)
+++ projects/jboss-osgi/trunk/pom.xml 2009-11-25 20:14:14 UTC (rev 96994)
@@ -61,7 +61,7 @@
<version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
<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.0.9-SNAPSHOT</version.jboss.osgi.microcontainer>
<version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.runtime.equinox>3.5.1-SNAPSHOT</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212 (from rev 96973, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161)
Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI161TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGI161TestCase.java 2009-11-25 16:47:45 UTC (rev 96973)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI161TestCase.java 2009-11-25 20:14:14 UTC (rev 96994)
@@ -1,64 +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.jbosgi161;
-
-//$Id:$
-
-import static org.junit.Assert.assertEquals;
-
-import org.jboss.osgi.spi.capability.LogServiceCapability;
-import org.jboss.osgi.testing.OSGiBundle;
-import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiTest;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-
-/**
- * [JBOSGI-161] Cannot use commons logging
- *
- * https://jira.jboss.org/jira/browse/JBOSGI-161
- *
- * @author thomas.diesler(a)jboss.com
- * @since 07-Oct-2009
- */
-public class OSGI161TestCase extends OSGiTest
-{
- @Test
- public void testLogging() throws Exception
- {
- OSGiRuntime runtime = getDefaultRuntime();
- try
- {
- runtime.addCapability(new LogServiceCapability());
-
- OSGiBundle bundleA = runtime.installBundle("jbosgi161-bundle.jar");
- bundleA.start();
-
- assertEquals("Bundle active", Bundle.ACTIVE, bundleA.getState());
- bundleA.uninstall();
- }
- finally
- {
- runtime.shutdown();
- }
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java (from rev 96973, projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGI161TestCase.java)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java 2009-11-25 20:14:14 UTC (rev 96994)
@@ -0,0 +1,68 @@
+/*
+ * 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.microcontainer.MicrocontainerCapability;
+import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.osgi.testing.OSGiPackageAdmin;
+import org.jboss.osgi.testing.OSGiRuntime;
+import org.jboss.osgi.testing.OSGiServiceReference;
+import org.jboss.osgi.testing.OSGiTest;
+import org.junit.Test;
+
+/**
+ * [JBOSGI-212] Cannot refresh Microcontainer service
+ *
+ * https://jira.jboss.org/jira/browse/JBOSGI-212
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 25-Nov-2009
+ */
+public class OSGI212TestCase extends OSGiTest
+{
+ @Test
+ public void testLogging() throws Exception
+ {
+ OSGiRuntime runtime = getDefaultRuntime();
+ try
+ {
+ runtime.addCapability(new MicrocontainerCapability());
+
+ OSGiServiceReference sref = runtime.getServiceReference(MicrocontainerService.class.getName());
+ assertNotNull("MicrocontainerService available", sref);
+
+ OSGiPackageAdmin packageAdmin = runtime.getPackageAdmin();
+ packageAdmin.refreshPackages(null);
+
+ sref = runtime.getServiceReference(MicrocontainerService.class.getName());
+ assertNotNull("MicrocontainerService still available", sref);
+ }
+ finally
+ {
+ runtime.shutdown();
+ }
+ }
+}
\ No newline at end of file
14 years, 7 months
JBoss-OSGI SVN: r96993 - in projects/jboss-osgi/projects/bundles/microcontainer/trunk: src/main/java/org/jboss/osgi/microcontainer and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-25 15:10:01 -0500 (Wed, 25 Nov 2009)
New Revision: 96993
Modified:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java
Log:
Fix MicrocontainerCapability to include XB and JMX
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-25 20:06:05 UTC (rev 96992)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-25 20:10:01 UTC (rev 96993)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-microcontainer</artifactId>
<packaging>bundle</packaging>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -43,6 +43,7 @@
<version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
<version.jboss.osgi.runtime.deployers>1.0.2</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
+ <version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx>
<version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
<version.osgi>4.2.0</version.osgi>
@@ -57,6 +58,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
<version>${version.jboss.osgi.xml.binding}</version>
</dependency>
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-11-25 20:06:05 UTC (rev 96992)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-11-25 20:10:01 UTC (rev 96993)
@@ -23,8 +23,9 @@
//$Id$
+import org.jboss.osgi.jbossxb.XMLBindingCapability;
+import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.spi.capability.Capability;
-import org.jboss.osgi.spi.capability.CompendiumCapability;
import org.jboss.osgi.spi.service.MicrocontainerService;
/**
@@ -44,7 +45,8 @@
{
super(MicrocontainerService.class.getName());
- addDependency(new CompendiumCapability());
+ addDependency(new XMLBindingCapability());
+ addDependency(new JMXCapability());
addBundle("bundles/jboss-osgi-microcontainer.jar");
}
14 years, 7 months
JBoss-OSGI SVN: r96991 - projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-25 14:55:13 -0500 (Wed, 25 Nov 2009)
New Revision: 96991
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
Log:
Improve deploy exception msg
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2009-11-25 19:50:54 UTC (rev 96990)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2009-11-25 19:55:13 UTC (rev 96991)
@@ -357,6 +357,9 @@
}
catch (Exception ex)
{
+ if (arg.getClass().isArray())
+ arg = Arrays.asList((Object[])arg);
+
throw new BundleException("Cannot " + method + ": " + arg, ex);
}
}
14 years, 7 months
JBoss-OSGI SVN: r96981 - in projects/jboss-osgi/trunk/testsuite: functional/src/test/resources and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-25 12:48:09 -0500 (Wed, 25 Nov 2009)
New Revision: 96981
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
Log:
Fix bootdelegation for embedded felix
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-11-25 17:37:18 UTC (rev 96980)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-11-25 17:48:09 UTC (rev 96981)
@@ -4,15 +4,18 @@
# $Id$
#
+# Felix config properties
+# felix.bootdelegation.implicit=false
+
# Properties to configure the Framework
org.osgi.framework.storage=${basedir}/target/osgi-store
org.osgi.framework.storage.clean=onFirstInit
# An instance of Logger that the framework uses as its default logger
-felix.log.logger.instance=org.jboss.osgi.felix.FelixLogger
+# felix.log.logger.instance=org.jboss.osgi.felix.FelixLogger, org.apache.xerces.jaxp
# Framework bootdelegation
-org.osgi.framework.bootdelegation=com.yourkit.runtime
+org.osgi.framework.bootdelegation=sun.reflect
# Extra System Packages
org.osgi.framework.system.packages.extra=\
@@ -35,11 +38,11 @@
org.jboss.virtual.plugins.vfs.helpers, \
org.jboss.virtual.protocol, \
org.osgi.framework;version=1.5
+
# 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
-
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-11-25 17:37:18 UTC (rev 96980)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-11-25 17:48:09 UTC (rev 96981)
@@ -11,6 +11,9 @@
org.osgi.framework.storage=${basedir}/target/osgi-store
org.osgi.framework.storage.clean=onFirstInit
+# Framework bootdelegation
+org.osgi.framework.bootdelegation=sun.reflect
+
# Extra System Packages
org.osgi.framework.system.packages.extra=\
org.apache.log4j;version=1.2, \
@@ -36,4 +39,4 @@
org.jboss.virtual.plugins.vfs.helpers, \
org.jboss.virtual.protocol, \
org.osgi.framework;version=1.5
-
+
\ No newline at end of file
14 years, 7 months
JBoss-OSGI SVN: r96980 - in projects/jboss-osgi/trunk/testsuite/functional: src/test/java/org/jboss/test/osgi/jbosgi142 and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-25 12:37:18 -0500 (Wed, 25 Nov 2009)
New Revision: 96980
Modified:
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGI142TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
Log:
Fix all functional tests in embedded felix
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 17:30:23 UTC (rev 96979)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 17:37:18 UTC (rev 96980)
@@ -196,9 +196,6 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
- <!-- TODO investigate felix test failures -->
- <exclude>org/jboss/test/osgi/jbosgi37/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi142/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGI142TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGI142TestCase.java 2009-11-25 17:30:23 UTC (rev 96979)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGI142TestCase.java 2009-11-25 17:37:18 UTC (rev 96980)
@@ -28,7 +28,7 @@
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
-import org.jboss.osgi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiTest;
import org.jboss.test.osgi.jbosgi142.bundleA.BeanA;
import org.jboss.test.osgi.jbosgi142.bundleB.BeanB;
import org.jboss.test.osgi.jbosgi142.bundleX.BeanX;
@@ -51,42 +51,47 @@
* @author thomas.diesler(a)jboss.com
* @since 28-Aug-2009
*/
-public class OSGI142TestCase
+public class OSGI142TestCase extends OSGiTest
{
@Test
public void testLoadClass() throws Exception
{
OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
Framework framework = bootProvider.getFramework();
- framework.start();
-
- BundleContext sysContext = framework.getBundleContext();
- Bundle bundleX = sysContext.installBundle(getBundleLocation("jbosgi142-bundleX.jar"));
- bundleX.start();
-
- assertBundleLoadClass(bundleX, BeanX.class, true);
-
- Bundle bundleA = sysContext.installBundle(getBundleLocation("jbosgi142-bundleA.jar"));
- bundleA.start();
-
- assertBundleLoadClass(bundleA, BeanA.class, true);
-
- Bundle bundleB = sysContext.installBundle(getBundleLocation("jbosgi142-bundleB.jar"));
- bundleB.start();
-
- assertBundleLoadClass(bundleB, BeanB.class, true);
-
- assertBundleLoadClass(bundleA, BeanX.class, true);
- assertBundleLoadClass(bundleB, BeanX.class, true);
-
- assertBundleLoadClass(bundleX, BeanA.class, false);
- assertBundleLoadClass(bundleX, BeanB.class, false);
-
- assertBundleLoadClass(bundleA, BeanB.class, false);
- assertBundleLoadClass(bundleB, BeanA.class, false);
-
- framework.stop();
- framework.waitForStop(1000);
+ try
+ {
+ framework.start();
+
+ BundleContext sysContext = framework.getBundleContext();
+ Bundle bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi142-bundleX.jar").toExternalForm());
+ bundleX.start();
+
+ assertBundleLoadClass(bundleX, BeanX.class, true);
+
+ Bundle bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi142-bundleA.jar").toExternalForm());
+ bundleA.start();
+
+ assertBundleLoadClass(bundleA, BeanA.class, true);
+
+ Bundle bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi142-bundleB.jar").toExternalForm());
+ bundleB.start();
+
+ assertBundleLoadClass(bundleB, BeanB.class, true);
+
+ assertBundleLoadClass(bundleA, BeanX.class, true);
+ assertBundleLoadClass(bundleB, BeanX.class, true);
+
+ assertBundleLoadClass(bundleX, BeanA.class, false);
+ assertBundleLoadClass(bundleX, BeanB.class, false);
+
+ assertBundleLoadClass(bundleA, BeanB.class, false);
+ assertBundleLoadClass(bundleB, BeanA.class, false);
+ }
+ finally
+ {
+ framework.stop();
+ framework.waitForStop(1000);
+ }
}
private void assertBundleLoadClass(Bundle bundle, Class<?> expClazz, boolean success)
@@ -112,9 +117,4 @@
fail("Unexpected ClassNotFoundException for: " + message);
}
}
-
- private String getBundleLocation(String jarname)
- {
- return new OSGiTestHelper().getTestArchiveURL(jarname).toExternalForm();
- }
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-11-25 17:30:23 UTC (rev 96979)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-11-25 17:37:18 UTC (rev 96980)
@@ -4,8 +4,8 @@
# $Id$
#
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+# Felix config properties
+felix.bootdelegation.implicit=false
# Properties to configure the Framework
org.osgi.framework.storage=${basedir}/target/osgi-store
14 years, 7 months
JBoss-OSGI SVN: r96969 - 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-25 11:17:37 -0500 (Wed, 25 Nov 2009)
New Revision: 96969
Modified:
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
Log:
[JBOSGI-141]; remove the need for additional service registry, controller keeps it already.
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 16:11:46 UTC (rev 96968)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-25 16:17:37 UTC (rev 96969)
@@ -62,6 +62,7 @@
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.deployer.Deployment;
import org.jboss.osgi.framework.metadata.OSGiMetaData;
@@ -76,7 +77,6 @@
import org.jboss.osgi.framework.plugins.ServicePlugin;
import org.jboss.osgi.framework.util.NoFilter;
import static org.jboss.osgi.spi.OSGiConstants.PROPERTY_AUTO_START;
-import org.jboss.util.collection.ConcurrentSet;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VFSUtils;
import org.jboss.virtual.VirtualFile;
@@ -133,9 +133,6 @@
/** The bundles by id */
private List<AbstractBundleState> bundles = new CopyOnWriteArrayList<AbstractBundleState>();
- /** The registered services */
- private Set<OSGiServiceState> registeredServices = new ConcurrentSet<OSGiServiceState>();
-
/** The kernel */
private Kernel kernel;
@@ -1056,30 +1053,51 @@
*/
Collection<OSGiServiceState> getServices(AbstractBundleState bundle, String clazz, Filter filter, boolean checkAssignable)
{
- if (filter == null)
- filter = NoFilter.INSTANCE;
+ Set<ControllerContext> contexts;
+ KernelController controller = kernel.getController();
- if (registeredServices.isEmpty())
- return null;
-
// Don't check assignabilty for the system bundle
- if (bundle.getBundleId() == 0)
+ boolean isSystemBundle = (bundle.getBundleId() == 0);
+ if (isSystemBundle)
checkAssignable = false;
+ // TODO - a bit slow for system bundle
+ if (clazz != null && isSystemBundle == false)
+ {
+ Class<?> type = loadClass(bundle, clazz);
+ if (type == null)
+ return null;
+
+ contexts = controller.getInstantiatedContexts(type);
+ }
+ else
+ {
+ contexts = controller.getContextsByState(ControllerState.INSTALLED);
+ }
+
+ if (contexts == null || contexts.isEmpty())
+ return null;
+
+ if (filter == null)
+ filter = NoFilter.INSTANCE;
+
// review: optimise this, e.g. index by class
// Use a sorted set to order services according to spec
Set<OSGiServiceState> result = new TreeSet<OSGiServiceState>(ServiceComparator.INSTANCE);
- for (OSGiServiceState service : registeredServices)
+ for (ControllerContext context : contexts)
{
- // Check the state, filter and permission
- if (service.isUnregistered() == false && filter.match(service) && service.hasPermission())
+ if (context instanceof OSGiServiceState)
{
- // Check any passed class matches
- if (clazz == null || service.matchClass(clazz))
+ OSGiServiceState service = OSGiServiceState.class.cast(context);
+ // Check the state, filter and permission
+ if (service.isUnregistered() == false && filter.match(service) && service.hasPermission())
{
- // Check the assignability
- if (checkAssignable == false || service.isAssignable(bundle))
- result.add(service);
+ if (clazz == null || isSystemBundle == false || service.matchClass(clazz))
+ {
+ // Check the assignability
+ if (checkAssignable == false || service.isAssignable(bundle))
+ result.add(service);
+ }
}
}
}
@@ -1087,6 +1105,26 @@
}
/**
+ * Load class from a bundle.
+ * If it cannot be loaded, return null.
+ *
+ * @param bundle the bundle to load from
+ * @param clazz the class
+ * @return class or null
+ */
+ private Class<?> loadClass(Bundle bundle, String clazz)
+ {
+ try
+ {
+ return bundle.loadClass(clazz);
+ }
+ catch (ClassNotFoundException e)
+ {
+ return null;
+ }
+ }
+
+ /**
* Get service reference
*
* @param bundle the referencing bundle
@@ -1178,7 +1216,6 @@
{
OSGiServiceState result = new OSGiServiceState(bundleState, clazzes, service, properties);
result.internalRegister();
- registeredServices.add(result);
try
{
@@ -1188,10 +1225,7 @@
catch (Throwable t)
{
fireError(bundleState, "installing service to MC in", t);
-
- registeredServices.remove(result);
result.internalUnregister();
-
throw new RuntimeException(t);
}
@@ -1214,7 +1248,6 @@
FrameworkEventsPlugin plugin = getPlugin(FrameworkEventsPlugin.class);
plugin.fireServiceEvent(serviceState.getBundleState(), ServiceEvent.UNREGISTERING, serviceState);
- registeredServices.remove(serviceState);
serviceState.internalUnregister();
}
14 years, 7 months
JBoss-OSGI SVN: r96952 - projects/jboss-osgi/trunk/testsuite/functional.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-25 09:30:52 -0500 (Wed, 25 Nov 2009)
New Revision: 96952
Modified:
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
TODO investigate felix test failures
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 14:28:07 UTC (rev 96951)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 14:30:52 UTC (rev 96952)
@@ -196,6 +196,9 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
+ <!-- TODO investigate felix test failures -->
+ <exclude>org/jboss/test/osgi/jbosgi37/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi142/**</exclude>
</excludes>
</configuration>
</plugin>
14 years, 7 months
JBoss-OSGI SVN: r96951 - in projects/jboss-osgi/trunk: testsuite/functional and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-25 09:28:07 -0500 (Wed, 25 Nov 2009)
New Revision: 96951
Added:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
Log:
Document functional test failures on embedded equinox
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/pom.xml 2009-11-25 14:28:07 UTC (rev 96951)
@@ -66,7 +66,7 @@
<version.jboss.osgi.runtime.equinox>3.5.1-SNAPSHOT</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.2-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.webapp>0.7.2-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-25 14:28:07 UTC (rev 96951)
@@ -146,22 +146,10 @@
<configuration>
<excludes>
<exclude>${target.container.excludes}</exclude>
- <exclude>org/jboss/test/osgi/capabilities/**</exclude>
- <exclude>org/jboss/test/osgi/jbossas/jbosgi36/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi37/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi38/**</exclude>
+ <!-- [JBOSGI-206] Wire to an already uninstalled bundle -->
<exclude>org/jboss/test/osgi/jbosgi39/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi41/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi92/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi99/**</exclude>
+ <!-- [JBOSGI-108] Investigate statics on PackageAdmin.refresh -->
<exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi112/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi142/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi151/**</exclude>
- <exclude>org/jboss/test/osgi/jbosgi161/**</exclude>
- <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
- <exclude>org/jboss/test/osgi/service/startlevel/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2009-11-25 14:28:07 UTC (rev 96951)
@@ -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>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java 2009-11-25 14:28:07 UTC (rev 96951)
@@ -68,14 +68,21 @@
runtime.addCapability(new XMLParserCapability());
- OSGiServiceReference saxRef = runtime.getServiceReference(SAXParserFactory.class.getName());
- assertNotNull("SAXParserFactory registered", saxRef);
+ String filter = "(" + XMLParserCapability.PARSER_PROVIDER + "=" + XMLParserCapability.PROVIDER_JBOSS_OSGI + ")";
+ OSGiServiceReference[] saxRefs = runtime.getServiceReferences(SAXParserFactory.class.getName(), filter);
+ assertNotNull("SAXParserFactory registered", saxRefs);
+ assertEquals("SAXParserFactory registered", 1, saxRefs.length);
+
+ OSGiServiceReference saxRef = saxRefs[0];
assertEquals("namespaceAware", Boolean.TRUE, saxRef.getProperty("parser.namespaceAware"));
assertEquals("validating", Boolean.TRUE, saxRef.getProperty("parser.validating"));
assertEquals("xincludeAware", Boolean.TRUE, saxRef.getProperty("parser.xincludeAware"));
- OSGiServiceReference domRef = runtime.getServiceReference(DocumentBuilderFactory.class.getName());
- assertNotNull("DocumentBuilderFactory registered", domRef);
+ OSGiServiceReference[] domRefs = runtime.getServiceReferences(DocumentBuilderFactory.class.getName(), filter);
+ assertNotNull("DocumentBuilderFactory registered", domRefs);
+ assertEquals("DocumentBuilderFactory registered", 1, domRefs.length);
+
+ OSGiServiceReference domRef = domRefs[0];
assertEquals("namespaceAware", Boolean.TRUE, domRef.getProperty("parser.namespaceAware"));
assertEquals("validating", Boolean.TRUE, domRef.getProperty("parser.validating"));
assertEquals("xincludeAware", Boolean.TRUE, domRef.getProperty("parser.xincludeAware"));
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java 2009-11-25 14:28:07 UTC (rev 96951)
@@ -61,12 +61,12 @@
try
{
BundleContext sysContext = framework.getBundleContext();
- Bundle bundleX = sysContext.installBundle(getTestArchivePath("jbosgi143-bundleX.jar"));
+ Bundle bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi143-bundleX.jar").toExternalForm());
bundleX.start();
assertBundleLoadClass(bundleX, BeanX.class, true);
- Bundle bundleA = sysContext.installBundle(getTestArchivePath("jbosgi143-bundleA.jar"));
+ Bundle bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi143-bundleA.jar").toExternalForm());
bundleA.start();
assertBundleLoadClass(bundleA, BeanA.class, true);
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-11-25 14:28:07 UTC (rev 96951)
@@ -89,10 +89,10 @@
{
BundleContext sysContext = framework.getBundleContext();
- Bundle bundleA = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleA.jar"));
+ Bundle bundleA = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleA.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleA.getState());
- Bundle bundleB = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleB.jar"));
+ Bundle bundleB = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleB.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleB.getState());
bundleB.start();
@@ -116,10 +116,10 @@
{
BundleContext sysContext = framework.getBundleContext();
- Bundle bundleC = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleC.jar"));
+ Bundle bundleC = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleC.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleC.getState());
- Bundle bundleD = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleD.jar"));
+ Bundle bundleD = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleD.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleD.getState());
bundleD.start();
@@ -143,10 +143,10 @@
{
BundleContext sysContext = framework.getBundleContext();
- Bundle bundleD = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleD.jar"));
+ Bundle bundleD = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleD.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleD.getState());
- Bundle bundleC = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleC.jar"));
+ Bundle bundleC = sysContext.installBundle(getTestArchiveURL("jbosgi151-bundleC.jar").toExternalForm());
assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleC.getState());
bundleD.start();
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-11-25 14:28:07 UTC (rev 96951)
@@ -79,8 +79,16 @@
{
String storageRoot = bundleA.getProperty("org.osgi.framework.storage");
assertNotNull("Storage dir not null", storageRoot);
-
- File dataFile = new File(storageRoot + "/bundle" + bundleA.getBundleId() + "/data/" + filename);
+
+ File dataFile;
+ if ("equinox".equals(getFramework()))
+ {
+ dataFile = new File(storageRoot + "/org.eclipse.osgi/bundles/" + bundleA.getBundleId() + "/data/" + filename);
+ }
+ else
+ {
+ dataFile = new File(storageRoot + "/bundle" + bundleA.getBundleId() + "/data/" + filename);
+ }
return dataFile;
}
}
\ No newline at end of file
Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/equinox-debug.properties 2009-11-25 14:28:07 UTC (rev 96951)
@@ -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/functional/src/test/resources/equinox-debug.properties
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-11-25 14:00:49 UTC (rev 96950)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-11-25 14:28:07 UTC (rev 96951)
@@ -4,16 +4,15 @@
# $Id$
#
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.equinox.framework.EquinoxIntegration
+# Equinox properties
+# osgi.debug=target/test-classes/equinox-debug.properties
# Properties to configure the Framework
org.osgi.framework.storage=${basedir}/target/osgi-store
org.osgi.framework.storage.clean=onFirstInit
# Extra System Packages
-org.osgi.framework.system.packages=\
- javax.management, \
+org.osgi.framework.system.packages.extra=\
org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
@@ -26,7 +25,6 @@
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.osgi.testing, \
org.jboss.virtual, \
org.jboss.virtual.plugins.registry, \
org.jboss.virtual.plugins.context.jar, \
@@ -36,5 +34,5 @@
org.jboss.util.id, \
org.jboss.util.threadpool, \
org.jboss.util.propertyeditor, \
- org.osgi.framework;version\=1.4
+ org.osgi.framework;version=1.4
14 years, 7 months
JBoss-OSGI SVN: r96950 - in projects/jboss-osgi/projects/spi/trunk: src/main/java/org/jboss/osgi/spi/capability and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-11-25 09:00:49 -0500 (Wed, 25 Nov 2009)
New Revision: 96950
Modified:
projects/jboss-osgi/projects/spi/trunk/pom.xml
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java
Log:
Add org.eclipse.osgi.utils to compendium capability
Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-11-25 13:54:08 UTC (rev 96949)
+++ projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-11-25 14:00:49 UTC (rev 96950)
@@ -20,7 +20,7 @@
<artifactId>jboss-osgi-spi</artifactId>
<packaging>jar</packaging>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<!-- Parent -->
<parent>
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java 2009-11-25 13:54:08 UTC (rev 96949)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/CompendiumCapability.java 2009-11-25 14:00:49 UTC (rev 96950)
@@ -39,9 +39,32 @@
{
super(null);
- if ("equinox".equals(System.getProperty("framework")))
+ if (isFrameworkEquinox())
+ {
addBundle("bundles/org.eclipse.osgi.services.jar");
+ addBundle("bundles/org.eclipse.osgi.util.jar");
+ }
else
+ {
addBundle("bundles/org.osgi.compendium.jar");
+ }
}
+
+ private boolean isFrameworkEquinox()
+ {
+ boolean isEquinox = "equinox".equals(System.getProperty("framework"));
+ if (isEquinox == false)
+ {
+ try
+ {
+ getClass().getClassLoader().loadClass("org.jboss.osgi.equinox.EquinoxBootstrapProvider");
+ isEquinox = true;
+ }
+ catch (ClassNotFoundException e)
+ {
+ // ignore
+ }
+ }
+ return isEquinox;
+ }
}
\ No newline at end of file
14 years, 7 months