roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1578705 - in /roller/branches/roller_5.0: weblogger-web/pom.xml weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java weblogger-webapp/src/main/webapp/WEB-INF/security.xml
Date Tue, 18 Mar 2014 01:43:37 GMT
Author: gmazza
Date: Tue Mar 18 01:43:36 2014
New Revision: 1578705

URL: http://svn.apache.org/r1578705
Log:
ROL-1987 minor changes to facilitate using LDAP with the 5.0 series

Modified:
    roller/branches/roller_5.0/weblogger-web/pom.xml
    roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java
    roller/branches/roller_5.0/weblogger-webapp/src/main/webapp/WEB-INF/security.xml

Modified: roller/branches/roller_5.0/weblogger-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/pom.xml?rev=1578705&r1=1578704&r2=1578705&view=diff
==============================================================================
--- roller/branches/roller_5.0/weblogger-web/pom.xml (original)
+++ roller/branches/roller_5.0/weblogger-web/pom.xml Tue Mar 18 01:43:36 2014
@@ -207,7 +207,7 @@
         <dependency>
             <groupId>org.springframework.ldap</groupId>
             <artifactId>spring-ldap</artifactId>
-            <version>1.2</version>
+            <version>1.2.1</version>
         </dependency>
 
         <dependency>

Modified: roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java?rev=1578705&r1=1578704&r2=1578705&view=diff
==============================================================================
--- roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java
(original)
+++ roller/branches/roller_5.0/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java
Tue Mar 18 01:43:36 2014
@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletReq
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.util.UUIDGenerator;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.business.UserManager;
@@ -46,6 +47,12 @@ public class BasicUserAutoProvision impl
       UserManager mgr;
       try {
         mgr = WebloggerFactory.getWeblogger().getUserManager();
+
+        // need to give an id to the new user if none exist
+        if (ud.getId() == null) {
+            ud.setId(UUIDGenerator.generateUUID());
+        }
+
         mgr.addUser(ud);
         WebloggerFactory.getWeblogger().flush();
       } catch (WebloggerException e) {

Modified: roller/branches/roller_5.0/weblogger-webapp/src/main/webapp/WEB-INF/security.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_5.0/weblogger-webapp/src/main/webapp/WEB-INF/security.xml?rev=1578705&r1=1578704&r2=1578705&view=diff
==============================================================================
--- roller/branches/roller_5.0/weblogger-webapp/src/main/webapp/WEB-INF/security.xml (original)
+++ roller/branches/roller_5.0/weblogger-webapp/src/main/webapp/WEB-INF/security.xml Tue Mar
18 01:43:36 2014
@@ -24,11 +24,6 @@
              http://www.springframework.org/schema/security
              http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
 
-    <!--
-xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.1.xsd">
--->
-
     <http auto-config="false" lowercase-comparisons="true" access-decision-manager-ref="accessDecisionManager">
         <intercept-url pattern="/images/**" filters="none"/>
         <intercept-url pattern="/scripts/**" filters="none"/>



Mime
View raw message