Author: rmannibucau
Date: Fri Jul 1 17:46:47 2011
New Revision: 1142006
URL: http://svn.apache.org/viewvc?rev=1142006&view=rev
Log:
fixing cdi tests i broke last commit
Modified:
openejb/trunk/openejb3/tck/bval-embedded/pom.xml
openejb/trunk/openejb3/tck/bval-embedded/src/test/java/org/apache/openejb/tck/bval/impl/StandaloneContainersImpl.java
Modified: openejb/trunk/openejb3/tck/bval-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/bval-embedded/pom.xml?rev=1142006&r1=1142005&r2=1142006&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/bval-embedded/pom.xml (original)
+++ openejb/trunk/openejb3/tck/bval-embedded/pom.xml Fri Jul 1 17:46:47 2011
@@ -89,6 +89,7 @@
<forkMode>once</forkMode>
<systemPropertyVariables>
<validation.provider>org.apache.bval.jsr303.ApacheValidationProvider</validation.provider>
+ <force.deployment>true</force.deployment>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
openejb/trunk/openejb3/tck/bval-embedded/src/test/java/org/apache/openejb/tck/bval/impl/StandaloneContainersImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/bval-embedded/src/test/java/org/apache/openejb/tck/bval/impl/StandaloneContainersImpl.java?rev=1142006&r1=1142005&r2=1142006&view=diff
==============================================================================
---
openejb/trunk/openejb3/tck/bval-embedded/src/test/java/org/apache/openejb/tck/bval/impl/StandaloneContainersImpl.java
(original)
+++
openejb/trunk/openejb3/tck/bval-embedded/src/test/java/org/apache/openejb/tck/bval/impl/StandaloneContainersImpl.java
Fri Jul 1 17:46:47 2011
@@ -1,7 +1,5 @@
package org.apache.openejb.tck.bval.impl;
-import org.apache.openejb.tck.impl.Archive;
-
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
@@ -15,66 +13,63 @@ import java.util.Collection;
* @author Romain Manni-Bucau
*/
public class StandaloneContainersImpl extends
org.apache.openejb.tck.impl.StandaloneContainersImpl {
- @Override public boolean deploy(Collection<Class<?>> classes,
Collection<URL> xmls) {
- if ( xmls == null || !xmls.iterator().hasNext() ) {
- Thread.currentThread().setContextClassLoader( new
IgnoringValidationXmlClassLoader() );
- return true;
- }
-
- URL validationXmlUrl = xmls.iterator().next();
- Thread.currentThread().setContextClassLoader( new
CustomValidationXmlClassLoader( validationXmlUrl.getPath() ) );
+ @Override
+ public boolean deploy(Collection<Class<?>> classes, Collection<URL> xmls) {
+ if (xmls == null || !xmls.iterator().hasNext()) {
+ Thread.currentThread().setContextClassLoader(new
IgnoringValidationXmlClassLoader());
+ } else {
+ URL validationXmlUrl = xmls.iterator().next();
+ Thread.currentThread().setContextClassLoader(new
CustomValidationXmlClassLoader(validationXmlUrl.getPath()));
+ }
return super.deploy(classes, xmls);
}
private static class CustomValidationXmlClassLoader extends ClassLoader {
- private final String customValidationXmlPath;
+ private final String customValidationXmlPath;
- CustomValidationXmlClassLoader(String
pathToCustomValidationXml) {
- super(
CustomValidationXmlClassLoader.class.getClassLoader() );
- customValidationXmlPath = pathToCustomValidationXml;
- }
-
- public InputStream getResourceAsStream(String path) {
- InputStream in;
- if ( "META-INF/validation.xml".equals( path ) ) {
- if ( customValidationXmlPath.contains( ".jar!"
) ) {
- path =
customValidationXmlPath.substring( customValidationXmlPath.indexOf( "!" ) + 2 );
- in = super.getResourceAsStream( path );
- }
- else {
- in = loadFromDisk();
- }
- }
- else {
- in = super.getResourceAsStream( path );
- }
- return in;
- }
-
- private InputStream loadFromDisk() {
- InputStream in;
- try {
- in = new BufferedInputStream( new
FileInputStream( customValidationXmlPath ) );
- }
- catch (IOException ioe) {
- String msg = "Unble to load " +
customValidationXmlPath + " from disk";
- throw new RuntimeException( msg );
- }
- return in;
- }
- }
-
- private static class IgnoringValidationXmlClassLoader extends
ClassLoader {
- IgnoringValidationXmlClassLoader() {
- super(
IgnoringValidationXmlClassLoader.class.getClassLoader() );
- }
-
- public InputStream getResourceAsStream(String path) {
- if ( "META-INF/validation.xml".equals( path ) ) {
- return null;
- }
- return super.getResourceAsStream( path );
- }
- }
+ CustomValidationXmlClassLoader(String pathToCustomValidationXml) {
+ super(CustomValidationXmlClassLoader.class.getClassLoader());
+ customValidationXmlPath = pathToCustomValidationXml;
+ }
+
+ public InputStream getResourceAsStream(String path) {
+ InputStream in;
+ if ("META-INF/validation.xml".equals(path)) {
+ if (customValidationXmlPath.contains(".jar!")) {
+ path =
customValidationXmlPath.substring(customValidationXmlPath.indexOf("!") + 2);
+ in = super.getResourceAsStream(path);
+ } else {
+ in = loadFromDisk();
+ }
+ } else {
+ in = super.getResourceAsStream(path);
+ }
+ return in;
+ }
+
+ private InputStream loadFromDisk() {
+ InputStream in;
+ try {
+ in = new BufferedInputStream(new
FileInputStream(customValidationXmlPath));
+ } catch (IOException ioe) {
+ String msg = "Unble to load " + customValidationXmlPath + "
from disk";
+ throw new RuntimeException(msg);
+ }
+ return in;
+ }
+ }
+
+ private static class IgnoringValidationXmlClassLoader extends ClassLoader {
+ IgnoringValidationXmlClassLoader() {
+ super(IgnoringValidationXmlClassLoader.class.getClassLoader());
+ }
+
+ public InputStream getResourceAsStream(String path) {
+ if ("META-INF/validation.xml".equals(path)) {
+ return null;
+ }
+ return super.getResourceAsStream(path);
+ }
+ }
}
