Author: rmannibucau
Date: Fri Nov 30 08:15:12 2012
New Revision: 1415535
URL: http://svn.apache.org/viewvc?rev=1415535&view=rev
Log:
fixing test to know if the classnotfound exception should be thrown in cdi
world or not (was only done for one case) + removing RequestScopeTestListener
from cdi tck
Removed:
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/RequestScopeTestListener.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1415535&r1=1415534&r2=1415535&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
Fri Nov 30 08:15:12 2012
@@ -124,7 +124,7 @@ public class CdiScanner implements Scann
} /* else { don't do it, check is done when we know the
beans.xml path --> org.apache.openejb.config.DeploymentLoader.addBeansXmls
throw new WebBeansConfigurationException("Interceptor
class : " + clazz.getName() + " is already defined");
}*/
- } else if ((beans.webapp && startupObject.isFromWebApp()) ||
!beans.webapp) {
+ } else if (shouldThrowCouldNotLoadException(beans,
startupObject)) {
throw new WebBeansConfigurationException("Could not load
interceptor class: " + className);
}
}
@@ -137,7 +137,7 @@ public class CdiScanner implements Scann
decoratorsManager.addNewDecorator(clazz);
classes.add(clazz);
} // same than interceptors regarding throw new
WebBeansConfigurationException("Decorator class : " + clazz.getName() + " is
already defined");
- } else if (beans.webapp && startupObject.isFromWebApp()) {
+ } else if (shouldThrowCouldNotLoadException(beans,
startupObject)) {
throw new WebBeansConfigurationException("Could not load
decorator class: " + className);
}
}
@@ -148,7 +148,7 @@ public class CdiScanner implements Scann
if (clazz != null) {
alternativesManager.addStereoTypeAlternative(clazz, null,
null);
classes.add(clazz);
- } else if (beans.webapp && startupObject.isFromWebApp()) {
+ } else if (shouldThrowCouldNotLoadException(beans,
startupObject)) {
throw new WebBeansConfigurationException("Could not load
alternativeStereotype class: " + className);
}
}
@@ -158,7 +158,7 @@ public class CdiScanner implements Scann
if (clazz != null) {
alternativesManager.addClazzAlternative(clazz, null, null);
classes.add(clazz);
- } else if (beans.webapp && startupObject.isFromWebApp()) {
+ } else if (shouldThrowCouldNotLoadException(beans,
startupObject)) {
throw new WebBeansConfigurationException("Could not load
alternative class: " + className);
}
}
@@ -183,6 +183,10 @@ public class CdiScanner implements Scann
}
+ private static boolean shouldThrowCouldNotLoadException(final BeansInfo
beans, final StartupObject startupObject) {
+ return (beans.webapp && startupObject.isFromWebApp()) || !beans.webapp;
+ }
+
private void process(final ClassLoader classLoader, final Set<String>
ejbClasses, final Iterator<String> it, final StartupObject startupObject, final
ClassLoaderComparator comparator, final ClassLoader scl, final boolean
filterByClassLoader) {
final String className = it.next();
if (ejbClasses.contains(className)) it.remove();
Modified: openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml?rev=1415535&r1=1415534&r2=1415535&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml
(original)
+++ openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml Fri
Nov 30 08:15:12 2012
@@ -16,9 +16,6 @@
limitations under the License.
-->
<suite name="CDI TCK" verbose="0">
- <listeners>
- <listener
class-name="org.apache.openejb.tck.cdi.embedded.RequestScopeTestListener" />
- </listeners>
<test name="CDI TCK">
<packages>
<package name="org.jboss.jsr299.tck.tests.*"/>
