Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Few small fixes, specifically in the context of making Spock work, but generally applicable. #24

Closed
wants to merge 6 commits into from

2 participants

@AntonyBlakey

No description provided.

@aslakknutsen

I believe these were fixed in some other commit around the same time?

Could you verify? :)

@aslakknutsen

assuming ok :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 1, 2011
  1. Fix exception proxy so that a non-serializable exception doesn't make…

    Antony Blakey authored
    … it barf
  2. User visible spelling correction

    Antony Blakey authored
  3. Make sure that non-serializable objects return a meaningful response …

    Antony Blakey authored
    …to the user.
Commits on Nov 7, 2011
  1. Add local-nexus-thirdparty distribution repository

    Antony Blakey authored
  2. Prepare for release of 1.0.0.Final-Moveit.1

    Antony Blakey authored
Commits on Nov 11, 2011
This page is out of date. Refresh to see the latest.
Showing with 78 additions and 57 deletions.
  1. +1 −1  bom/pom.xml
  2. +1 −1  build/pom.xml
  3. +1 −1  config/api/pom.xml
  4. +1 −1  config/impl-base/pom.xml
  5. +1 −1  config/pom.xml
  6. +1 −1  config/spi/pom.xml
  7. +1 −1  container/impl-base/pom.xml
  8. +1 −1  container/pom.xml
  9. +1 −1  container/spi/pom.xml
  10. +1 −1  container/test-api/pom.xml
  11. +1 −1  container/test-impl-base/pom.xml
  12. +1 −1  container/test-spi/pom.xml
  13. +1 −1  core/api/pom.xml
  14. +1 −1  core/impl-base/pom.xml
  15. +1 −1  core/pom.xml
  16. +1 −1  core/spi/pom.xml
  17. +1 −1  examples/domain/pom.xml
  18. +1 −1  examples/junit/pom.xml
  19. +1 −1  examples/pom.xml
  20. +1 −1  examples/testng/pom.xml
  21. +1 −1  junit/container/pom.xml
  22. +1 −1  junit/core/pom.xml
  23. +1 −1  junit/pom.xml
  24. +1 −1  junit/standalone/pom.xml
  25. +10 −1 pom.xml
  26. +1 −1  protocols/jmx/pom.xml
  27. +1 −1  protocols/pom.xml
  28. +1 −1  protocols/servlet/pom.xml
  29. +16 −10 protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/runner/ServletTestRunner.java
  30. +1 −1  test/api/pom.xml
  31. +1 −1  test/impl-base/pom.xml
  32. +1 −1  test/pom.xml
  33. +1 −1  test/spi/pom.xml
  34. +12 −6 test/spi/src/main/java/org/jboss/arquillian/test/spi/ExceptionProxy.java
  35. +1 −1  testenrichers/cdi/pom.xml
  36. +1 −1  testenrichers/ejb/pom.xml
  37. +1 −1  testenrichers/initialcontext/pom.xml
  38. +1 −1  testenrichers/pom.xml
  39. +1 −1  testenrichers/resource/pom.xml
  40. +1 −1  testng/container/pom.xml
  41. +1 −1  testng/core/pom.xml
  42. +1 −1  testng/pom.xml
  43. +1 −1  testng/standalone/pom.xml
View
2  bom/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
View
2  build/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
View
2  config/api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  config/impl-base/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  config/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  config/spi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  container/impl-base/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  container/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  container/spi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  container/test-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  container/test-impl-base/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  container/test-spi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  core/api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  core/impl-base/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  core/spi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  examples/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  examples/junit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  examples/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  examples/testng/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  junit/container/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  junit/core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  junit/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  junit/standalone/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
11 pom.xml
@@ -16,7 +16,7 @@
<!-- Artifact Information -->
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<packaging>pom</packaging>
<name>Arquillian Aggregator</name>
<url>http://www.jboss.org</url>
@@ -152,4 +152,13 @@
</build>
</profile>
</profiles>
+
+ <distributionManagement>
+ <repository>
+ <id>local-nexus-thirdparty</id>
+ <name>Local Nexus Third Party</name>
+ <url>http://localhost:8081/content/repositories/thirdparty/</url>
+ </repository>
+ </distributionManagement>
+
</project>
View
2  protocols/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  protocols/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  protocols/servlet/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
26 ...servlet/src/main/java/org/jboss/arquillian/protocol/servlet/runner/ServletTestRunner.java
@@ -16,11 +16,7 @@
*/
package org.jboss.arquillian.protocol.servlet.runner;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.PrintWriter;
+import java.io.*;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletException;
@@ -223,13 +219,23 @@ private void writeObject(Object object, HttpServletResponse response)
{
try
{
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ try {
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(object);
+ oos.flush();
+ oos.close();
+ } catch (NotSerializableException e) {
+ response.setStatus(HttpServletResponse.SC_OK);
+ writeObject(createFailedResult(e), response);
+ return;
+ }
+
// Set HttpServletResponse status BEFORE getting the output stream
response.setStatus(HttpServletResponse.SC_OK);
- ObjectOutputStream oos = new ObjectOutputStream(response.getOutputStream());
- oos.writeObject(object);
- oos.flush();
- oos.close();
- }
+ baos.writeTo(response.getOutputStream());
+ }
catch (Exception e)
{
try
View
2  test/api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  test/impl-base/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  test/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  test/spi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
18 test/spi/src/main/java/org/jboss/arquillian/test/spi/ExceptionProxy.java
@@ -105,7 +105,7 @@ public Throwable createException()
return original;
}
- Throwable throwable = createProxyException("Original exception not deserilizable, ClassNotFoundException"); //constructExceptionForClass(clazz);
+ Throwable throwable = createProxyException("Original exception not deserializable, ClassNotFoundException"); //constructExceptionForClass(clazz);
throwable.setStackTrace(trace);
return throwable;
}
@@ -352,11 +352,17 @@ public void writeExternal(ObjectOutput out) throws IOException
// move on, try to serialize anyway
}
- ByteArrayOutputStream originalOut = new ByteArrayOutputStream();
- ObjectOutputStream output = new ObjectOutputStream(originalOut);
- output.writeObject(original);
- output.flush();
- originalBytes = originalOut.toByteArray();
+ try
+ {
+ ByteArrayOutputStream originalOut = new ByteArrayOutputStream();
+ ObjectOutputStream output = new ObjectOutputStream(originalOut);
+ output.writeObject(original);
+ output.flush();
+ originalBytes = originalOut.toByteArray();
+ }
+ catch (Exception e)
+ {
+ }
}
out.writeObject(originalBytes);
}
View
2  testenrichers/cdi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  testenrichers/ejb/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  testenrichers/initialcontext/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  testenrichers/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  testenrichers/resource/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  testng/container/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  testng/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
View
2  testng/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-parent</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
</parent>
<!-- Model Information -->
View
2  testng/standalone/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.Final-SNAPSHOT</version>
+ <version>1.0.0.Final-Moveit.1</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
Something went wrong with that request. Please try again.