[jboss-osgi-commits] JBoss-OSGI SVN: r94423 - in projects/jboss-osgi/trunk: distribution and 12 other directories.

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>