[webbeans-commits] Webbeans SVN: r3220 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod and 1 other directory.
Author: pete.muir(a)jboss.org
Date: 2009-07-25 14:17:19 -0400 (Sat, 25 Jul 2009)
New Revision: 3220
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
Log:
Fix RI
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-25 17:59:45 UTC
(rev 3219)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-25 18:17:19 UTC
(rev 3220)
@@ -22,7 +22,6 @@
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -55,7 +54,6 @@
import org.jboss.webbeans.util.Names;
import org.jboss.webbeans.util.Proxies;
import org.jboss.webbeans.util.Reflections;
-import org.jboss.webbeans.util.collections.ListComparator;
/**
* Checks a list of beans for DeploymentExceptions and their subclasses
@@ -223,7 +221,7 @@
{
buff.append(bean.toString());
}
- throw new UnsatisfiedResolutionException(buff.toString());
+ throw new DefinitionException(buff.toString());
}
}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-07-25
17:59:45 UTC (rev 3219)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-07-25
18:17:19 UTC (rev 3220)
@@ -16,7 +16,7 @@
@BeansXml("beans.xml")
public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "3.3.9", id = "ca")
public void testUnresolvedDisposalMethod()
{