You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2007/12/01 16:57:53 UTC
svn commit: r600151 - in /jakarta/httpcomponents/httpcore/trunk: ./
module-nio/src/examples/org/apache/http/examples/nio/
module-nio/src/main/java/org/apache/http/impl/nio/reactor/
module-nio/src/test/java/org/apache/http/ module-nio/src/test/java/org/...
Author: olegk
Date: Sat Dec 1 07:57:51 2007
New Revision: 600151
URL: http://svn.apache.org/viewvc?rev=600151&view=rev
Log:
HttpCore NIOSSL classes moved to HttpCore NIO; NIOSSL module deleted
Added:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLClient.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/examples/org/apache/http/examples/nio/NHttpSSLClient.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/examples/org/apache/http/examples/nio/NHttpSSLServer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLClientIOEventDispatch.java
- copied unchanged from r600114, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/main/java/org/apache/http/impl/nio/reactor/SSLClientIOEventDispatch.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLServerIOEventDispatch.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/main/java/org/apache/http/impl/nio/reactor/SSLServerIOEventDispatch.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java
- copied, changed from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java
- copied unchanged from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java
- copied, changed from r600150, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/resources/
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/resources/test.keystore
- copied unchanged from r600150, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/resources/test.keystore
Removed:
jakarta/httpcomponents/httpcore/trunk/module-niossl/
Modified:
jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestAllImplReactor.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestAllProtocol.java
jakarta/httpcomponents/httpcore/trunk/pom.xml
Modified: jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt?rev=600151&r1=600150&r2=600151&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ jakarta/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Sat Dec 1 07:57:51 2007
@@ -1,5 +1,8 @@
Changes since 4.0 Alpha 6
+* HttpCore NIOSSL classes moved to HttpCore NIO.
+ Contributed by Oleg Kalnichevski <olegk at apache.org>
+
* HttpCore NIO ported to Java 1.5.
Contributed by Oleg Kalnichevski <olegk at apache.org>
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestAllImplReactor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestAllImplReactor.java?rev=600151&r1=600150&r2=600151&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestAllImplReactor.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestAllImplReactor.java Sat Dec 1 07:57:51 2007
@@ -43,6 +43,8 @@
suite.addTest(TestSessionInOutBuffers.suite());
suite.addTest(TestDefaultIOReactors.suite());
suite.addTest(TestDefaultListeningIOReactor.suite());
+ suite.addTest(TestBaseIOReactorSSL.suite());
+ suite.addTest(TestDefaultIOReactorsSSL.suite());
return suite;
}
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java (from r600149, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java?p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java&p1=jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java&r1=600149&r2=600151&rev=600151&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java Sat Dec 1 07:57:51 2007
@@ -59,23 +59,23 @@
*
* @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
*/
-public class TestDefaultIOReactors extends HttpCoreNIOSSLTestBase {
+public class TestDefaultIOReactorsSSL extends HttpCoreNIOSSLTestBase {
// ------------------------------------------------------------ Constructor
- public TestDefaultIOReactors(String testName) {
+ public TestDefaultIOReactorsSSL(String testName) {
super(testName);
}
// ------------------------------------------------------------------- Main
public static void main(String args[]) {
- String[] testCaseName = { TestDefaultIOReactors.class.getName() };
+ String[] testCaseName = { TestDefaultIOReactorsSSL.class.getName() };
junit.textui.TestRunner.main(testCaseName);
}
// ------------------------------------------------------- TestCase Methods
public static Test suite() {
- return new TestSuite(TestDefaultIOReactors.class);
+ return new TestSuite(TestDefaultIOReactorsSSL.class);
}
public void testRestartListeningIOReactor() throws Exception {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestAllProtocol.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestAllProtocol.java?rev=600151&r1=600150&r2=600151&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestAllProtocol.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestAllProtocol.java Sat Dec 1 07:57:51 2007
@@ -41,6 +41,7 @@
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(TestNIOHttp.suite());
+ suite.addTest(TestNIOSSLHttp.suite());
return suite;
}
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java (from r600150, jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java?p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java&p1=jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.java&r1=600150&r2=600151&rev=600151&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-niossl/src/test/java/org/apache/http/impl/nio/reactor/TestNIOSSLHttp.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java Sat Dec 1 07:57:51 2007
@@ -28,7 +28,7 @@
*
*/
-package org.apache.http.impl.nio.reactor;
+package org.apache.http.nio.protocol;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -97,7 +97,6 @@
*/
@SuppressWarnings("unchecked")
public void testSimpleHttpGets() throws Exception {
-
final int connNo = 3;
final int reqNo = 20;
final RequestCount requestCount = new RequestCount(connNo * reqNo);
Modified: jakarta/httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/pom.xml?rev=600151&r1=600150&r2=600151&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/pom.xml (original)
+++ jakarta/httpcomponents/httpcore/trunk/pom.xml Sat Dec 1 07:57:51 2007
@@ -162,54 +162,4 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>java5-compat</id>
- <activation>
- <!--
- for some bloody reason Maven refuses to recognize 1.5+ as
- a valid jdk attribute even though this is supposed to be
- supported as of Maven 2.0.7 (see MNG-1910)
- -->
- <jdk>!1.4</jdk>
- </activation>
- <modules>
- <module>module-niossl</module>
- </modules>
- </profile>
- <profile>
- <id>java1.4</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>java1.4-warning</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <echo>
-=======================================================
-WARNING: Java 1.5 dependent modules are NOT included!
-=======================================================
- </echo>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- </profile>
- </profiles>
-
</project>