You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by km...@apache.org on 2011/07/18 06:36:44 UTC
svn commit: r1147739 - in /openejb/trunk/openejb3/tck: bval-embedded/
cdi-tomee/ tck-common/ tck-common/src/main/java/org/apache/openejb/tck/cdi/
tck-common/src/main/java/org/apache/openejb/tck/impl/
Author: kmalhi
Date: Mon Jul 18 04:36:43 2011
New Revision: 1147739
URL: http://svn.apache.org/viewvc?rev=1147739&view=rev
Log:
more cdi tck fixes
Added:
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/cdi/
Modified:
openejb/trunk/openejb3/tck/bval-embedded/pom.xml
openejb/trunk/openejb3/tck/cdi-tomee/ (props changed)
openejb/trunk/openejb3/tck/tck-common/pom.xml
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImpl.java
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.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=1147739&r1=1147738&r2=1147739&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/bval-embedded/pom.xml (original)
+++ openejb/trunk/openejb3/tck/bval-embedded/pom.xml Mon Jul 18 04:36:43 2011
@@ -71,6 +71,17 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>1.1.0-CR5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.hibernate.jsr303.tck</groupId>
<artifactId>jsr303-tck</artifactId>
<version>1.0.3.GA</version>
Propchange: openejb/trunk/openejb3/tck/cdi-tomee/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 18 04:36:43 2011
@@ -2,3 +2,4 @@
target
.classpath
.project
+test-output
Modified: openejb/trunk/openejb3/tck/tck-common/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/pom.xml?rev=1147739&r1=1147738&r2=1147739&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/tck-common/pom.xml (original)
+++ openejb/trunk/openejb3/tck/tck-common/pom.xml Mon Jul 18 04:36:43 2011
@@ -38,6 +38,17 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>1.0.4.SP1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
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=1147739&r1=1147738&r2=1147739&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 Mon Jul 18 04:36:43 2011
@@ -69,6 +69,12 @@ public class ContainersImpl implements C
@Override
public boolean deploy(InputStream archive, String name) {
+ try {
+ final File file = writeToFile2(archive, name);
+ System.out.println(file);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
if (!OpenEJB.isInitialized()) stuck = name;
else System.out.println("STUCK " + stuck);
Modified: openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1147739&r1=1147738&r2=1147739&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java (original)
+++ openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java Mon Jul 18 04:36:43 2011
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.tck.impl;
-import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.File;
import java.io.FileOutputStream;
@@ -28,9 +27,6 @@ import java.util.Properties;
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.apache.openejb.NoSuchApplicationException;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.UndeployException;
import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.client.RemoteInitialContextFactory;
import org.apache.openejb.config.RemoteServer;
@@ -45,6 +41,8 @@ public class ContainersImplTomEE impleme
private final RemoteServer server;
private Deployer deployer = null;
private static final String tmpDir = System.getProperty("java.io.tmpdir");
+ private DeploymentException exception;
+
public ContainersImplTomEE() {
System.out.println("Initialized ContainersImplTomEE " + (++count));
server = new RemoteServer(10, true);
@@ -62,23 +60,29 @@ public class ContainersImplTomEE impleme
}
@Override
public boolean deploy(InputStream archive, String name) throws IOException {
+ exception = null;
+
System.out.println("Deploying " + archive + " with name " + name);
- String fileName = getName(name);
+
+ File fileName = getFile(name);
System.out.println(fileName);
writeToFile(fileName, archive);
try {
if (deployer == null) {
deployer = lookup();
}
- deployer.deploy(fileName);
- } catch (OpenEJBException e) {
- throw new RuntimeException(e);
+ deployer.deploy(fileName.getAbsolutePath());
+ } catch (Exception e) {
+ exception = (DeploymentException) new DeploymentException("deploy failed").initCause(e);
+ e.printStackTrace();
+ return false;
}
return true;
}
- private void writeToFile(String fileName, InputStream archive) {
+
+ private void writeToFile(File file, InputStream archive) {
try {
- FileOutputStream fos = new FileOutputStream(fileName);
+ FileOutputStream fos = new FileOutputStream(file);
byte[] buffer = new byte[4096];
int bytesRead = -1;
while ((bytesRead = archive.read(buffer)) > -1) {
@@ -89,22 +93,25 @@ public class ContainersImplTomEE impleme
throw new RuntimeException(e);
}
}
- private String getName(String name) {
- return tmpDir + File.separator + name;
+ private File getFile(String name) {
+ final File dir = new File(tmpDir, Math.random()+"");
+ dir.mkdir();
+
+ return new File(dir, name);
}
+
@Override
public DeploymentException getDeploymentException() {
- System.out.println("getDeploymentException()");
- return new DeploymentException("There is some problem");
+ return exception;
}
+
@Override
public void undeploy(String name) throws IOException {
System.out.println("Undeploying " + name);
try {
- deployer.undeploy(getName(name));
- } catch (UndeployException e) {
- throw new RuntimeException(e);
- } catch (NoSuchApplicationException e) {
+ deployer.undeploy(getFile(name).getAbsolutePath());
+ } catch (Exception e) {
+ e.printStackTrace();
throw new RuntimeException(e);
}
}