JBoss-OSGI SVN: r94423 - in projects/jboss-osgi/trunk: distribution and 12 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-06 12:19:47 -0400 (Tue, 06 Oct 2009)
New Revision: 94423
Added:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/http/example-http.bnd
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml
Log:
[JBOSGI-160] Use Pax Web instead of Apache Http-Service
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-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -224,7 +224,7 @@
<include name="jboss-osgi-jndi.jar" />
<!-- web -->
<include name="jboss-osgi-webconsole.jar" />
- <include name="org.apache.felix.http.jetty.jar" />
+ <include name="pax-web-jetty-bundle.jar" />
</fileset>
<!-- Server All -->
@@ -236,7 +236,7 @@
<include name="jboss-osgi-jndi.jar" />
<!-- web -->
<include name="jboss-osgi-webconsole.jar" />
- <include name="org.apache.felix.http.jetty.jar" />
+ <include name="pax-web-jetty-bundle.jar" />
<!-- all -->
<include name="jboss-osgi-apache-xerces.jar" />
<include name="jboss-osgi-blueprint.jar" />
@@ -366,7 +366,7 @@
<include name="jboss-osgi-jndi.jar" />
<include name="jboss-osgi-webconsole.jar" />
<include name="jboss-osgi-xml-binding.jar" />
- <include name="org.apache.felix.http.jetty.jar" />
+ <include name="pax-web-jetty-bundle.jar" />
<include name="org.apache.felix.log.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -58,7 +58,6 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
@@ -83,7 +82,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.jboss.osgi.apache.xerces}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -100,7 +98,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
- <version>${version.jboss.osgi.blueprint}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -117,7 +114,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -134,7 +130,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common.core}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -146,7 +141,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-hotdeploy</artifactId>
- <version>${version.jboss.osgi.hotdeploy}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -158,7 +152,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -175,7 +168,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -192,7 +184,6 @@
<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>
@@ -209,7 +200,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -226,7 +216,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-microcontainer</artifactId>
- <version>${version.jboss.osgi.microcontainer}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -243,7 +232,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webconsole</artifactId>
- <version>${version.jboss.osgi.webconsole}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -260,7 +248,6 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -279,7 +266,6 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.runtime.deployers}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
@@ -290,7 +276,6 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-runtime-jbossas</artifactId>
- <version>${version.jboss.osgi.runtime.jbossas}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
@@ -304,7 +289,6 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-runtime-equinox</artifactId>
- <version>${version.jboss.osgi.runtime.equinox}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
@@ -317,7 +301,6 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
@@ -328,44 +311,37 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>${version.apache.felix.configadmin}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${version.apache.felix.http.jetty}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
- <version>${version.apache.felix.log}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>${version.apache.felix.metatype}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.apache.felix.core}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.apache.felix.core}</version>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty-bundle</artifactId>
+ </dependency>
<!-- JBossMC Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-framework</artifactId>
- <version>${version.jboss.osgi.runtime.jbossmc}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-framework</artifactId>
- <version>${version.jboss.osgi.runtime.jbossmc}</version>
+ <version>${version.jboss.osgi.framework}</version>
<classifier>sources</classifier>
</dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -39,7 +39,6 @@
<version.aqute.bnd>0.0.356</version.aqute.bnd>
<version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
<version.apache.felix.core>1.4.0</version.apache.felix.core>
- <version.apache.felix.http.jetty>1.0.1</version.apache.felix.http.jetty>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
<version.izpack>4.3.1</version.izpack>
@@ -47,7 +46,7 @@
<version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.1</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.runtime.jbossmc>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
+ <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework>
<version.jboss.osgi.hotdeploy>1.0.1</version.jboss.osgi.hotdeploy>
<version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
@@ -58,9 +57,10 @@
<version.jboss.osgi.runtime.equinox>3.5</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.1</version.jboss.osgi.runtime.jbossas>
- <version.jboss.osgi.spi>1.0.1</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.2-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.webconsole>1.0.1</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
+ <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web>
<version.osgi>r4v42</version.osgi>
</properties>
@@ -176,11 +176,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${version.apache.felix.http.jetty}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
<version>${version.apache.felix.log}</version>
</dependency>
@@ -204,9 +199,21 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-framework</artifactId>
- <version>${version.jboss.osgi.runtime.jbossmc}</version>
+ <version>${version.jboss.osgi.framework}</version>
</dependency>
+ <!-- Ops4j -->
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-api</artifactId>
+ <version>${version.ops4j.pax.web}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty-bundle</artifactId>
+ <version>${version.ops4j.pax.web}</version>
+ </dependency>
+
<!-- org.osgi -->
<dependency>
<groupId>org.osgi</groupId>
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -12,9 +12,11 @@
<!-- $Id: pom.xml 91197 2009-07-14 09:48:24Z thomas.diesler(a)jboss.com $ -->
<!--
- Set these VM properties in your IDE debugger -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target}
- -Djboss.osgi.framework.properties=jboss-osgi-felix.properties -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
- -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs
+ Set these VM properties in your IDE debugger
+
+ -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target}
+ -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
+ -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -26,9 +26,9 @@
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
- <include>*:org.apache.felix.http.jetty:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
+ <include>*:pax-web-jetty-bundle:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-10-06 16:19:47 UTC (rev 94423)
@@ -30,7 +30,7 @@
import java.io.InputStreamReader;
import java.net.URL;
-import org.jboss.osgi.spi.capability.HttpCapability;
+import org.jboss.osgi.spi.capability.HttpServiceCapability;
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiServiceReference;
@@ -54,7 +54,7 @@
public static void setUpClass() throws Exception
{
runtime = new OSGiTestHelper().getDefaultRuntime();
- runtime.addCapability(new HttpCapability());
+ runtime.addCapability(new HttpServiceCapability());
// Allow 10s for the HttpService to become available
long timeout = 50;
Added: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-06 16:19:47 UTC (rev 94423)
@@ -0,0 +1,64 @@
+/*
+ * 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.example.webapp;
+
+//$Id: HttpServiceRemoteTestCase.java 87330 2009-04-15 10:57:57Z thomas.diesler(a)jboss.com $
+
+import org.jboss.osgi.spi.capability.HttpServiceCapability;
+import org.jboss.osgi.spi.testing.OSGiBundle;
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+import org.jboss.osgi.spi.testing.OSGiTestHelper;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * A test that deployes a bundle that containes a HttpServlet
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Oct-2009
+ */
+public class WebAppTestCase
+{
+ private static OSGiRuntime runtime;
+
+ @BeforeClass
+ public static void setUpClass() throws Exception
+ {
+ runtime = new OSGiTestHelper().getDefaultRuntime();
+ runtime.addCapability(new HttpServiceCapability());
+
+ OSGiBundle bundle = runtime.installBundle("example-http.jar");
+ bundle.start();
+ }
+
+ @AfterClass
+ public static void tearDownClass() throws Exception
+ {
+ runtime.shutdown();
+ }
+
+ @Test
+ public void testServletAccess() throws Exception
+ {
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -68,6 +68,7 @@
</bean>
<bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <property name="synchronous">true</property>
</bean>
<bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/http/example-http.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/http/example-http.bnd 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/http/example-http.bnd 2009-10-06 16:19:47 UTC (rev 94423)
@@ -3,4 +3,5 @@
Bundle-SymbolicName: example-http
Bundle-Activator: org.jboss.test.osgi.example.http.bundle.HttpExampleActivator
Export-Package: org.jboss.test.osgi.example.http.bundle
+Import-Package: javax.servlet, javax.servlet.http, org.osgi.framework, org.osgi.service.http, org.osgi.service.startlevel, org.osgi.util.tracker, org.ops4j.pax.web.service
Include-Resource: res/message.txt=message.txt
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -14,10 +14,9 @@
<!--
Set these VM properties in your IDE debugger
- -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-functional/target}
- -Djboss.osgi.framework.properties=jboss-osgi-felix.properties
- -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
- -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-functional/target}/test-libs
+ -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-functional/target}
+ -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
+ -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-functional/target}/test-libs
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -26,9 +26,9 @@
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
- <include>*:org.apache.felix.http.jetty:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
+ <include>*:pax-web-jetty-bundle:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ====================================================================== -->
+ <!-- ======================================================================
+-->
<!-- -->
<!-- JBoss, the OpenSource J2EE webOS -->
<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
<!-- -->
- <!-- ====================================================================== -->
+ <!-- ======================================================================
+-->
- <!-- $Id$ -->
+ <!-- $Id$
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -67,21 +70,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</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>
@@ -135,6 +123,16 @@
<artifactId>jboss-osgi-jaxb</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty-bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-10-06 16:19:06 UTC (rev 94422)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-10-06 16:19:47 UTC (rev 94423)
@@ -35,9 +35,9 @@
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
- <include>*:org.apache.felix.http.jetty:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
+ <include>*:pax-web-jetty-bundle:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
16 years, 2 months
JBoss-OSGI SVN: r94422 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-06 12:19:06 -0400 (Tue, 06 Oct 2009)
New Revision: 94422
Added:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java
Removed:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java
Log:
[JBOSGI-160] Use Pax Web instead of Apache Http-Service
Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java 2009-10-06 16:13:42 UTC (rev 94421)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java 2009-10-06 16:19:06 UTC (rev 94422)
@@ -1,56 +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.osgi.spi.capability;
-
-//$Id$
-
-import org.jboss.osgi.spi.testing.OSGiRuntime;
-import org.osgi.service.http.HttpService;
-
-/**
- * Adds the {@link HttpService} capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link HttpService} is already registered.
- *
- * Installed bundles: org.apache.felix.http.jetty.jar
- *
- * Default properties set by this capability
- *
- * <table>
- * <tr><th>Property</th><th>Value</th></tr>
- * <tr><td>org.osgi.service.http.port</td><td>8090</td></tr>
- * </table>
- *
- * @author thomas.diesler(a)jboss.com
- * @since 05-May-2009
- */
-public class HttpCapability extends Capability
-{
- public HttpCapability()
- {
- super(HttpService.class.getName());
- addSystemProperty("org.osgi.service.http.port", "8090");
-
- addBundle("bundles/org.apache.felix.http.jetty.jar");
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java (from rev 94412, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java)
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java (rev 0)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java 2009-10-06 16:19:06 UTC (rev 94422)
@@ -0,0 +1,56 @@
+/*
+ * 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.osgi.spi.capability;
+
+//$Id$
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+import org.osgi.service.http.HttpService;
+
+/**
+ * Adds the {@link HttpService} capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link HttpService} is already registered.
+ *
+ * Installed bundles: pax-web-jetty-bundle.jar
+ *
+ * Default properties set by this capability
+ *
+ * <table>
+ * <tr><th>Property</th><th>Value</th></tr>
+ * <tr><td>org.osgi.service.http.port</td><td>8090</td></tr>
+ * </table>
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class HttpServiceCapability extends Capability
+{
+ public HttpServiceCapability()
+ {
+ super(HttpService.class.getName());
+ addSystemProperty("org.osgi.service.http.port", "8090");
+
+ addBundle("bundles/pax-web-jetty-bundle.jar");
+ }
+}
\ No newline at end of file
16 years, 2 months
JBoss-OSGI SVN: r94421 - projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-06 12:13:42 -0400 (Tue, 06 Oct 2009)
New Revision: 94421
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java
Log:
Add option for synchronous event delivery
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2009-10-06 15:39:12 UTC (rev 94420)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2009-10-06 16:13:42 UTC (rev 94421)
@@ -65,6 +65,9 @@
/** The executor service */
private ExecutorService executorService;
+
+ /** True for synchronous event delivery */
+ private boolean synchronous;
/** The bundle listeners */
private final Map<Bundle, List<BundleListener>> bundleListeners = new ConcurrentHashMap<Bundle, List<BundleListener>>();
@@ -82,6 +85,11 @@
this.executorService = Executors.newCachedThreadPool();
}
+ public void setSynchronous(boolean synchronous)
+ {
+ this.synchronous = synchronous;
+ }
+
public void addBundleListener(Bundle bundle, BundleListener listener)
{
if (listener == null)
@@ -298,7 +306,7 @@
};
// Fire the event in a runnable
- executorService.execute(runnable);
+ fireEvent(runnable, synchronous);
}
public void fireFrameworkEvent(final Bundle bundle, final int type, final Throwable throwable)
@@ -358,7 +366,7 @@
};
// Fire the event in a runnable
- executorService.execute(runnable);
+ fireEvent(runnable, synchronous);
}
public void fireServiceEvent(Bundle bundle, int type, final OSGiServiceState service)
@@ -415,7 +423,7 @@
};
// Fire the event in a runnable
- executorService.execute(runnable);
+ fireEvent(runnable, synchronous);
}
private Bundle assertBundle(Bundle bundle)
@@ -430,6 +438,18 @@
return bundle;
}
+ private void fireEvent(Runnable runnable, boolean synchronous)
+ {
+ if (synchronous)
+ {
+ runnable.run();
+ }
+ else
+ {
+ executorService.execute(runnable);
+ }
+ }
+
/**
* Filter and AccessControl for service events
*/
16 years, 2 months
JBoss-OSGI SVN: r94410 - in projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs: osgi.core.tests and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-06 07:28:24 -0400 (Tue, 06 Oct 2009)
New Revision: 94410
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Fix typo
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2009-10-06 11:21:14 UTC (rev 94409)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2009-10-06 11:28:24 UTC (rev 94410)
@@ -22,7 +22,7 @@
<hudson.tasks.Shell>
<command>
TCKSETUPDIR=$WORKSPACE/osgitck-setup
-TCKHOMEDIR=$OSGITCKDIR/target/osgitck-r4v42
+TCKHOMEDIR=$TCKSETUPDIR/target/osgitck-r4v42
# Setup the TCK
cd $TCKSETUPDIR
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-06 11:21:14 UTC (rev 94409)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-06 11:28:24 UTC (rev 94410)
@@ -22,14 +22,14 @@
<hudson.tasks.Shell>
<command>
TCKSETUPDIR=$WORKSPACE/osgitck-setup
-TCKHOMEDIR=$OSGITCKDIR/target/osgitck-r4v42
+TCKHOMEDIR=$TCKSETUPDIR/target/osgitck-r4v42
# Setup the TCK
cd $TCKSETUPDIR
cp ant.properties.example ant.properties
# Setup the TCK
-ant clean setup.jboss
+ant clean setup.ri
# Run the core tests
cd $TCKHOMEDIR/osgi.ct
16 years, 2 months
JBoss-OSGI SVN: r94409 - in projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs: osgi.core.tests and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-06 07:21:14 -0400 (Tue, 06 Oct 2009)
New Revision: 94409
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Unify hudson setup
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2009-10-06 11:13:21 UTC (rev 94408)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2009-10-06 11:21:14 UTC (rev 94409)
@@ -21,11 +21,11 @@
<builders>
<hudson.tasks.Shell>
<command>
-OSGITCKDIR=$WORKSPACE/osgitck-setup
+TCKSETUPDIR=$WORKSPACE/osgitck-setup
TCKHOMEDIR=$OSGITCKDIR/target/osgitck-r4v42
# Setup the TCK
-cd $OSGITCKDIR
+cd $TCKSETUPDIR
cp ant.properties.example ant.properties
# Setup the TCK
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-06 11:13:21 UTC (rev 94408)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-06 11:21:14 UTC (rev 94409)
@@ -21,17 +21,19 @@
<builders>
<hudson.tasks.Shell>
<command>
-OSGITCKDIR=$WORKSPACE/osgitck
+TCKSETUPDIR=$WORKSPACE/osgitck-setup
+TCKHOMEDIR=$OSGITCKDIR/target/osgitck-r4v42
# Setup the TCK
-cd $OSGITCKDIR
+cd $TCKSETUPDIR
cp ant.properties.example ant.properties
# Setup the TCK
ant clean setup.jboss
# Run the core tests
-ant tck-core-tests
+cd $TCKHOMEDIR/osgi.ct
+ant osgi.core.tests
</command>
</hudson.tasks.Shell>
</builders>
16 years, 2 months
JBoss-OSGI SVN: r94408 - in projects/jboss-osgi/projects/osgitck/r4v42: hudson/hudson-home/jobs and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-06 07:13:21 -0400 (Tue, 06 Oct 2009)
New Revision: 94408
Added:
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/build.xml
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Add blueprint TCK setup
Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-10-06 10:50:49 UTC (rev 94407)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-10-06 11:13:21 UTC (rev 94408)
@@ -42,7 +42,7 @@
<fail message="Cannot find: ${jboss.osgi.framework.jar}" unless="jboss.osgi.framework.available" />
<!-- Check if the osgitck dir is available -->
- <property name="osgitck.dir" value="${target.dir}/r4v42-core-cmpn-final" />
+ <property name="osgitck.dir" value="${target.dir}/osgitck-r4v42" />
<available property="osgitck.dir.available" file="${osgitck.dir}" />
<property name="jboss.framework.repo.dir" value="${osgitck.dir}/licensed/repo/org.jboss.osgi.framework" />
Added: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml (rev 0)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.blueprint.tests/config.xml 2009-10-06 11:13:21 UTC (rev 94408)
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <actions/>
+ <description></description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@hudson.osgi.url@</remote>
+ <local>osgitck-setup</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ </scm>
+ <assignedNode>master</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <jdk>jdk1.6</jdk>
+ <triggers class="vector"/>
+ <builders>
+ <hudson.tasks.Shell>
+ <command>
+OSGITCKDIR=$WORKSPACE/osgitck-setup
+TCKHOMEDIR=$OSGITCKDIR/target/osgitck-r4v42
+
+# Setup the TCK
+cd $OSGITCKDIR
+cp ant.properties.example ant.properties
+
+# Setup the TCK
+ant clean setup.ri
+
+# Run the blueprint tests
+cd $TCKHOMEDIR/org.osgi.test.cases.blueprint
+ant clean publish test
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers>
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>osgitck-setup/target/osgitck-r4v42/*/generated/**/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-06 10:50:49 UTC (rev 94407)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-06 11:13:21 UTC (rev 94408)
@@ -8,7 +8,7 @@
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
<remote>@hudson.osgi.url@</remote>
- <local>osgitck</local>
+ <local>osgitck-setup</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
@@ -37,7 +37,7 @@
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>osgitck/target/r4v42-core-cmpn-final/*/generated/**/test-reports/TEST-*.xml</testResults>
+ <testResults>osgitck-setup/target/osgitck-r4v42/*/generated/**/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
</publishers>
<buildWrappers/>
16 years, 2 months
JBoss-OSGI SVN: r94407 - projects/jboss-osgi/projects/osgitck/r4v42.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-06 06:50:49 -0400 (Tue, 06 Oct 2009)
New Revision: 94407
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
projects/jboss-osgi/projects/osgitck/r4v42/build.xml
Log:
Use the SVn export instead of a zip file
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-10-06 08:57:35 UTC (rev 94406)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-10-06 10:50:49 UTC (rev 94407)
@@ -4,7 +4,7 @@
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
# The location of the OSGi TCK
-osgitck.zip=/home/hudson/svn/osgitck/r4v42-core-cmpn-final.zip
+osgitck.export=/home/hudson/svn/osgitck/r4v42-core-cmpn-final
# The location od the local maven repository
maven.local.repository=/home/hudson/.m2/repository
Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-10-06 08:57:35 UTC (rev 94406)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-10-06 10:50:49 UTC (rev 94407)
@@ -27,9 +27,9 @@
<property file="${basedir}/ant.properties" />
- <!-- Check if the osgitck zip is available -->
- <available property="osgitck.zip.available" file="${osgitck.zip}" />
- <fail message="Cannot find: ${osgitck.zip}" unless="osgitck.zip.available" />
+ <!-- Check if the osgitck export is available -->
+ <available property="osgitck.export.available" file="${osgitck.export}" />
+ <fail message="Cannot find: ${osgitck.export}" unless="osgitck.export.available" />
<!-- Check if the aQute.bnd jar is available -->
<property name="aQute.bnd.jar" value="${maven.local.repository}/biz/aQute/aQute.bnd/${aQute.bnd.version}/aQute.bnd-${aQute.bnd.version}.jar" />
@@ -52,21 +52,25 @@
<!-- Setup -->
<!-- ================================================================== -->
- <!-- Unzip the OSGi TCK-->
- <target name="unzip-osgitck" depends="init" unless="osgitck.dir.available">
- <unzip src="${osgitck.zip}" dest="${target.dir}" />
+ <!-- Copy the OSGi TCK-->
+ <target name="copy-osgitck" depends="init" unless="osgitck.dir.available">
+ <copy toDir="${osgitck.dir}">
+ <fileset dir="${osgitck.export}">
+ <exclude name="**/.svn"/>
+ </fileset>
+ </copy>
<available property="osgitck.dir.available" file="${osgitck.dir}" />
</target>
<!-- Setup the TCK to use the RI (equinox) -->
- <target name="setup.ri" depends="init,unzip-osgitck">
+ <target name="setup.ri" description="Setup the TCK using the RI (Equinox)" depends="init,copy-osgitck">
<!-- Copy the aQute.bnd -->
<copy file="${aQute.bnd.jar}" tofile="${osgitck.dir}/licensed/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar" overwrite="true" />
</target>
<!-- Setup the TCK to use the JBoss OSGi Framework -->
- <target name="setup.jboss" depends="init,unzip-osgitck">
+ <target name="setup.jboss" description="Setup the TCK using the JBoss OSGi Framework" depends="init,copy-osgitck">
<!-- Check if the osgitck dir is available -->
<fail message="Cannot find: ${osgitck.dir}" unless="osgitck.dir.available" />
@@ -88,15 +92,15 @@
<!-- Hudson -->
<!-- ================================================================== -->
- <target name="hudson-setup" depends="init">
+ <target name="hudson-setup" description="Setup the TCK Hudson instance" depends="init">
<ant dir="${basedir}/hudson" target="hudson-setup" />
</target>
- <target name="hudson-start" depends="init">
+ <target name="hudson-start" description="Start the TCK Hudson instance" depends="init">
<ant dir="${basedir}/hudson" target="hudson-start" />
</target>
- <target name="hudson-stop" depends="init">
+ <target name="hudson-stop" description="Stop the TCK Hudson instance" depends="init">
<ant dir="${basedir}/hudson" target="hudson-stop" />
</target>
@@ -104,7 +108,7 @@
<!-- TCK Tests -->
<!-- ================================================================== -->
- <target name="tck-core-tests" depends="init">
+ <target name="tck-core-tests" description="Run the TCK core tests" depends="init">
<ant dir="${osgitck.dir}/osgi.ct" target="clean" />
<ant dir="${osgitck.dir}/osgi.ct" target="publish" />
<ant dir="${osgitck.dir}/osgi.ct" target="osgi.core.tests" />
@@ -114,7 +118,7 @@
<!-- Clean -->
<!-- ================================================================== -->
- <target name="clean">
+ <target name="clean" description="Clean the TCK setup">
<delete dir="${target.dir}" />
</target>
16 years, 2 months
JBoss-OSGI SVN: r94373 - in projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi: bundle/test and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 10:36:51 -0400 (Mon, 05 Oct 2009)
New Revision: 94373
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java
Log:
Remove dependency on bundle event order
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 14:30:07 UTC (rev 94372)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 14:36:51 UTC (rev 94373)
@@ -34,6 +34,7 @@
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
+import org.jboss.osgi.framework.bundle.AbstractBundleState;
import org.jboss.osgi.framework.bundle.OSGiBundleManager;
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.jboss.test.AbstractTestDelegate;
@@ -430,7 +431,6 @@
protected void assertNoFrameworkEvent() throws Exception
{
- waitForEvents(frameworkEvents);
getLog().debug("frameworkEvents=" + frameworkEvents);
assertEquals(0, frameworkEvents.size());
}
@@ -483,7 +483,6 @@
protected void assertNoBundleEvent() throws Exception
{
- waitForEvents(bundleEvents);
getLog().debug("bundleEvents=" + bundleEvents);
assertEquals(0, bundleEvents.size());
}
@@ -491,13 +490,31 @@
protected void assertBundleEvent(int type, Bundle bundle) throws Exception
{
waitForEvents(bundleEvents);
+
getLog().debug("bundleEvents=" + bundleEvents);
int size = bundleEvents.size();
assertTrue("" + size, size > 0);
- BundleEvent event = bundleEvents.remove(0);
- assertEquals(ConstantsHelper.bundleEvent(type), ConstantsHelper.bundleEvent(event.getType()));
- assertEquals(bundle, event.getSource());
- assertEquals(bundle, event.getBundle());
+
+ if (bundle instanceof AbstractBundleState)
+ bundle = ((AbstractBundleState)bundle).getBundle();
+
+ BundleEvent foundEvent = null;
+ for(int i=0; i < bundleEvents.size(); i++)
+ {
+ BundleEvent aux = bundleEvents.get(i);
+ if (type == aux.getType())
+ {
+ if (bundle.equals(aux.getSource()) && bundle.equals(aux.getBundle()))
+ {
+ bundleEvents.remove(aux);
+ foundEvent = aux;
+ break;
+ }
+ }
+ }
+
+ if (foundEvent == null)
+ fail("Cannot find event " + ConstantsHelper.bundleEvent(type) + " from " + bundle);
}
public void serviceChanged(ServiceEvent event)
@@ -512,7 +529,6 @@
protected void assertNoServiceEvent() throws Exception
{
- waitForEvents(serviceEvents);
getLog().debug("serviceEvents=" + serviceEvents);
assertEquals(0, serviceEvents.size());
}
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java 2009-10-05 14:30:07 UTC (rev 94372)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/bundle/test/BundleContextUnitTestCase.java 2009-10-05 14:36:51 UTC (rev 94373)
@@ -408,7 +408,6 @@
{
uninstall(bundle);
}
- assertBundleEvent(BundleEvent.STOPPING, bundle);
assertBundleEvent(BundleEvent.STOPPED, bundle);
// todo assertBundleEvent(BundleEvent.UNRESOLVED, bundle);
assertBundleEvent(BundleEvent.UNINSTALLED, bundle);
16 years, 2 months
JBoss-OSGI SVN: r94368 - projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 09:48:15 -0400 (Mon, 05 Oct 2009)
New Revision: 94368
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml
Log:
Delegate more osgi packages to the sys cl
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2009-10-05 13:45:56 UTC (rev 94367)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2009-10-05 13:48:15 UTC (rev 94368)
@@ -32,8 +32,11 @@
org.osgi.framework,
org.osgi.framework.launch,
org.osgi.framework.hooks.service,
+ org.osgi.service.condpermadmin,
+ org.osgi.service.packageadmin,
+ org.osgi.service.permissionadmin,
org.osgi.service.startlevel,
- org.osgi.service.packageadmin,
+ org.osgi.service.url,
org.osgi.util.tracker,
</value></entry>
</map>
16 years, 2 months
JBoss-OSGI SVN: r94358 - projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-05 07:34:35 -0400 (Mon, 05 Oct 2009)
New Revision: 94358
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
Log:
Timeout for event delivery: 3 sec
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 11:33:42 UTC (rev 94357)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/OSGiTestCase.java 2009-10-05 11:34:35 UTC (rev 94358)
@@ -532,8 +532,8 @@
@SuppressWarnings("unchecked")
private void waitForEvents(List events) throws InterruptedException
{
- // Timeout for event delivery: 5 sec
- int timeout = 50;
+ // Timeout for event delivery: 3 sec
+ int timeout = 30;
while (events.size() == 0 && 0 < timeout)
{
16 years, 2 months