[webbeans-commits] Webbeans SVN: r3688 - in ri/trunk: tests/src/test/resources/META-INF and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-09-16 16:29:05 -0400 (Wed, 16 Sep 2009)
New Revision: 3688

Modified:
   ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java
   ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties
   ri/trunk/version-matrix/pom.xml
Log:
minor cleanup to test setup

Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java	2009-09-16 18:42:31 UTC (rev 3687)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java	2009-09-16 20:29:05 UTC (rev 3688)
@@ -24,6 +24,7 @@
 import org.jboss.webbeans.mock.MockServletContext;
 import org.jboss.webbeans.mock.el.EL;
 import org.jboss.webbeans.servlet.ServletHelper;
+import org.jboss.webbeans.test.harness.AbstractStandaloneContainersImpl;
 import org.jboss.webbeans.util.collections.EnumerationList;
 import org.testng.ITestContext;
 import org.testng.annotations.AfterClass;
@@ -43,7 +44,7 @@
       {
          getCurrentConfiguration().getExtraPackages().add(AbstractWebBeansTest.class.getPackage().getName());
          getCurrentConfiguration().getExtraPackages().add(EL.class.getPackage().getName());
-         getCurrentConfiguration().getExtraPackages().add(MockServletContext.class.getPackage().getName());
+         //getCurrentConfiguration().getExtraPackages().add(MockServletContext.class.getPackage().getName());
       }
       super.beforeSuite(context);
    }

Modified: ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties
===================================================================
--- ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties	2009-09-16 18:42:31 UTC (rev 3687)
+++ ri/trunk/tests/src/test/resources/META-INF/jboss-test-harness.properties	2009-09-16 20:29:05 UTC (rev 3688)
@@ -1 +1 @@
-corg.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher
+org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher

Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml	2009-09-16 18:42:31 UTC (rev 3687)
+++ ri/trunk/version-matrix/pom.xml	2009-09-16 20:29:05 UTC (rev 3688)
@@ -49,7 +49,7 @@
    <properties>
       <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
       <webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
-      <webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version>
+      <webbeans.servlet.version>1.0.0-SNAPSHOT</webbeans.servlet.version>
       <webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version>
       <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version>
    </properties>
@@ -352,7 +352,7 @@
          <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>catalina</artifactId>
-            <version>6.0.18</version>
+            <version>6.0.20</version>
          </dependency>
          
          <dependency>