You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/11/08 09:09:01 UTC
svn commit: r1539943 - in /syncope/trunk:
console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java
pom.xml
Author: ilgrosso
Date: Fri Nov 8 08:09:01 2013
New Revision: 1539943
URL: http://svn.apache.org/r1539943
Log:
Merge from 1_1_X
Modified:
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java
syncope/trunk/pom.xml
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1539943&r1=1539942&r2=1539943&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java Fri Nov 8 08:09:01 2013
@@ -50,7 +50,7 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='key:textField']\");", "30000");
- assertEquals("notification.maxRetries", selenium.getAttribute("//input[@name='key:textField']@value"));
+ assertEquals("authentication.statuses", selenium.getAttribute("//input[@name='key:textField']@value"));
selenium.click("css=a.w_close");
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java?rev=1539943&r1=1539942&r2=1539943&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java Fri Nov 8 08:09:01 2013
@@ -99,7 +99,7 @@ public class LDAPMembershipPropagationAc
Set<Attribute> attributes = new HashSet<Attribute>(task.getAttributes());
Set<String> groups = new HashSet<String>(roleAccountLinks);
- Attribute ldapGroups = AttributeUtil.find("ldapGroups", attributes);
+ Attribute ldapGroups = AttributeUtil.find(getGroupMembershipAttrName(), attributes);
if (ldapGroups != null) {
for (Object obj : ldapGroups.getValue()) {
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1539943&r1=1539942&r2=1539943&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri Nov 8 08:09:01 2013
@@ -312,7 +312,7 @@ under the License.
<activiti.version>5.14</activiti.version>
<cxf.version>2.7.8-SNAPSHOT</cxf.version>
- <spring.version>3.2.4.RELEASE</spring.version>
+ <spring.version>3.2.5.RELEASE</spring.version>
<spring-security.version>3.1.4.RELEASE</spring-security.version>
<jackson.version>2.2.3</jackson.version>
<xstream.version>1.4.4</xstream.version>
@@ -324,7 +324,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <wicket.version>6.11.0</wicket.version>
+ <wicket.version>6.12.0</wicket.version>
<groovy.version>2.1.6</groovy.version>