Author: philharveyonline Date: Fri Jan 25 12:26:32 2013 New Revision: 1438467
URL: http://svn.apache.org/viewvc?rev=1438467&view=rev Log: PROTON-194: made proton-j the default profile in top level pom. Also Improved JythonTest error reporting Modified: qpid/proton/branches/jni-binding/pom.xml qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/JythonTest.java Modified: qpid/proton/branches/jni-binding/pom.xml URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/pom.xml?rev=1438467&r1=1438466&r2=1438467&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/pom.xml (original) +++ qpid/proton/branches/jni-binding/pom.xml Fri Jan 25 12:26:32 2013 @@ -34,16 +34,19 @@ <profiles> <profile> - <id>proton-c</id> + <id>proton-j</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <modules> - <module>proton-j/proton-api</module> + <module>proton-j</module> <module>tests</module> </modules> </profile> <profile> - <id>proton-j</id> + <id>proton-c</id> <modules> - <module>proton-j</module> + <module>proton-j/proton-api</module> <module>tests</module> </modules> </profile> Modified: qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/JythonTest.java URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/JythonTest.java?rev=1438467&r1=1438466&r2=1438467&view=diff ============================================================================== --- qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/JythonTest.java (original) +++ qpid/proton/branches/jni-binding/tests/src/test/java/org/apache/qpid/proton/JythonTest.java Fri Jan 25 12:26:32 2013 @@ -80,7 +80,10 @@ public class JythonTest { LOGGER.log(Level.FINE, "Jython interpreter failed. Test failures?", e); } - fail(e.getMessage()); + + // This unusual code is necessary because PyException toString() contains the useful Python traceback + // and getMessage() is usually null + fail("Caught PyException: " + e.toString() + " with message: " + e.getMessage()); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
