You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/07/13 18:04:15 UTC
incubator-geode git commit: GEODE-1571: fix compiling error after the
merge
Repository: incubator-geode
Updated Branches:
refs/heads/develop 29b487028 -> 31336f15a
GEODE-1571: fix compiling error after the merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/31336f15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/31336f15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/31336f15
Branch: refs/heads/develop
Commit: 31336f15aed0674876ddffd67c032a2e00342751
Parents: 29b4870
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Jul 13 11:04:01 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Jul 13 11:04:01 2016 -0700
----------------------------------------------------------------------
.../apache/geode/security/templates/SampleSecurityManager.java | 6 +++---
.../distributed/internal/DistributionConfigJUnitTest.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31336f15/geode-core/src/main/java/org/apache/geode/security/templates/SampleSecurityManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/security/templates/SampleSecurityManager.java b/geode-core/src/main/java/org/apache/geode/security/templates/SampleSecurityManager.java
index 1c71516..f0275e4 100644
--- a/geode-core/src/main/java/org/apache/geode/security/templates/SampleSecurityManager.java
+++ b/geode-core/src/main/java/org/apache/geode/security/templates/SampleSecurityManager.java
@@ -35,12 +35,12 @@ import javax.management.remote.JMXPrincipal;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.IOUtils;
+import org.apache.geode.security.GeodePermission;
+import org.apache.geode.security.SecurityManager;
import org.apache.shiro.authz.Permission;
import com.gemstone.gemfire.management.internal.security.ResourceConstants;
import com.gemstone.gemfire.security.AuthenticationFailedException;
-import org.apache.geode.security.SecurityManager;
-import org.apache.geode.security.GeodePermission;
import com.gemstone.gemfire.security.NotAuthorizedException;
/**
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.security.NotAuthorizedException;
* In order to use it, a Geode member must be started with the following properties:
* <p/>
* <code>
- * security-manager = com.gemstone.gemfire.security.examples.SampleSecurityManager.create
+ * security-manager = com.gemstone.gemfire.security.examples.SampleSecurityManager
* </code>
* <p/>
* The class is initialized with a JSON file called {@code security.json}. This file must exist on the classpath,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31336f15/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index 4f7cbaf..d2b0d51 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.geode.security.templates.SamplePostProcessor;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,7 +39,6 @@ import com.gemstone.gemfire.InternalGemFireException;
import com.gemstone.gemfire.UnmodifiableException;
import com.gemstone.gemfire.internal.ConfigSource;
import com.gemstone.gemfire.management.internal.security.JSONAuthorization;
-import com.gemstone.gemfire.security.templates.SamplePostProcessor;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
@Category(UnitTest.class)