You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/07/01 20:27:16 UTC
svn commit: r1142015 - in /openejb/trunk/openejb3/tck: bval-embedded/pom.xml
tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java
tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java
Author: rmannibucau
Date: Fri Jul 1 18:27:15 2011
New Revision: 1142015
URL: http://svn.apache.org/viewvc?rev=1142015&view=rev
Log:
setting up bval tests in local mode
Modified:
openejb/trunk/openejb3/tck/bval-embedded/pom.xml
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.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=1142015&r1=1142014&r2=1142015&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/bval-embedded/pom.xml (original)
+++ openejb/trunk/openejb3/tck/bval-embedded/pom.xml Fri Jul 1 18:27:15 2011
@@ -96,7 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<executions>
<execution>
<id>generate-test-report</id>
Modified: openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java?rev=1142015&r1=1142014&r2=1142015&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java (original)
+++ openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java Fri Jul 1 18:27:15 2011
@@ -46,7 +46,6 @@ import static junit.framework.Assert.fai
* @version $Rev$ $Date$
*/
public class Archive {
-
private final String name;
private final InputStream in;
@@ -103,26 +102,17 @@ public class Archive {
out.putNextEntry(new ZipEntry(name));
- final InputStream in = new
- BufferedInputStream(url.openStream());
+ final InputStream in = new BufferedInputStream(url.openStream());
ZipUtil.copy(in, out);
in.close();
}
- if (System.getProperty("force.deployment") != null) {
- out.putNextEntry(new ZipEntry("META-INF/beans.xml"));
- final InputStream in = new ByteArrayInputStream("<beans />".getBytes());
- ZipUtil.copy(in, out);
- in.close();
- }
-
// Complete the ZIP file
out.close();
- this.in = new
- ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+ this.in = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
} catch (IOException e) {
throw new RuntimeException(e);
}
Modified: openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java?rev=1142015&r1=1142014&r2=1142015&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java (original)
+++ openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java Fri Jul 1 18:27:15 2011
@@ -24,8 +24,11 @@ import org.apache.openejb.tck.util.ZipUt
import org.apache.openejb.util.SetAccessible;
import org.apache.webbeans.config.WebBeansContext;
import org.jboss.testharness.api.DeploymentException;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
import org.jboss.testharness.impl.packaging.ear.PersistenceXml;
+import org.jboss.testharness.impl.packaging.jsr303.ValidationXml;
import org.jboss.testharness.spi.Containers;
import javax.ejb.embeddable.EJBContainer;
@@ -37,7 +40,6 @@ import java.io.FileOutputStream;
import java.io.Flushable;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.RandomAccessFile;
import java.lang.reflect.Field;
import java.net.URL;
@@ -154,6 +156,36 @@ public class ContainersImpl implements C
if (resource != null) resources.put("META-INF/persistence.xml", resource);
}
+ if (clazz.isAnnotationPresent(ValidationXml.class)) {
+ String path = clazz.getAnnotation(ValidationXml.class).value();
+ if (path.contains(".jar")) {
+ path = path.substring(path.indexOf( "!" ) + 2);
+ }
+
+ final URL resource = getResource(clazz, path);
+ if (resource != null) {
+ resources.put("META-INF/validation.xml", resource);
+ }
+ }
+
+ if (clazz.isAnnotationPresent(Resource.class)) {
+ Resource resourceAnn = clazz.getAnnotation(Resource.class);
+ final URL resource = getResource(clazz, resourceAnn.source());
+ if (resource != null) {
+ resources.put(resourceAnn.destination().replaceFirst("WEB-INF/classes/", ""), resource);
+ }
+ }
+
+ if (clazz.isAnnotationPresent(Resources.class)) {
+ Resources resourcesAnn = clazz.getAnnotation(Resources.class);
+ for (Resource resourceAnn : resourcesAnn.value()) {
+ final URL resource = getResource(clazz, resourceAnn.source());
+ if (resource != null) {
+ resources.put(resourceAnn.destination().replaceFirst("WEB-INF/classes/", ""), resource);
+ }
+ }
+ }
+
final boolean isJar = name.endsWith(".jar");
final ZipInputStream zin = new ZipInputStream(archive);
@@ -187,7 +219,7 @@ public class ContainersImpl implements C
ZipUtil.copy(entry.getValue().openStream(), zout);
}
- if (System.getProperty("force.deployment") != null) {
+ if (System.getProperty("force.deployment") != null && !resources.containsKey("META-INF/beans.xml")) {
zout.putNextEntry(new ZipEntry("META-INF/beans.xml"));
final InputStream in = new ByteArrayInputStream("<beans />".getBytes());
ZipUtil.copy(in, zout);