You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/07/27 22:10:31 UTC
[06/50] [abbrv] incubator-ignite git commit: IGNITE-323. Fixed
javadoc.
IGNITE-323. Fixed javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2650845e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2650845e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2650845e
Branch: refs/heads/ignite-104
Commit: 2650845e7b3770bfc22491fb5abc5f026e33c745
Parents: f7317ea
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Jul 21 22:13:52 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Jul 21 22:13:52 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/ConnectorConfiguration.java | 4 ++--
.../ignite/internal/client/ssl/GridSslBasicContextFactory.java | 2 +-
.../apache/ignite/internal/client/ssl/GridSslContextFactory.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2650845e/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
index a518cd8..98753e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java
@@ -467,11 +467,11 @@ public class ConnectorConfiguration {
}
/**
- * Sets instance of {@link Factory<SSLContext>} that will be used to create an instance of {@code SSLContext}
+ * Sets instance of {@link Factory} that will be used to create an instance of {@code SSLContext}
* for Secure Socket Layer on TCP binary protocol. This factory will only be used if
* {@link #setSslEnabled(boolean)} is set to {@code true}.
*
- * @param sslFactory Instance of {@link Factory<SSLContext>}
+ * @param sslFactory Instance of {@link Factory}
*/
public void setSslFactory(Factory<SSLContext> sslFactory) {
this.sslFactory = sslFactory;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2650845e/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java
index d9a1f9d..ed52218 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslBasicContextFactory.java
@@ -38,7 +38,7 @@ import java.util.*;
* factory.setTrustManagers(GridSslBasicContextFactory.getDisabledTrustManager());
* // Rest of initialization.
* </pre>
- * @deprecated Use {@link Factory<SSLContext>} instead.
+ * @deprecated Use {@link Factory} instead.
*/
@Deprecated
public class GridSslBasicContextFactory implements GridSslContextFactory {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2650845e/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java
index 7ae1995..34a13cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/ssl/GridSslContextFactory.java
@@ -25,7 +25,7 @@ import javax.net.ssl.*;
* <p>
* Usually, it is enough to configure context from a particular key and trust stores, this functionality is provided
* in {@link GridSslBasicContextFactory}.
- * @deprecated Use {@link Factory<SSLContext>} instead.
+ * @deprecated Use {@link Factory} instead.
*/
@Deprecated
public interface GridSslContextFactory {