GEODE-3412: adding files missing from last commit. This now closes #714
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bc655eb9 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bc655eb9 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bc655eb9 Branch: refs/heads/feature/GEODE-3416 Commit: bc655eb9b3683282705e7449f0f7a720c1a6243d Parents: a7a197d Author: Brian Rowe <[email protected]> Authored: Tue Aug 15 11:21:51 2017 -0700 Committer: Udo Kohlmeyer <[email protected]> Committed: Tue Aug 15 13:43:07 2017 -0700 ---------------------------------------------------------------------- .../cache/tier/sockets/GenericProtocolServerConnection.java | 1 + .../internal/cache/tier/sockets/ServerConnectionFactory.java | 1 + .../java/org/apache/geode/security/NoOpStreamAuthenticator.java | 4 +--- .../main/java/org/apache/geode/security/StreamAuthenticator.java | 2 +- .../cache/tier/sockets/GenericProtocolServerConnectionTest.java | 1 + .../geode/protocol/protobuf/ProtobufSimpleAuthenticator.java | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/bc655eb9/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java index 7c8fb5c..93a7f6f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java @@ -20,6 +20,7 @@ import org.apache.geode.internal.cache.tier.Acceptor; import org.apache.geode.internal.cache.tier.CachedRegionHelper; import org.apache.geode.internal.security.SecurityService; import org.apache.geode.security.SecurityManager; +import org.apache.geode.security.StreamAuthenticator; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/geode/blob/bc655eb9/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java index 1d53297..9173f6a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java @@ -19,6 +19,7 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.Acceptor; import org.apache.geode.internal.cache.tier.CachedRegionHelper; import org.apache.geode.internal.security.SecurityService; +import org.apache.geode.security.StreamAuthenticator; import java.io.IOException; import java.net.Socket; http://git-wip-us.apache.org/repos/asf/geode/blob/bc655eb9/geode-core/src/main/java/org/apache/geode/security/NoOpStreamAuthenticator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/security/NoOpStreamAuthenticator.java b/geode-core/src/main/java/org/apache/geode/security/NoOpStreamAuthenticator.java index bca1ec2..0a6dde1 100644 --- a/geode-core/src/main/java/org/apache/geode/security/NoOpStreamAuthenticator.java +++ b/geode-core/src/main/java/org/apache/geode/security/NoOpStreamAuthenticator.java @@ -12,9 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.cache.tier.sockets; - -import org.apache.geode.security.SecurityManager; +package org.apache.geode.security; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/geode/blob/bc655eb9/geode-core/src/main/java/org/apache/geode/security/StreamAuthenticator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/security/StreamAuthenticator.java b/geode-core/src/main/java/org/apache/geode/security/StreamAuthenticator.java index 51cbf2e..7db1a2b 100644 --- a/geode-core/src/main/java/org/apache/geode/security/StreamAuthenticator.java +++ b/geode-core/src/main/java/org/apache/geode/security/StreamAuthenticator.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.internal.cache.tier.sockets; +package org.apache.geode.security; import org.apache.geode.security.SecurityManager; http://git-wip-us.apache.org/repos/asf/geode/blob/bc655eb9/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java index 3dcf343..383fbf0 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java @@ -24,6 +24,7 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.Acceptor; import org.apache.geode.internal.cache.tier.CachedRegionHelper; import org.apache.geode.internal.security.SecurityService; +import org.apache.geode.security.NoOpStreamAuthenticator; import org.apache.geode.test.junit.categories.UnitTest; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/geode/blob/bc655eb9/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java ---------------------------------------------------------------------- diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java index 59c61e2..1517552 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java @@ -14,7 +14,7 @@ */ package org.apache.geode.protocol.protobuf; -import org.apache.geode.internal.cache.tier.sockets.StreamAuthenticator; +import org.apache.geode.security.StreamAuthenticator; import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.SecurityManager;
