[jboss-cvs] JBossAS SVN: r94637 - in projects/jboss-osgi/trunk/testsuite/example: src/test/java/org/jboss/test/osgi/example/webapp and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-10-10 02:24:45 -0400 (Sat, 10 Oct 2009)
New Revision: 94637

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.war instead of *.jar

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-10 05:39:45 UTC (rev 94636)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml	2009-10-10 06:24:45 UTC (rev 94637)
@@ -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.jar"
+    <war destfile="${tests.output.dir}/test-libs/example-webapp.war"
       manifest="${tests.resources.dir}/webapp/MANIFEST.MF"
       webxml="${tests.resources.dir}/webapp/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-10 05:39:45 UTC (rev 94636)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java	2009-10-10 06:24:45 UTC (rev 94637)
@@ -54,7 +54,7 @@
       runtime = new OSGiTestHelper().getDefaultRuntime();
       runtime.addCapability(new WebAppCapability());
 
-      OSGiBundle bundle = runtime.installBundle("example-webapp.jar");
+      OSGiBundle bundle = runtime.installBundle("example-webapp.war");
       bundle.start();
    }