You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/07/28 10:00:24 UTC
svn commit: r1693018 - in /jackrabbit/oak/branches/1.2: ./ oak-auth-external/
oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/
oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/au...
Author: chetanm
Date: Tue Jul 28 08:00:23 2015
New Revision: 1693018
URL: http://svn.apache.org/r1693018
Log:
OAK-3146 - ExternalLoginModuleFactory should inject SyncManager and ExternalIdentityProviderManager
Reverting 1693000
Removed:
jackrabbit/oak/branches/1.2/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleFactoryTest.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-auth-external/pom.xml
jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 28 08:00:23 2015
@@ -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,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,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,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,1684820,1684868,1685023
,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,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,1692274,1692363,1692478,1692955,1692998,1693002
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,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,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,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,1684820,1684868,1685023
,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,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,1692274,1692363,1692478,1692955,1693002
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-auth-external/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-auth-external/pom.xml?rev=1693018&r1=1693017&r2=1693018&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-auth-external/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-auth-external/pom.xml Tue Jul 28 08:00:23 2015
@@ -180,10 +180,5 @@
<version>2.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1693018&r1=1693017&r2=1693018&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java (original)
+++ jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java Tue Jul 28 08:00:23 2015
@@ -75,10 +75,6 @@ public class ExternalLoginModule extends
*/
public static final String PARAM_SYNC_HANDLER_NAME = "sync.handlerName";
- private ExternalIdentityProviderManager idpManager;
-
- private SyncManager syncManager;
-
/**
* internal configuration when invoked from a factory rather than jaas
*/
@@ -139,13 +135,11 @@ public class ExternalLoginModule extends
if (idpName.length() == 0) {
log.error("External login module needs IPD name. Will not be used for login.");
} else {
- if (idpManager == null) {
- idpManager = WhiteboardUtils.getService(whiteboard, ExternalIdentityProviderManager.class);
- }
- if (idpManager == null) {
+ ExternalIdentityProviderManager idpMgr = WhiteboardUtils.getService(whiteboard, ExternalIdentityProviderManager.class);
+ if (idpMgr == null) {
log.error("External login module needs IDPManager. Will not be used for login.");
} else {
- idp = idpManager.getProvider(idpName);
+ idp = idpMgr.getProvider(idpName);
if (idp == null) {
log.error("No IDP found with name {}. Will not be used for login.", idpName);
}
@@ -156,13 +150,11 @@ public class ExternalLoginModule extends
if (syncHandlerName.length() == 0) {
log.error("External login module needs SyncHandler name. Will not be used for login.");
} else {
- if (syncManager == null) {
- syncManager = WhiteboardUtils.getService(whiteboard, SyncManager.class);
- }
- if (syncManager == null) {
+ SyncManager syncMgr = WhiteboardUtils.getService(whiteboard, SyncManager.class);
+ if (syncMgr == null) {
log.error("External login module needs SyncManager. Will not be used for login.");
} else {
- syncHandler = syncManager.getSyncHandler(syncHandlerName);
+ syncHandler = syncMgr.getSyncHandler(syncHandlerName);
if (syncHandler == null) {
log.error("No SyncHandler found with name {}. Will not be used for login.", syncHandlerName);
}
@@ -412,13 +404,4 @@ public class ExternalLoginModule extends
Class scClass = SimpleCredentials.class;
return Collections.singleton(scClass);
}
-
-
- public void setSyncManager(SyncManager syncManager) {
- this.syncManager = syncManager;
- }
-
- public void setIdpManager(ExternalIdentityProviderManager idpManager) {
- this.idpManager = idpManager;
- }
}
\ No newline at end of file
Modified: jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java?rev=1693018&r1=1693017&r2=1693018&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java (original)
+++ jackrabbit/oak/branches/1.2/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java Tue Jul 28 08:00:23 2015
@@ -165,9 +165,7 @@ public class ExternalLoginModuleFactory
*/
@Override
public LoginModule createLoginModule() {
- ExternalLoginModule lm = new ExternalLoginModule(osgiConfig);
- lm.setIdpManager(idpManager);
- lm.setSyncManager(syncManager);
- return lm;
+ return new ExternalLoginModule(osgiConfig);
}
+
}
\ No newline at end of file