You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2014/10/22 14:13:45 UTC
[1/3] git commit: [SYNCOPE-558]
Repository: syncope
Updated Branches:
refs/heads/1_2_X 9124246ff -> 2674037d4
refs/heads/master 14393ecbc -> abc3764fd
[SYNCOPE-558]
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2674037d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2674037d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2674037d
Branch: refs/heads/1_2_X
Commit: 2674037d4e28d41612add4307ec43481329560db
Parents: 9124246
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Wed Oct 22 14:11:48 2014 +0200
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Wed Oct 22 14:11:48 2014 +0200
----------------------------------------------------------------------
console/src/main/resources/authorizations.xml | 4 ----
.../syncope/core/rest/controller/ConfigurationController.java | 2 +-
core/src/main/resources/content.xml | 1 -
.../org/apache/syncope/core/persistence/dao/EntitlementTest.java | 2 +-
core/src/test/resources/content.xml | 1 -
5 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/console/src/main/resources/authorizations.xml
----------------------------------------------------------------------
diff --git a/console/src/main/resources/authorizations.xml b/console/src/main/resources/authorizations.xml
index 0c23958..33746f7 100644
--- a/console/src/main/resources/authorizations.xml
+++ b/console/src/main/resources/authorizations.xml
@@ -205,10 +205,6 @@ under the License.
<entitlement>CONFIGURATION_EXPORT</entitlement>
</action>
- <action id="read">
- <entitlement>CONFIGURATION_READ</entitlement>
- </action>
-
<action id="set">
<entitlement>CONFIGURATION_SET</entitlement>
</action>
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
index a2f8d0d..8fe7136 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
@@ -72,7 +72,7 @@ public class ConfigurationController extends AbstractTransactionalController<Con
return binder.getConfTO(confDAO.get());
}
- @PreAuthorize("hasRole('CONFIGURATION_READ')")
+ @PreAuthorize("isAuthenticated()")
public AttributeTO read(final String key) {
CAttr conf = confDAO.find(key);
if (conf == null) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/core/src/main/resources/content.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/content.xml b/core/src/main/resources/content.xml
index 6183460..3b7cda9 100644
--- a/core/src/main/resources/content.xml
+++ b/core/src/main/resources/content.xml
@@ -125,7 +125,6 @@ under the License.
<Entitlement name="CONNECTOR_RELOAD"/>
<Entitlement name="CONFIGURATION_EXPORT"/>
<Entitlement name="CONFIGURATION_LIST"/>
- <Entitlement name="CONFIGURATION_READ"/>
<Entitlement name="CONFIGURATION_SET"/>
<Entitlement name="CONFIGURATION_DELETE"/>
<Entitlement name="TASK_LIST"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java b/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java
index ca8b638..b4f2c36 100644
--- a/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java
+++ b/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java
@@ -41,7 +41,7 @@ public class EntitlementTest extends AbstractDAOTest {
@Test
public void findAll() {
List<Entitlement> list = entitlementDAO.findAll();
- assertEquals("did not get expected number of entitlements ", 89, list.size());
+ assertEquals("did not get expected number of entitlements ", 88, list.size());
}
@Test
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/core/src/test/resources/content.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/content.xml b/core/src/test/resources/content.xml
index 320da22..b9d20d5 100644
--- a/core/src/test/resources/content.xml
+++ b/core/src/test/resources/content.xml
@@ -1050,7 +1050,6 @@ under the License.
<Entitlement name="CONNECTOR_RELOAD"/>
<Entitlement name="CONFIGURATION_EXPORT"/>
<Entitlement name="CONFIGURATION_LIST"/>
- <Entitlement name="CONFIGURATION_READ"/>
<Entitlement name="CONFIGURATION_SET"/>
<Entitlement name="CONFIGURATION_DELETE"/>
<Entitlement name="TASK_LIST"/>
[3/3] git commit: Merge branch '1_2_X'
Posted by md...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/abc3764f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/abc3764f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/abc3764f
Branch: refs/heads/master
Commit: abc3764fdc459a8873a71b2c997ea77db04547dd
Parents: 14393ec 2674037
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Wed Oct 22 14:12:56 2014 +0200
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Wed Oct 22 14:12:56 2014 +0200
----------------------------------------------------------------------
console/src/main/resources/authorizations.xml | 4 ----
.../syncope/core/rest/controller/ConfigurationController.java | 2 +-
core/src/main/resources/content.xml | 1 -
.../org/apache/syncope/core/persistence/dao/EntitlementTest.java | 2 +-
core/src/test/resources/content.xml | 1 -
5 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: [SYNCOPE-558]
Posted by md...@apache.org.
[SYNCOPE-558]
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2674037d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2674037d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2674037d
Branch: refs/heads/master
Commit: 2674037d4e28d41612add4307ec43481329560db
Parents: 9124246
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Wed Oct 22 14:11:48 2014 +0200
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Wed Oct 22 14:11:48 2014 +0200
----------------------------------------------------------------------
console/src/main/resources/authorizations.xml | 4 ----
.../syncope/core/rest/controller/ConfigurationController.java | 2 +-
core/src/main/resources/content.xml | 1 -
.../org/apache/syncope/core/persistence/dao/EntitlementTest.java | 2 +-
core/src/test/resources/content.xml | 1 -
5 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/console/src/main/resources/authorizations.xml
----------------------------------------------------------------------
diff --git a/console/src/main/resources/authorizations.xml b/console/src/main/resources/authorizations.xml
index 0c23958..33746f7 100644
--- a/console/src/main/resources/authorizations.xml
+++ b/console/src/main/resources/authorizations.xml
@@ -205,10 +205,6 @@ under the License.
<entitlement>CONFIGURATION_EXPORT</entitlement>
</action>
- <action id="read">
- <entitlement>CONFIGURATION_READ</entitlement>
- </action>
-
<action id="set">
<entitlement>CONFIGURATION_SET</entitlement>
</action>
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
index a2f8d0d..8fe7136 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
@@ -72,7 +72,7 @@ public class ConfigurationController extends AbstractTransactionalController<Con
return binder.getConfTO(confDAO.get());
}
- @PreAuthorize("hasRole('CONFIGURATION_READ')")
+ @PreAuthorize("isAuthenticated()")
public AttributeTO read(final String key) {
CAttr conf = confDAO.find(key);
if (conf == null) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/core/src/main/resources/content.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/content.xml b/core/src/main/resources/content.xml
index 6183460..3b7cda9 100644
--- a/core/src/main/resources/content.xml
+++ b/core/src/main/resources/content.xml
@@ -125,7 +125,6 @@ under the License.
<Entitlement name="CONNECTOR_RELOAD"/>
<Entitlement name="CONFIGURATION_EXPORT"/>
<Entitlement name="CONFIGURATION_LIST"/>
- <Entitlement name="CONFIGURATION_READ"/>
<Entitlement name="CONFIGURATION_SET"/>
<Entitlement name="CONFIGURATION_DELETE"/>
<Entitlement name="TASK_LIST"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java b/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java
index ca8b638..b4f2c36 100644
--- a/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java
+++ b/core/src/test/java/org/apache/syncope/core/persistence/dao/EntitlementTest.java
@@ -41,7 +41,7 @@ public class EntitlementTest extends AbstractDAOTest {
@Test
public void findAll() {
List<Entitlement> list = entitlementDAO.findAll();
- assertEquals("did not get expected number of entitlements ", 89, list.size());
+ assertEquals("did not get expected number of entitlements ", 88, list.size());
}
@Test
http://git-wip-us.apache.org/repos/asf/syncope/blob/2674037d/core/src/test/resources/content.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/content.xml b/core/src/test/resources/content.xml
index 320da22..b9d20d5 100644
--- a/core/src/test/resources/content.xml
+++ b/core/src/test/resources/content.xml
@@ -1050,7 +1050,6 @@ under the License.
<Entitlement name="CONNECTOR_RELOAD"/>
<Entitlement name="CONFIGURATION_EXPORT"/>
<Entitlement name="CONFIGURATION_LIST"/>
- <Entitlement name="CONFIGURATION_READ"/>
<Entitlement name="CONFIGURATION_SET"/>
<Entitlement name="CONFIGURATION_DELETE"/>
<Entitlement name="TASK_LIST"/>