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 2012/10/17 16:09:41 UTC

svn commit: r1399273 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java

Author: angela
Date: Wed Oct 17 14:09:41 2012
New Revision: 1399273

URL: http://svn.apache.org/viewvc?rev=1399273&view=rev
Log:
 OAK-91 - Implement Authentication Support (WIP)
 
partially reverting 1399192

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1399273&r1=1399272&r2=1399273&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java Wed Oct 17 14:09:41 2012
@@ -80,11 +80,6 @@ public class SecurityProviderImpl implem
             loginConfig = new OakConfiguration();
             Configuration.setConfiguration(loginConfig);
         }
-        if (loginConfig.getAppConfigurationEntry(appName) == null) {
-            log.warn("Failed to retrieve login configuration for {}: using default configuration.", appName);
-            loginConfig = new OakConfiguration();
-            Configuration.setConfiguration(loginConfig);
-        }
         return new LoginContextProviderImpl(appName, loginConfig, nodeStore, this);
     }
 



Re: svn commit: r1399273 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java

Posted by Michael Dürig <md...@apache.org>.
Ok this causes the CI build to fail again. Admittedly this might be a 
work around but at least it keeps the build stable until we have a 
correct solution in place. I don't see why we couldn't have left this in 
place until we found a better solution. Breaking the build for any 
length of time creates a nuisance an additional work for all others and 
we should really try to avoid this.

Michael


On 17.10.12 15:09, angela@apache.org wrote:
> Author: angela
> Date: Wed Oct 17 14:09:41 2012
> New Revision: 1399273
>
> URL: http://svn.apache.org/viewvc?rev=1399273&view=rev
> Log:
>   OAK-91 - Implement Authentication Support (WIP)
>
> partially reverting 1399192
>
> Modified:
>      jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
>
> Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1399273&r1=1399272&r2=1399273&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java (original)
> +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java Wed Oct 17 14:09:41 2012
> @@ -80,11 +80,6 @@ public class SecurityProviderImpl implem
>               loginConfig = new OakConfiguration();
>               Configuration.setConfiguration(loginConfig);
>           }
> -        if (loginConfig.getAppConfigurationEntry(appName) == null) {
> -            log.warn("Failed to retrieve login configuration for {}: using default configuration.", appName);
> -            loginConfig = new OakConfiguration();
> -            Configuration.setConfiguration(loginConfig);
> -        }
>           return new LoginContextProviderImpl(appName, loginConfig, nodeStore, this);
>       }
>
>
>