Author: reschke
Date: Fri Mar 11 13:54:04 2016
New Revision: 1734563
URL: http://svn.apache.org/viewvc?rev=1734563&view=rev
Log:
OAK-2748: Oak Implementation for JCR-3836 and JCR-3837 (getting authorizable by
type) (ported to 1.2)
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AbstractAutoSaveTest.java
- copied unchanged from r1672611,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AbstractAutoSaveTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableByTypeTest.java
- copied unchanged from r1672611,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableByTypeTest.java
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableByTypeTestTest.java
- copied unchanged from r1672611,
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableByTypeTestTest.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java
jackrabbit/oak/branches/1.2/oak-parent/pom.xml
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 11 13:54:04 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601
,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695
482,1695492,1695507,1695521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707331,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1
710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,172596
0,1726232,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727508,1727515-1727518,1727893,1728037,1728041,1728070,1728114,1728281,1728443,1728642,1729200,1729979,1730216,1730527,1730581,1730629,1730801,1731647-1731648,1731797,1732278,1734254
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570
,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695
457,1695482,1695492,1695507,1695521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707331,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1
710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,172555
5,1725960,1726232,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727508,1727515-1727518,1727893,1728037,1728041,1728070,1728114,1728281,1728443,1728642,1729200,1729979,1730216,1730527,1730581,1730629,1730801,1731647-1731648,1731797,1732278,1734254
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java?rev=1734563&r1=1734562&r2=1734563&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
Fri Mar 11 13:54:04 2016
@@ -112,6 +112,11 @@ public class UserManagerImpl implements
}
@Override
+ public <T extends Authorizable> T getAuthorizable(String id, Class<T>
authorizableClass) throws RepositoryException {
+ return UserUtil.castAuthorizable(getAuthorizable(id),
authorizableClass);
+ }
+
+ @Override
public Authorizable getAuthorizable(Principal principal) throws
RepositoryException {
return
getAuthorizable(userProvider.getAuthorizableByPrincipal(principal));
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java?rev=1734563&r1=1734562&r2=1734563&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
Fri Mar 11 13:54:04 2016
@@ -30,6 +30,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
/**
* Implementation of the user management that allows to set the autosave flag.
@@ -70,6 +71,11 @@ public class AutoSaveEnabledManager impl
}
@Override
+ public <T extends Authorizable> T getAuthorizable(String id, Class<T>
authorizableClass) throws RepositoryException {
+ return UserUtil.castAuthorizable(wrap(dlg.getAuthorizable(id)),
authorizableClass);
+ }
+
+ @Override
public Authorizable getAuthorizable(Principal principal) throws
RepositoryException {
return wrap(dlg.getAuthorizable(principal));
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java?rev=1734563&r1=1734562&r2=1734563&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtil.java
Fri Mar 11 13:54:04 2016
@@ -20,6 +20,8 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.jackrabbit.api.security.user.AuthorizableTypeException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
@@ -128,4 +130,17 @@ public final class UserUtil implements U
}
return null;
}
+
+ @CheckForNull
+ public static <T extends Authorizable> T castAuthorizable(@Nullable
Authorizable authorizable, Class<T> authorizableClass) throws
AuthorizableTypeException {
+ if (authorizable == null) {
+ return null;
+ }
+
+ if (authorizableClass != null &&
authorizableClass.isInstance(authorizable)) {
+ return authorizableClass.cast(authorizable);
+ } else {
+ throw new AuthorizableTypeException("Invalid authorizable type '"
+ ((authorizableClass == null) ? "null" : authorizableClass) + '\'');
+ }
+ }
}
\ No newline at end of file
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java?rev=1734563&r1=1734562&r2=1734563&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
Fri Mar 11 13:54:04 2016
@@ -25,8 +25,6 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.Impersonation;
import org.apache.jackrabbit.api.security.user.User;
-import org.apache.jackrabbit.api.security.user.UserManager;
-import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
@@ -38,15 +36,7 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-public class AutoSaveEnabledManagerTest extends AbstractSecurityTest {
-
- private UserManager mgr;
-
- @Override
- public void before() throws Exception {
- super.before();
- mgr = getUserManager(root);
- }
+public class AutoSaveEnabledManagerTest extends AbstractAutoSaveTest {
@Override
public void after() throws Exception {
Modified:
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java?rev=1734563&r1=1734562&r2=1734563&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java
Fri Mar 11 13:54:04 2016
@@ -27,7 +27,6 @@ import java.util.Iterator;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
import com.google.common.base.Function;
import com.google.common.collect.Iterators;
@@ -38,6 +37,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.jcr.session.operation.UserManagerOperation;
+import org.apache.jackrabbit.oak.spi.security.user.util.UserUtil;
/**
* This implementation of {@code UserManager} delegates back to a
@@ -68,6 +68,20 @@ public class UserManagerDelegator implem
}
@Override
+ public <T extends Authorizable> T getAuthorizable(final String id, final
Class<T> authorizableClass) throws RepositoryException {
+ return (T) sessionDelegate.perform(
+ new UserManagerOperation<Authorizable>(sessionDelegate,
"getAuthorizable") {
+ @Override
+ public Authorizable perform() throws RepositoryException {
+ Authorizable authorizable =
userManagerDelegate.getAuthorizable(id);
+ return
UserUtil.castAuthorizable(AuthorizableDelegator.wrap(sessionDelegate,
authorizable), authorizableClass);
+
+ }
+ }
+ );
+ }
+
+ @Override
public Authorizable getAuthorizable(final Principal principal) throws
RepositoryException {
return sessionDelegate.performNullable(new
UserManagerOperation<Authorizable>(sessionDelegate, "getAuthorizable") {
@Override
@@ -79,7 +93,7 @@ public class UserManagerDelegator implem
}
@Override
- public Authorizable getAuthorizableByPath(final String path) throws
UnsupportedRepositoryOperationException, RepositoryException {
+ public Authorizable getAuthorizableByPath(final String path) throws
RepositoryException {
return sessionDelegate.performNullable(new
UserManagerOperation<Authorizable>(sessionDelegate, "getAuthorizableByPath") {
@Override
public Authorizable performNullable() throws RepositoryException {
@@ -156,7 +170,7 @@ public class UserManagerDelegator implem
}
@Override
- public User createUser(final String userID, final String password, final
Principal principal, final String intermediatePath) throws
AuthorizableExistsException, RepositoryException {
+ public User createUser(final String userID, final String password, final
Principal principal, final String intermediatePath) throws RepositoryException {
return sessionDelegate.perform(new
UserManagerOperation<User>(sessionDelegate, "createUser") {
@Nonnull
@Override
@@ -168,7 +182,7 @@ public class UserManagerDelegator implem
}
@Override
- public User createSystemUser(final String userID, final String
intermediatePath) throws AuthorizableExistsException, RepositoryException {
+ public User createSystemUser(final String userID, final String
intermediatePath) throws RepositoryException {
return sessionDelegate.perform(new
UserManagerOperation<User>(sessionDelegate, "createUser") {
@Nonnull
@Override
@@ -180,7 +194,7 @@ public class UserManagerDelegator implem
}
@Override
- public Group createGroup(final String groupID) throws
AuthorizableExistsException, RepositoryException {
+ public Group createGroup(final String groupID) throws RepositoryException {
return sessionDelegate.perform(new
UserManagerOperation<Group>(sessionDelegate, "createGroup") {
@Nonnull
@Override
@@ -192,7 +206,7 @@ public class UserManagerDelegator implem
}
@Override
- public Group createGroup(final Principal principal) throws
AuthorizableExistsException, RepositoryException {
+ public Group createGroup(final Principal principal) throws
RepositoryException {
return sessionDelegate.perform(new
UserManagerOperation<Group>(sessionDelegate, "createGroup") {
@Nonnull
@Override
@@ -204,7 +218,7 @@ public class UserManagerDelegator implem
}
@Override
- public Group createGroup(final Principal principal, final String
intermediatePath) throws AuthorizableExistsException, RepositoryException {
+ public Group createGroup(final Principal principal, final String
intermediatePath) throws RepositoryException {
return sessionDelegate.perform(new
UserManagerOperation<Group>(sessionDelegate, "createGroup") {
@Nonnull
@Override
@@ -216,7 +230,7 @@ public class UserManagerDelegator implem
}
@Override
- public Group createGroup(final String groupID, final Principal principal,
final String intermediatePath) throws AuthorizableExistsException,
RepositoryException {
+ public Group createGroup(final String groupID, final Principal principal,
final String intermediatePath) throws RepositoryException {
return sessionDelegate.perform(new
UserManagerOperation<Group>(sessionDelegate, "createGroup") {
@Nonnull
@Override
@@ -239,7 +253,7 @@ public class UserManagerDelegator implem
}
@Override
- public void autoSave(final boolean enable) throws
UnsupportedRepositoryOperationException, RepositoryException {
+ public void autoSave(final boolean enable) throws RepositoryException {
sessionDelegate.performVoid(new UserManagerOperation(sessionDelegate,
"autoSave") {
@Override
public void performVoid() throws RepositoryException {
Modified: jackrabbit/oak/branches/1.2/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-parent/pom.xml?rev=1734563&r1=1734562&r2=1734563&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-parent/pom.xml Fri Mar 11 13:54:04 2016
@@ -42,7 +42,7 @@
<project.reporting.outputEncoding>
${project.build.sourceEncoding}
</project.reporting.outputEncoding>
- <jackrabbit.version>2.10.0</jackrabbit.version>
+ <jackrabbit.version>2.10.1</jackrabbit.version>
<mongo.host>127.0.0.1</mongo.host>
<mongo.port>27017</mongo.port>
<mongo.db>MongoMKDB</mongo.db>
