You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/09/14 02:51:12 UTC
svn commit: r575505 - in /mina/trunk:
protocol-http-client/src/main/java/org/apache/mina/http/
protocol-http-client/src/main/java/org/apache/mina/protocol/
protocol-http-client/src/main/java/org/apache/mina/protocol/http/
protocol-http-client/src/main/...
Author: trustin
Date: Thu Sep 13 17:51:11 2007
New Revision: 575505
URL: http://svn.apache.org/viewvc?rev=575505&view=rev
Log:
* Moved org.apache.mina.http to org.apache.mina.protocol.http
* Renamed http.client.ssl.TrustManagerFactoryImpl to http.client.SimpleTrustManagerFactory
Added:
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java
- copied, changed from r575503, mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClientCallback.java
- copied, changed from r575503, mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/HttpIoHandler.java
- copied, changed from r575503, mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/HttpIoHandler.java
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/SimpleTrustManagerFactory.java (with props)
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/
- copied from r575503, mina/trunk/protocol-http-client/src/test/java/org/apache/mina/http/client/
mina/trunk/protocol-http-server/src/main/java/org/apache/mina/protocol/
mina/trunk/protocol-http-server/src/main/java/org/apache/mina/protocol/http/
mina/trunk/protocol-http-server/src/main/java/org/apache/mina/protocol/http/server/
- copied from r575503, mina/trunk/protocol-http-server/src/main/java/org/apache/mina/http/server/
mina/trunk/protocol-http-server/src/test/java/org/apache/mina/protocol/
mina/trunk/protocol-http-server/src/test/java/org/apache/mina/protocol/http/
mina/trunk/protocol-http-server/src/test/java/org/apache/mina/protocol/http/server/
- copied from r575503, mina/trunk/protocol-http-server/src/test/java/org/apache/mina/http/server/
Removed:
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/http/
mina/trunk/protocol-http-server/src/main/java/org/apache/mina/http/
mina/trunk/protocol-http-server/src/test/java/org/apache/mina/http/
Modified:
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AbstractTest.java
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java
Copied: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java (from r575503, mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java)
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java?p2=mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java&p1=mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java&r1=575503&r2=575505&rev=575505&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/AsyncHttpClient.java (original)
+++ mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java Thu Sep 13 17:51:11 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.client;
+package org.apache.mina.protocol.http.client;
import java.io.IOException;
@@ -33,7 +33,6 @@
import org.apache.mina.filter.codec.http.HttpProtocolCodecFactory;
import org.apache.mina.filter.codec.http.HttpRequestMessage;
import org.apache.mina.filter.ssl.SSLFilter;
-import org.apache.mina.http.client.ssl.TrustManagerFactoryImpl;
import org.apache.mina.transport.socket.nio.SocketConnector;
@@ -148,7 +147,7 @@
private SSLContext createClientSSLContext() throws GeneralSecurityException
{
SSLContext context = SSLContext.getInstance( sslProtocol );
- context.init( null, TrustManagerFactoryImpl.X509_MANAGERS, null );
+ context.init( null, SimpleTrustManagerFactory.X509_MANAGERS, null );
return context;
}
Copied: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClientCallback.java (from r575503, mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java)
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClientCallback.java?p2=mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClientCallback.java&p1=mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java&r1=575503&r2=575505&rev=575505&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/AsyncHttpClientCallback.java (original)
+++ mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClientCallback.java Thu Sep 13 17:51:11 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.client;
+package org.apache.mina.protocol.http.client;
import org.apache.mina.filter.codec.http.HttpResponseMessage;
Copied: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/HttpIoHandler.java (from r575503, mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/HttpIoHandler.java)
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/HttpIoHandler.java?p2=mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/HttpIoHandler.java&p1=mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/HttpIoHandler.java&r1=575503&r2=575505&rev=575505&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/main/java/org/apache/mina/http/client/HttpIoHandler.java (original)
+++ mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/HttpIoHandler.java Thu Sep 13 17:51:11 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.client;
+package org.apache.mina.protocol.http.client;
import org.apache.mina.common.IoHandlerAdapter;
Added: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/SimpleTrustManagerFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/SimpleTrustManagerFactory.java?rev=575505&view=auto
==============================================================================
--- mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/SimpleTrustManagerFactory.java (added)
+++ mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/SimpleTrustManagerFactory.java Thu Sep 13 17:51:11 2007
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.mina.protocol.http.client;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactorySpi;
+import javax.net.ssl.X509TrustManager;
+import javax.net.ssl.ManagerFactoryParameters;
+import java.security.cert.X509Certificate;
+import java.security.cert.CertificateException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.InvalidAlgorithmParameterException;
+
+public class SimpleTrustManagerFactory extends TrustManagerFactorySpi {
+ static final X509TrustManager X509 = new X509TrustManager() {
+
+
+ public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+
+ }
+
+
+ public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+
+ }
+
+
+ public X509Certificate[] getAcceptedIssuers() {
+
+ return new X509Certificate[0];
+
+ }
+
+ };
+
+ public static final TrustManager[] X509_MANAGERS = new TrustManager[]{X509};
+
+
+ protected void engineInit(KeyStore keyStore) throws KeyStoreException {
+ }
+
+ protected void engineInit(ManagerFactoryParameters managerFactoryParameters) throws InvalidAlgorithmParameterException {
+ }
+
+ protected TrustManager[] engineGetTrustManagers() {
+ return X509_MANAGERS;
+ }
+}
Propchange: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/SimpleTrustManagerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/SimpleTrustManagerFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AbstractTest.java?rev=575505&r1=575503&r2=575505&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AbstractTest.java (original)
+++ mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AbstractTest.java Thu Sep 13 17:51:11 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.client;
+package org.apache.mina.protocol.http.client;
import java.io.File;
Modified: mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java?rev=575505&r1=575503&r2=575505&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java (original)
+++ mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java Thu Sep 13 17:51:11 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.client;
+package org.apache.mina.protocol.http.client;
import java.io.File;
@@ -27,6 +27,8 @@
import org.apache.mina.filter.codec.http.HttpRequestMessage;
import org.apache.mina.filter.codec.http.HttpResponseMessage;
+import org.apache.mina.protocol.http.client.AsyncHttpClient;
+import org.apache.mina.protocol.http.client.AsyncHttpClientCallback;
public class AsyncHttpClientTest extends AbstractTest
Modified: mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java?rev=575505&r1=575503&r2=575505&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java (original)
+++ mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java Thu Sep 13 17:51:11 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.http.client;
+package org.apache.mina.protocol.http.client;
import java.util.Arrays;