You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/01/25 09:53:47 UTC
directory-kerberos git commit: Removed http related from
not-commons-ssl library
Repository: directory-kerberos
Updated Branches:
refs/heads/master bc5c276ee -> 0e835cdca
Removed http related from not-commons-ssl library
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/0e835cdc
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/0e835cdc
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/0e835cdc
Branch: refs/heads/master
Commit: 0e835cdcaf717cc881c1920543272c38efbe75fe
Parents: bc5c276
Author: Drankye <dr...@gmail.com>
Authored: Sun Jan 25 16:53:32 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Sun Jan 25 16:53:32 2015 +0800
----------------------------------------------------------------------
3rdparty/not-yet-commons-ssl/pom.xml | 11 +--
.../apache/commons/ssl/HttpSecureProtocol.java | 93 --------------------
2 files changed, 1 insertion(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/0e835cdc/3rdparty/not-yet-commons-ssl/pom.xml
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/pom.xml b/3rdparty/not-yet-commons-ssl/pom.xml
index 74c97d4..819d78d 100644
--- a/3rdparty/not-yet-commons-ssl/pom.xml
+++ b/3rdparty/not-yet-commons-ssl/pom.xml
@@ -79,16 +79,7 @@
<version>1.51</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
+ <scope>test</scope>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/0e835cdc/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HttpSecureProtocol.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HttpSecureProtocol.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HttpSecureProtocol.java
deleted file mode 100644
index 5ae3060..0000000
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HttpSecureProtocol.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * $HeadURL: http://juliusdavies.ca/svn/not-yet-commons-ssl/tags/commons-ssl-0.3.16/src/java/org/apache/commons/ssl/HttpSecureProtocol.java $
- * $Revision: 165 $
- * $Date: 2014-04-24 16:48:09 -0700 (Thu, 24 Apr 2014) $
- *
- * ====================================================================
- * 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.commons.ssl;
-
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.security.GeneralSecurityException;
-
-/**
- * Hook into HttpClient.
- *
- * @author Credit Union Central of British Columbia
- * @author <a href="http://www.cucbc.com/">www.cucbc.com</a>
- * @author <a href="mailto:juliusdavies@cucbc.com">juliusdavies@cucbc.com</a>
- * @since 5-May-2006
- */
-public class HttpSecureProtocol extends SSLClient
- implements SecureProtocolSocketFactory {
-
- public HttpSecureProtocol()
- throws GeneralSecurityException, IOException {
- super();
- }
-
- /**
- * Attempts to get a new socket connection to the given host within the
- * given time limit.
- * <p/>
- * To circumvent the limitations of older JREs that do not support connect
- * timeout a controller thread is executed. The controller thread attempts
- * to create a new socket within the given limit of time. If socket
- * constructor does not return until the timeout expires, the controller
- * terminates and throws an
- * {@link org.apache.commons.httpclient.ConnectTimeoutException}
- * </p>
- *
- * @param host the host name/IP
- * @param port the port on the host
- * @param localAddress the local host name/IP to bind the socket to
- * @param localPort the port on the local machine
- * @param params {@link org.apache.commons.httpclient.params.HttpConnectionParams Http connection parameters}
- * @return Socket a new socket
- * @throws java.io.IOException if an I/O error occurs while creating the socket
- * @throws java.net.UnknownHostException if the IP address of the host cannot be
- * determined
- */
- public Socket createSocket(final String host,
- final int port,
- final InetAddress localAddress,
- final int localPort,
- final HttpConnectionParams params)
- throws IOException {
- if (params == null) {
- throw new IllegalArgumentException("Parameters may not be null");
- }
- int timeout = params.getConnectionTimeout();
- return super.createSocket(host, port, localAddress, localPort, timeout);
- }
-
-}