Author: shawkins Date: 2010-07-22 17:40:25 -0400 (Thu, 22 Jul 2010) New Revision: 2369 Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html trunk/pom.xml trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java Log: TEIID-1165 upgrading netty Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-07-22 15:15:43 UTC (rev 2368) +++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2010-07-22 21:40:25 UTC (rev 2369) @@ -120,6 +120,7 @@ The following components have been updated: <h4>From 7.0</h4> <ul> + <li>Netty was upgraded to 3.2.0 <li>JDOM was removed. </ul> <h4>From 6.2</h4> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-22 15:15:43 UTC (rev 2368) +++ trunk/pom.xml 2010-07-22 21:40:25 UTC (rev 2369) @@ -482,7 +482,7 @@ <dependency> <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> - <version>3.1.5.GA</version> + <version>3.2.0.Final</version> </dependency> <dependency> <groupId>org.apache.ant</groupId> Modified: trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java =================================================================== --- trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2010-07-22 15:15:43 UTC (rev 2368) +++ trunk/runtime/src/test/java/org/teiid/transport/TestCommSockets.java 2010-07-22 21:40:25 UTC (rev 2369) @@ -33,7 +33,6 @@ import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.teiid.client.security.ILogon; import org.teiid.client.security.LogonException; @@ -198,22 +197,16 @@ config.setAuthenticationMode(SSLConfiguration.ANONYMOUS); Properties p = new Properties(); p.setProperty(SocketUtil.TRUSTSTORE_FILENAME, SocketUtil.NONE); - try { - helpEstablishConnection(true, config, p); - } catch (CommunicationException e) { - - } + helpEstablishConnection(true, config, p); SocketServerConnection conn = helpEstablishConnection(true, config, p); conn.close(); } - @Ignore("should be enabled with Netty 3.2") @Test(expected=CommunicationException.class) public void testNonSSLConnectWithSSLServer() throws Exception { SSLConfiguration config = new SSLConfiguration(); config.setSslEnabled(true); config.setAuthenticationMode(SSLConfiguration.ANONYMOUS); Properties p = new Properties(); - p.setProperty(SocketUtil.TRUSTSTORE_FILENAME, SocketUtil.NONE); helpEstablishConnection(true, config, p); }