Author: thomas.diesler(a)jboss.com Date: 2009-10-21 09:25:51 -0400 (Wed, 21 Oct 2009) New Revision: 95291 Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java Log: Upgrade to pax-web-0.7.1 Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-21 13:18:58 UTC (rev 95290) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-21 13:25:51 UTC (rev 95291) @@ -21,7 +21,7 @@ <artifactId>jboss-osgi-webapp</artifactId> <packaging>bundle</packaging> - <version>0.7.0-SNAPSHOT</version> + <version>0.7.1-SNAPSHOT</version> <!-- Parent --> <parent> @@ -40,23 +40,13 @@ <!-- Properties --> <properties> <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> - <version.ops4j.pax.base>1.2.1</version.ops4j.pax.base> - <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web> + <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi> </properties> <!-- Dependencies --> <dependencies> <dependency> - <!-- - [TODO] Invalid maven dependency on pax base - http://issues.ops4j.org/browse/PAXWEB-177 - --> - <groupId>org.ops4j.base</groupId> - <artifactId>ops4j-base-util-xml</artifactId> - <version>${version.ops4j.pax.base}</version> - </dependency> - <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-api</artifactId> <version>${version.ops4j.pax.web}</version> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-21 13:18:58 UTC (rev 95290) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-21 13:25:51 UTC (rev 95291) @@ -67,10 +67,10 @@ <version.jboss.osgi.runtime.felix>2.0.1-SNAPSHOT</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.webapp>0.7.0-SNAPSHOT</version.jboss.osgi.webapp> + <version.jboss.osgi.webapp>0.7.1-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> - <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web> + <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi> </properties> Modified: 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 2009-10-21 13:18:58 UTC (rev 95290) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-21 13:25:51 UTC (rev 95291) @@ -89,14 +89,14 @@ { URL url = new URL("http://" + runtime.getServerHost() + ":8090/example-webapp" + reqPath); - int timeout = 50; + int timeout = 40; String line = null; IOException lastException = null; while (line == null && 0 < timeout--) { + Thread.sleep(500); try { - Thread.sleep(200); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); line = br.readLine(); }