ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: #ignite-189: move GridSecurityCredentialsBasicProvider to enterprise.
Date Fri, 13 Feb 2015 10:21:20 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-189 f29751493 -> 4958fcd1f


#ignite-189: move GridSecurityCredentialsBasicProvider to enterprise.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4958fcd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4958fcd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4958fcd1

Branch: refs/heads/ignite-189
Commit: 4958fcd1f6c13e77b5971a5b7123e0d9c8bf9dd3
Parents: f297514
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Feb 13 13:20:52 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Feb 13 13:20:52 2015 +0300

----------------------------------------------------------------------
 .../client/GridClientConfiguration.java         | 21 ++++++++++
 .../security/GridSecurityCredentials.java       |  2 +-
 .../GridSecurityCredentialsBasicProvider.java   | 44 --------------------
 .../GridSecurityCredentialsProvider.java        |  2 +-
 4 files changed, 23 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4958fcd1/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index cfd780c..ad8c06c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
+import org.apache.ignite.*;
 import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.client.marshaller.optimized.*;
@@ -841,4 +842,24 @@ public class GridClientConfiguration {
     public boolean isDaemon() {
         return daemon;
     }
+
+    /**
+     * Basic implementation for {@link GridSecurityCredentialsProvider}.
+     */
+    public class GridSecurityCredentialsBasicProvider implements GridSecurityCredentialsProvider
{
+        /** */
+        private GridSecurityCredentials cred;
+
+        /**
+         * @param cred Security credentials.
+         */
+        public GridSecurityCredentialsBasicProvider(GridSecurityCredentials cred) {
+            this.cred = cred;
+        }
+
+        /** {@inheritDoc} */
+        @Override public GridSecurityCredentials credentials() throws IgniteCheckedException
{
+            return cred;
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4958fcd1/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
index 79dafd3..f9948a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
@@ -38,7 +38,7 @@ import java.io.*;
  * Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
  * users to provide custom implementations for storing user names and passwords in their
  * environment, possibly in encrypted format. Ignite comes with
- * {@link GridSecurityCredentialsBasicProvider} which simply provides
+ * {@link GridSecurityCredentialsProvider} which simply provides
  * the passed in {@code login} and {@code password} when encryption or custom logic is not
required.
  * <p>
  * In addition to {@code login} and {@code password}, security credentials allow for

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4958fcd1/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsBasicProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsBasicProvider.java
b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsBasicProvider.java
deleted file mode 100644
index a5f422b..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsBasicProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.ignite.plugin.security;
-
-import org.apache.ignite.*;
-
-/**
- * Basic implementation for {@link GridSecurityCredentialsProvider}. Use it
- * when custom logic for storing security credentials is not required and it
- * is OK to specify credentials directly in configuration.
- */
-public class GridSecurityCredentialsBasicProvider implements GridSecurityCredentialsProvider
{
-    /** */
-    private GridSecurityCredentials cred;
-
-    /**
-     * Constructs security credentials provider based on security credentials passed in.
-     *
-     * @param cred Security credentials.
-     */
-    public GridSecurityCredentialsBasicProvider(GridSecurityCredentials cred) {
-        this.cred = cred;
-    }
-
-    /** {@inheritDoc} */
-    @Override public GridSecurityCredentials credentials() throws IgniteCheckedException
{
-        return cred;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4958fcd1/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
index 500d50e8..b07f1bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
@@ -31,7 +31,7 @@ import org.apache.ignite.*;
  * Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
  * users to provide custom implementations for storing user names and passwords in their
  * environment, possibly in encrypted format. Ignite comes with
- * {@link GridSecurityCredentialsBasicProvider} which simply provides
+ * {@link GridSecurityCredentialsProvider} which simply provides
  * the passed in {@code login} and {@code password} when encryption or custom logic is not
required.
  * <p>
  * In addition to {@code login} and {@code password}, security credentials allow for


Mime
View raw message