[jboss-osgi-commits] JBoss-OSGI SVN: r94498 - in projects/jboss-osgi/trunk/testsuite/example: src/test/java/org/jboss/test/osgi/example/webapp and 1 other directory.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-10-08 00:11:40 -0400 (Thu, 08 Oct 2009)
New Revision: 94498

Modified:
   projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
Log:
Use example-webapp.jar instead of .war

Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml	2009-10-08 04:01:40 UTC (rev 94497)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml	2009-10-08 04:11:40 UTC (rev 94498)
@@ -62,7 +62,7 @@
     <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/example-simple-husky.jar" files="${tests.resources.dir}/simple/example-simple-husky.bnd" />
     
     <!-- webapp -->
-    <war destfile="${tests.output.dir}/test-libs/example-webapp.war"
+    <war destfile="${tests.output.dir}/test-libs/example-webapp.jar"
       manifest="${tests.resources.dir}/webapp/META-INF/MANIFEST.MF"
       webxml="${tests.resources.dir}/webapp/WEB-INF/web.xml">
       <classes dir="${tests.classes.dir}">

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-08 04:01:40 UTC (rev 94497)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java	2009-10-08 04:11:40 UTC (rev 94498)
@@ -53,7 +53,7 @@
       runtime = new OSGiTestHelper().getDefaultRuntime();
       runtime.addCapability(new WebAppCapability());
 
-      OSGiBundle bundle = runtime.installBundle("example-webapp.war");
+      OSGiBundle bundle = runtime.installBundle("example-webapp.jar");
       bundle.start();
    }