Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 6 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abf322f
Fix exception proxy so that a non-serializable exception doesn't make…
Nov 1, 2011
56f3fa2
User visible spelling correction
Nov 1, 2011
83a878d
Make sure that non-serializable objects return a meaningful response …
Nov 1, 2011
17c79ae
Add local-nexus-thirdparty distribution repository
Nov 7, 2011
7ad2e22
Prepare for release of 1.0.0.Final-Moveit.1
Nov 7, 2011
a7f2b0f
Merge branch 'master' of git://github.com/arquillian/arquillian-core
Nov 11, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion config/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion config/impl-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion config/spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion container/impl-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion container/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion container/spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion container/test-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion container/test-impl-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion container/test-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion core/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion core/impl-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion core/spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion examples/domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion examples/junit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion examples/testng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion junit/container/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion junit/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion junit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion junit/standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
11 changes: 10 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion protocols/jmx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion protocols/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion protocols/servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
26 changes: 16 additions & 10 deletions ...servlet/src/main/java/org/jboss/arquillian/protocol/servlet/runner/ServletTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test/impl-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion test/spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
18 changes: 12 additions & 6 deletions test/spi/src/main/java/org/jboss/arquillian/test/spi/ExceptionProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion testenrichers/cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion testenrichers/ejb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading