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 an...@apache.org on 2013/05/13 13:59:25 UTC
svn commit: r1481805 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
Author: angela
Date: Mon May 13 11:59:24 2013
New Revision: 1481805
URL: http://svn.apache.org/r1481805
Log:
OAK-50 : Implement User Management (reverting changes made by rev. 1481737 for backwards compatibility with JR 2.x)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1481805&r1=1481804&r2=1481805&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java Mon May 13 11:59:24 2013
@@ -150,7 +150,7 @@ class UserImporter implements ProtectedP
private Map<String, Principal> principals;
UserImporter(ConfigurationParameters config) {
- String importBehaviorStr = config.getConfigValue(PARAM_IMPORT_BEHAVIOR, ImportBehavior.NAME_ABORT);
+ String importBehaviorStr = config.getConfigValue(PARAM_IMPORT_BEHAVIOR, ImportBehavior.NAME_IGNORE);
importBehavior = ImportBehavior.valueFromString(importBehaviorStr);
}