svn commit: r1416947 - in /syncope/trunk: ./ core/src/main/java/org/apache/syncope/core/persistence/beans/ core/src/test/java/org/apache/syncope/core/persistence/relationships/ core/src/test/java/org/
Author: ilgrosso Date: Tue Dec 4 14:07:25 2012 New Revision: 1416947 URL: http://svn.apache.org/viewvc?rev=1416947view=rev Log: Merge from 1_0_X Modified: syncope/trunk/ (props changed) syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserRequestTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java syncope/trunk/pom.xml Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1416868-1416936 Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java?rev=1416947r1=1416946r2=1416947view=diff == --- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java (original) +++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java Tue Dec 4 14:07:25 2012 @@ -35,8 +35,8 @@ import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import org.apache.syncope.client.search.NodeCond; -import org.apache.syncope.core.persistence.validation.entity.NotificationCheck; import org.apache.syncope.client.util.XMLSerializer; +import org.apache.syncope.core.persistence.validation.entity.NotificationCheck; import org.apache.syncope.types.IntMappingType; import org.apache.syncope.types.TraceLevel; Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java?rev=1416947r1=1416946r2=1416947view=diff == --- syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java (original) +++ syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java Tue Dec 4 14:07:25 2012 @@ -18,10 +18,10 @@ */ package org.apache.syncope.core.persistence.relationships; -import java.util.List; import static org.junit.Assert.*; -import org.junit.Test; +import java.util.List; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.apache.syncope.core.persistence.beans.user.UAttr; Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java?rev=1416947r1=1416946r2=1416947view=diff == --- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java (original) +++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java Tue Dec 4 14:07:25 2012 @@ -38,7 +38,10 @@ import org.apache.syncope.client.validat import org.apache.syncope.client.validation.SyncopeClientException; import org.apache.syncope.types.SchemaType; import org.apache.syncope.types.SyncopeClientExceptionType; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.JVM
svn commit: r1417507 - in /syncope/branches/DEV_ROLE_PROVISIONING/core/src: main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java test/java/org/apache/syncope/core/rest/ResourceTestITCas
Author: ilgrosso
Date: Wed Dec 5 16:21:26 2012
New Revision: 1417507
URL: http://svn.apache.org/viewvc?rev=1417507view=rev
Log:
Some UMapping / UMappingItems left in Resource DataBinder now fixed + added a
dedicated IT
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
URL:
http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java?rev=1417507r1=1417506r2=1417507view=diff
==
---
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
(original)
+++
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
Wed Dec 5 16:21:26 2012
@@ -39,6 +39,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.PasswordPolicy;
import org.apache.syncope.core.persistence.beans.SyncPolicy;
import org.apache.syncope.core.persistence.beans.role.RMapping;
+import org.apache.syncope.core.persistence.beans.role.RMappingItem;
import org.apache.syncope.core.persistence.beans.user.UMapping;
import org.apache.syncope.core.persistence.beans.user.UMappingItem;
import org.apache.syncope.core.persistence.dao.ConnInstanceDAO;
@@ -109,12 +110,12 @@ public class ResourceDataBinder {
if (resourceTO.getUmapping() != null) {
UMapping mapping = new UMapping();
resource.setUmapping(mapping);
-populateMapping(resourceTO.getUmapping(), mapping);
+populateMapping(resourceTO.getUmapping(), mapping, new
UMappingItem());
}
if (resourceTO.getRmapping() != null) {
RMapping mapping = new RMapping();
resource.setRmapping(mapping);
-populateMapping(resourceTO.getRmapping(), mapping);
+populateMapping(resourceTO.getRmapping(), mapping, new
RMappingItem());
}
resource.setCreateTraceLevel(resourceTO.getCreateTraceLevel());
@@ -145,10 +146,12 @@ public class ResourceDataBinder {
return resource;
}
-private void populateMapping(final MappingTO mappingTO, final
AbstractMapping mapping) {
+private void populateMapping(final MappingTO mappingTO, final
AbstractMapping mapping,
+final AbstractMappingItem prototype) {
+
mapping.setAccountLink(mappingTO.getAccountLink());
-for (AbstractMappingItem item : getMappingItems(mappingTO.getItems()))
{
+for (AbstractMappingItem item : getMappingItems(mappingTO.getItems(),
prototype)) {
if (item.isAccountid()) {
mapping.setAccountIdItem(item);
} else if (item.isPassword()) {
@@ -159,16 +162,18 @@ public class ResourceDataBinder {
}
}
-private SetAbstractMappingItem getMappingItems(final
CollectionMappingItemTO itemTOs) {
+private SetAbstractMappingItem getMappingItems(final
CollectionMappingItemTO itemTOs,
+final AbstractMappingItem prototype) {
+
SetAbstractMappingItem items = new
HashSetAbstractMappingItem(itemTOs.size());
for (MappingItemTO itemTO : itemTOs) {
-items.add(getMappingItem(itemTO));
+items.add(getMappingItem(itemTO, prototype));
}
return items;
}
-private AbstractMappingItem getMappingItem(final MappingItemTO itemTO)
+private AbstractMappingItem getMappingItem(final MappingItemTO itemTO,
final AbstractMappingItem prototype)
throws SyncopeClientCompositeErrorException {
SyncopeClientCompositeErrorException scce = new
SyncopeClientCompositeErrorException(HttpStatus.BAD_REQUEST);
@@ -213,7 +218,7 @@ public class ResourceDataBinder {
throw scce;
}
-UMappingItem item = new UMappingItem();
+AbstractMappingItem item = (AbstractMappingItem)
SerializationUtils.clone(prototype);
BeanUtils.copyProperties(itemTO, item, MAPPINGITEM_IGNORE_PROPERTIES);
return item;
}
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java?rev=1417507r1=1417506r2=1417507view=diff
==
---
syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
(original)
+++
syncope/branches/DEV_ROLE_PROVISIONING
svn commit: r1418240 - in /syncope/branches/1_0_X: parent/pom.xml pom.xml
Author: ilgrosso Date: Fri Dec 7 09:57:50 2012 New Revision: 1418240 URL: http://svn.apache.org/viewvc?rev=1418240view=rev Log: [SYNCOPE-243] Reworked a bit the provided patch in order to cover either pom.xml and parent/pom.xml Modified: syncope/branches/1_0_X/parent/pom.xml syncope/branches/1_0_X/pom.xml Modified: syncope/branches/1_0_X/parent/pom.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/parent/pom.xml?rev=1418240r1=1418239r2=1418240view=diff == --- syncope/branches/1_0_X/parent/pom.xml (original) +++ syncope/branches/1_0_X/parent/pom.xml Fri Dec 7 09:57:50 2012 @@ -966,11 +966,13 @@ under the License. exclude**/*.js/exclude exclude**/*.csv/exclude exclude**/archetype-resources/**/exclude +exclude**/maven-eclipse.xml/exclude +exclude**/*.iml/exclude +exclude**/*.log/exclude exclude.externalToolBuilders/**/exclude -excludemaven-eclipse.xml/exclude exclude.git/**/exclude exclude.idea/**/exclude -exclude**/*.iml/exclude +exclude**/.*/exclude /excludes /configuration executions Modified: syncope/branches/1_0_X/pom.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/pom.xml?rev=1418240r1=1418239r2=1418240view=diff == --- syncope/branches/1_0_X/pom.xml (original) +++ syncope/branches/1_0_X/pom.xml Fri Dec 7 09:57:50 2012 @@ -70,11 +70,14 @@ under the License. exclude**/*.css/exclude exclude**/*.js/exclude exclude**/*.csv/exclude +exclude**/archetype-resources/**/exclude +exclude**/maven-eclipse.xml/exclude +exclude**/*.iml/exclude +exclude**/*.log/exclude exclude.externalToolBuilders/**/exclude -excludemaven-eclipse.xml/exclude exclude.git/**/exclude exclude.idea/**/exclude -exclude**/*.iml/exclude +exclude**/.*/exclude !-- Need to explicitely exclude these modules since they are not part of the default build profile: they will be checked anyway in the apache-release profile, as submodules. -- excludearchetype/**/exclude
svn commit: r1418259 - in /syncope/branches/DEV_ROLE_PROVISIONING: ./ pom.xml
Author: ilgrosso Date: Fri Dec 7 10:29:15 2012 New Revision: 1418259 URL: http://svn.apache.org/viewvc?rev=1418259view=rev Log: Merge from trunk Modified: syncope/branches/DEV_ROLE_PROVISIONING/ (props changed) syncope/branches/DEV_ROLE_PROVISIONING/pom.xml Propchange: syncope/branches/DEV_ROLE_PROVISIONING/ -- Merged /syncope/trunk:r1416948-1418258 Merged /syncope/branches/1_0_X:r1416937-1418254 Modified: syncope/branches/DEV_ROLE_PROVISIONING/pom.xml URL: http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/pom.xml?rev=1418259r1=1418258r2=1418259view=diff == --- syncope/branches/DEV_ROLE_PROVISIONING/pom.xml (original) +++ syncope/branches/DEV_ROLE_PROVISIONING/pom.xml Fri Dec 7 10:29:15 2012 @@ -1013,12 +1013,13 @@ under the License. exclude**/*.js/exclude exclude**/*.csv/exclude exclude**/archetype-resources/**/exclude +exclude**/maven-eclipse.xml/exclude +exclude**/*.iml/exclude +exclude**/*.log/exclude exclude.externalToolBuilders/**/exclude -excludemaven-eclipse.xml/exclude -exclude.gitignore/exclude exclude.git/**/exclude exclude.idea/**/exclude -exclude**/*.iml/exclude +exclude**/.*/exclude /excludes /configuration executions
svn commit: r1418327 - in /syncope/branches/DEV_ROLE_PROVISIONING/core/src: main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java test/resources/content.xml
Author: ilgrosso
Date: Fri Dec 7 14:29:41 2012
New Revision: 1418327
URL: http://svn.apache.org/viewvc?rev=1418327view=rev
Log:
Adding a utility PropagationActions class allowing transparent LDAP role
membership propagation
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java
syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/resources/content.xml
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java
URL:
http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java?rev=1418327r1=1418326r2=1418327view=diff
==
---
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java
(original)
+++
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java
Fri Dec 7 14:29:41 2012
@@ -19,28 +19,42 @@
package org.apache.syncope.core.propagation;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.MapContext;
import org.apache.commons.lang.StringUtils;
import org.apache.syncope.core.persistence.beans.PropagationTask;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
-import org.apache.syncope.core.persistence.dao.RoleDAO;
+import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
+import org.apache.syncope.core.persistence.dao.UserDAO;
import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.types.AttributableType;
+import org.apache.syncope.types.ResourceOperation;
+import org.identityconnectors.framework.common.objects.Attribute;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
import org.identityconnectors.framework.common.objects.ConnectorObject;
-import org.identityconnectors.framework.common.objects.ObjectClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+/**
+ * Simple action for propagating role memberships to LDAP groups, when the
same resource is configured for both users
+ * and roles.
+ */
public class LDAPMembershipPropagationActions extends
DefaultPropagationActions {
private static final Logger LOG =
LoggerFactory.getLogger(LDAPMembershipPropagationActions.class);
+/**
+ * Allows easy subclassing for the ConnId AD connector bundle.
+ */
+protected static final String GROUP_MEMBERSHIP_ATTR = ldapGroups;
+
@Autowired
-private RoleDAO roleDAO;
+private UserDAO userDAO;
@Autowired
private JexlUtil jexlUtil;
@@ -50,10 +64,17 @@ public class LDAPMembershipPropagationAc
public void before(final PropagationTask task, final ConnectorObject
beforeObj) {
super.before(task, beforeObj);
-if (beforeObj.getObjectClass() == ObjectClass.ACCOUNT
task.getResource().getRmapping() != null) {
+if (ResourceOperation.DELETE != task.getPropagationOperation()
+ AttributableType.USER == task.getSubjectType()
task.getResource().getRmapping() != null) {
+
+SyncopeUser user = userDAO.find(task.getSubjectId());
+if (user == null) {
+throw new IllegalArgumentException(User +
task.getSubjectId() + not found);
+}
+
ListString roleAccountLinks = new ArrayListString();
-for (SyncopeRole role : roleDAO.findAll()) {
-if (role.getResources().contains(task.getResource())
+for (SyncopeRole role : user.getRoles()) {
+if
(role.getResourceNames().contains(task.getResource().getName())
StringUtils.isNotBlank(task.getResource().getRmapping().getAccountLink())) {
LOG.debug(Evaluating accountLink for {}, role);
@@ -73,10 +94,12 @@ public class LDAPMembershipPropagationAc
LOG.debug(Role accountLinks to propagate for membership: {},
roleAccountLinks);
if (!roleAccountLinks.isEmpty()) {
-task.getAttributes().add(AttributeBuilder.build(ldapGroups,
roleAccountLinks));
+SetAttribute attributes = new
HashSetAttribute(task.getAttributes());
+attributes.add(AttributeBuilder.build(GROUP_MEMBERSHIP_ATTR,
roleAccountLinks));
+task.setAttributes(attributes);
}
} else {
-LOG.debug(It's {}, not doing anything,
beforeObj.getObjectClass());
+LOG.debug(Not about user, or role mapping missing
svn commit: r1419259 - in /syncope/trunk/core/src/test/java/org/apache/syncope/core/rest: AbstractTest.java RoleTestITCase.java SchemaTestITCase.java TaskTestITCase.java UserTestITCase.java
Author: ilgrosso
Date: Mon Dec 10 08:28:43 2012
New Revision: 1419259
URL: http://svn.apache.org/viewvc?rev=1419259view=rev
Log:
[SYNCOPE-245] Applying provided patch
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1419259r1=1419258r2=1419259view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
Mon Dec 10 08:28:43 2012
@@ -22,6 +22,8 @@ import javax.sql.DataSource;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory;
+import org.apache.syncope.client.mod.AttributeMod;
+import org.apache.syncope.client.to.AttributeTO;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -35,6 +37,20 @@ import org.springframework.web.client.Re
@ContextConfiguration(locations = {classpath:restClientContext.xml,
classpath:testJDBCContext.xml})
public abstract class AbstractTest {
+protected static AttributeTO attributeTO(final String schema, final String
value) {
+AttributeTO attr = new AttributeTO();
+attr.setSchema(schema);
+attr.addValue(value);
+return attr;
+}
+
+protected static AttributeMod attributeMod(final String schema, final
String valueToBeAdded) {
+AttributeMod attr = new AttributeMod();
+attr.setSchema(schema);
+attr.addValueToBeAdded(valueToBeAdded);
+return attr;
+}
+
/**
* Logger.
*/
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java?rev=1419259r1=1419258r2=1419259view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
Mon Dec 10 08:28:43 2012
@@ -18,39 +18,37 @@
*/
package org.apache.syncope.core.rest;
-import static org.junit.Assert.*;
-
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory;
-import org.apache.syncope.client.mod.AttributeMod;
import org.apache.syncope.client.mod.RoleMod;
-import org.apache.syncope.client.to.AttributeTO;
import org.apache.syncope.client.to.RoleTO;
import org.apache.syncope.client.to.UserTO;
import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.runners.MethodSorters;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpStatusCodeException;
-import org.junit.FixMethodOrder;
-import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class RoleTestITCase extends AbstractTest {
@Test
public void createWithException() {
-AttributeTO attributeTO = new AttributeTO();
-attributeTO.setSchema(attr1);
-attributeTO.addValue(value1);
-
RoleTO newRoleTO = new RoleTO();
-newRoleTO.addAttribute(attributeTO);
+newRoleTO.addAttribute(attributeTO(attr1, value1));
Throwable t = null;
try {
@@ -77,10 +75,6 @@ public class RoleTestITCase extends Abst
// inherited so setter execution should be ignored
roleTO.setPasswordPolicy(2L);
-AttributeTO icon = new AttributeTO();
-icon.setSchema(icon);
-icon.addValue(anIcon
svn commit: r1419298 - /syncope/trunk/
Author: ilgrosso Date: Mon Dec 10 09:51:42 2012 New Revision: 1419298 URL: http://svn.apache.org/viewvc?rev=1419298view=rev Log: Merge from 1_0_X Modified: syncope/trunk/ (props changed) Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1418255-1419297
svn commit: r1420152 - in /syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core: propagation/PropagationManager.java util/MappingUtil.java
Author: ilgrosso
Date: Tue Dec 11 13:41:10 2012
New Revision: 1420152
URL: http://svn.apache.org/viewvc?rev=1420152view=rev
Log:
Small refinements
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
URL:
http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java?rev=1420152r1=1420151r2=1420152view=diff
==
---
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
(original)
+++
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
Tue Dec 11 13:41:10 2012
@@ -450,7 +450,7 @@ public class PropagationManager {
switch (mapItem.getIntMappingType().getAttributableType()) {
case USER:
if (subject instanceof SyncopeUser) {
-attributables.addAll(Collections.singleton(subject));
+attributables.add(subject);
}
break;
@@ -459,7 +459,7 @@ public class PropagationManager {
attributables.addAll(((SyncopeUser) subject).getRoles());
}
if (subject instanceof SyncopeRole) {
-attributables.addAll(Collections.singleton(subject));
+attributables.add(subject);
}
break;
Modified:
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
URL:
http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java?rev=1420152r1=1420151r2=1420152view=diff
==
---
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
(original)
+++
syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
Tue Dec 11 13:41:10 2012
@@ -185,9 +185,11 @@ public final class MappingUtil {
case Username:
for (AbstractAttributable attributable : attributables) {
-AbstractAttrValue attrValue = new UAttrValue();
-attrValue.setStringValue(((SyncopeUser)
attributable).getUsername());
-values.add(attrValue);
+if (attributable instanceof SyncopeUser) {
+AbstractAttrValue attrValue = new UAttrValue();
+attrValue.setStringValue(((SyncopeUser)
attributable).getUsername());
+values.add(attrValue);
+}
}
break;
@@ -201,16 +203,18 @@ public final class MappingUtil {
case RoleName:
for (AbstractAttributable attributable : attributables) {
-attrValue = new UAttrValue();
-attrValue.setStringValue(((SyncopeRole)
attributable).getName());
-values.add(attrValue);
+if (attributable instanceof SyncopeRole) {
+attrValue = new RAttrValue();
+attrValue.setStringValue(((SyncopeRole)
attributable).getName());
+values.add(attrValue);
+}
}
break;
default:
}
-LOG.debug(Retrived values '{}', values);
+LOG.debug(Retrieved values '{}', values);
return new DefaultMapEntry(schema, values);
}
svn commit: r1420168 - in /syncope/branches/DEV_ROLE_PROVISIONING: ./ CHANGES pom.xml
Author: ilgrosso Date: Tue Dec 11 14:02:12 2012 New Revision: 1420168 URL: http://svn.apache.org/viewvc?rev=1420168view=rev Log: Merge from trunk Modified: syncope/branches/DEV_ROLE_PROVISIONING/ (props changed) syncope/branches/DEV_ROLE_PROVISIONING/CHANGES syncope/branches/DEV_ROLE_PROVISIONING/pom.xml Propchange: syncope/branches/DEV_ROLE_PROVISIONING/ -- Merged /syncope/trunk:r1420124-1420167 Merged /syncope/branches/1_0_X:r1419298-1420166 Modified: syncope/branches/DEV_ROLE_PROVISIONING/CHANGES URL: http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/CHANGES?rev=1420168r1=1420167r2=1420168view=diff == --- syncope/branches/DEV_ROLE_PROVISIONING/CHANGES (original) +++ syncope/branches/DEV_ROLE_PROVISIONING/CHANGES Tue Dec 11 14:02:12 2012 @@ -2,6 +2,22 @@ Apache Syncope - CHANGES Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 +Release Notes - Syncope - Version 1.0.4 + +** Bug +* [SYNCOPE-232] - Connection is read-only during initialization +* [SYNCOPE-233] - Authentication failure using password with special characters +* [SYNCOPE-234] - Failures upgrading OpenJPA +* [SYNCOPE-235] - CSVDir connector fails during check connection +* [SYNCOPE-236] - Username and password not evaluated from user template during synchronization +* [SYNCOPE-237] - Users with no entitlements cannot edit their own profile via console +* [SYNCOPE-238] - With an high number of users, the admin console's 'TODO' tab is extremely slow +* [SYNCOPE-240] - Missed CREATE status into org.apache.syncope.console.commons.StatusUtils.Status + +** Improvement +* [SYNCOPE-239] - Add OSGi support for the client +* [SYNCOPE-243] - Extended org.apache.rat exclude list for eclipse IDE + Release Notes - Syncope - Version 1.0.3-incubating ** Bug Modified: syncope/branches/DEV_ROLE_PROVISIONING/pom.xml URL: http://svn.apache.org/viewvc/syncope/branches/DEV_ROLE_PROVISIONING/pom.xml?rev=1420168r1=1420167r2=1420168view=diff == --- syncope/branches/DEV_ROLE_PROVISIONING/pom.xml (original) +++ syncope/branches/DEV_ROLE_PROVISIONING/pom.xml Tue Dec 11 14:02:12 2012 @@ -83,6 +83,7 @@ under the License. otherArchives otherArchivehttp://syncope.markmail.org//otherArchive otherArchivehttp://syncope-user.1051894.n5.nabble.com//otherArchive + otherArchivehttp://www.mail-archive.com/user@syncope.apache.org//otherArchive /otherArchives /mailingList mailingList @@ -94,6 +95,7 @@ under the License. otherArchives otherArchivehttp://syncope.markmail.org//otherArchive otherArchivehttp://syncope-dev.1063484.n5.nabble.com//otherArchive + otherArchivehttp://www.mail-archive.com/dev@syncope.apache.org//otherArchive /otherArchives /mailingList mailingList @@ -104,6 +106,7 @@ under the License. archivehttp://mail-archives.apache.org/mod_mbox/syncope-commits//archive otherArchives otherArchivehttp://syncope.markmail.org//otherArchive + otherArchivehttp://www.mail-archive.com/commits@syncope.apache.org//otherArchive /otherArchives /mailingList /mailingLists
svn commit: r1420171 - in /syncope: tags/syncope-1.1.0-SNAPSHOT-before-role-provisioning/ trunk/
Author: ilgrosso Date: Tue Dec 11 14:04:23 2012 New Revision: 1420171 URL: http://svn.apache.org/viewvc?rev=1420171view=rev Log: Saving the current trunk before moving the DEV_ROLE_PROVISIONING to trunk Added: syncope/tags/syncope-1.1.0-SNAPSHOT-before-role-provisioning/ (props changed) - copied from r1420169, syncope/trunk/ Removed: syncope/trunk/ Propchange: syncope/tags/syncope-1.1.0-SNAPSHOT-before-role-provisioning/ -- --- svn:ignore (added) +++ svn:ignore Tue Dec 11 14:04:23 2012 @@ -0,0 +1,4 @@ +target +.subversion +.pom.xml.swp +.CHANGES.swp Propchange: syncope/tags/syncope-1.1.0-SNAPSHOT-before-role-provisioning/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 11 14:04:23 2012 @@ -0,0 +1,10 @@ +/incubator/syncope/branches/0_1_X:1246484-1246581 +/incubator/syncope/branches/0_2_X:1246657-1246688 +/incubator/syncope/branches/0_5_X:1246875-1246986 +/incubator/syncope/branches/0_6_X:1247008-1247042 +/incubator/syncope/branches/0_7_EA:1247056-1247077 +/incubator/syncope/branches/0_7_X:1247257-1247396 +/incubator/syncope/branches/1_0_X:1367153-1412627 +/incubator/syncope/tags/syncope-0.1:1246486-1246488 +/incubator/syncope/trunk:1247317-1247363 +/syncope/branches/1_0_X:1412628-1420166
svn commit: r1420273 - /syncope/trunk/pom.xml
Author: ilgrosso Date: Tue Dec 11 16:46:26 2012 New Revision: 1420273 URL: http://svn.apache.org/viewvc?rev=1420273view=rev Log: Updating some dependencies Modified: syncope/trunk/pom.xml Modified: syncope/trunk/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1420273r1=1420272r2=1420273view=diff == --- syncope/trunk/pom.xml (original) +++ syncope/trunk/pom.xml Tue Dec 11 16:46:26 2012 @@ -287,9 +287,9 @@ under the License. groovy.version1.6.9/groovy.version -h2.version1.3.168/h2.version +h2.version1.3.170/h2.version -logback.version1.0.7/logback.version +logback.version1.0.9/logback.version slf4j.version1.7.2/slf4j.version junit.version4.11/junit.version @@ -858,7 +858,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-dependency-plugin/artifactId - version2.5.1/version + version2.6/version configuration artifactItems artifactItem
svn commit: r1420761 - /syncope/branches/1_0_X/parent/pom.xml
Author: ilgrosso
Date: Wed Dec 12 15:27:33 2012
New Revision: 1420761
URL: http://svn.apache.org/viewvc?rev=1420761view=rev
Log:
Upgrading Tomcat to 7.0.34
Modified:
syncope/branches/1_0_X/parent/pom.xml
Modified: syncope/branches/1_0_X/parent/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/parent/pom.xml?rev=1420761r1=1420760r2=1420761view=diff
==
--- syncope/branches/1_0_X/parent/pom.xml (original)
+++ syncope/branches/1_0_X/parent/pom.xml Wed Dec 12 15:27:33 2012
@@ -297,7 +297,7 @@ under the License.
apacheds.version1.5.7/apacheds.version
-tomcat.version7.0.33/tomcat.version
+tomcat.version7.0.34/tomcat.version
bundles.directory${project.build.directory}/bundles/bundles.directory
log.directory${project.build.directory}/log/log.directory
svn commit: r1421302 - in /syncope/trunk: console/pom.xml core/pom.xml pom.xml
Author: ilgrosso
Date: Thu Dec 13 14:09:21 2012
New Revision: 1421302
URL: http://svn.apache.org/viewvc?rev=1421302view=rev
Log:
[SYNCOPE-254] Applying provided patch
Modified:
syncope/trunk/console/pom.xml
syncope/trunk/core/pom.xml
syncope/trunk/pom.xml
Modified: syncope/trunk/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1421302r1=1421301r2=1421302view=diff
==
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Thu Dec 13 14:09:21 2012
@@ -422,6 +422,78 @@ under the License.
profiles
profile
+ idskipTests/id
+ properties
+javaagent/
+ /properties
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-dependency-plugin/artifactId
+inheritedtrue/inherited
+executions
+ execution
+idset-bundles/id
+phasenone/phase
+ /execution
+/executions
+ /plugin
+
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-antrun-plugin/artifactId
+inheritedtrue/inherited
+executions
+ execution
+idexplodeSyncopeWAR/id
+phasenone/phase
+ /execution
+ execution
+idsetupCSV/id
+phasenone/phase
+ /execution
+/executions
+ /plugin
+
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+inheritedtrue/inherited
+configuration
+ skipTests${skipTests}/skipTests
+/configuration
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-failsafe-plugin/artifactId
+inheritedtrue/inherited
+configuration
+ skipTests${skipTests}/skipTests
+/configuration
+ /plugin
+
+ plugin
+groupIdorg.codehaus.cargo/groupId
+artifactIdcargo-maven2-plugin/artifactId
+inheritedtrue/inherited
+executions
+ execution
+idstart-container/id
+phasenone/phase
+ /execution
+ execution
+idstop-container/id
+phasenone/phase
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/profile
+
+profile
iddev/id
properties
skipTeststrue/skipTests
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1421302r1=1421301r2=1421302view=diff
==
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Thu Dec 13 14:09:21 2012
@@ -657,6 +657,50 @@ under the License.
/build
profiles
+
+profile
+ idskipTests/id
+ properties
+javaagent/
+ /properties
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+inheritedtrue/inherited
+configuration
+ skipTests${skipTests}/skipTests
+/configuration
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-failsafe-plugin/artifactId
+inheritedtrue/inherited
+configuration
+ skipTests${skipTests}/skipTests
+/configuration
+ /plugin
+
+ plugin
+groupIdorg.codehaus.cargo/groupId
+artifactIdcargo-maven2-plugin/artifactId
+inheritedtrue/inherited
+executions
+ execution
+idstart-container/id
+phasenone/phase
+ /execution
+ execution
+idstop-container/id
+phasenone/phase
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/profile
profile
iddev/id
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1421302r1=1421301r2=1421302view=diff
==
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Dec 13 14:09:21 2012
@@ -1191,6 +1191,16 @@ under the License.
/build
/profile
+profile
+ idskipTests/id
+ properties
+skipTeststrue/skipTests
+ /properties
+ build
+defaultGoalclean install/defaultGoal
svn commit: r1421385 - in /syncope/trunk/console/src/main/java/org/apache/syncope/console: pages/panels/AttributesPanel.java wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java w
Author: ilgrosso
Date: Thu Dec 13 17:07:29 2012
New Revision: 1421385
URL: http://svn.apache.org/viewvc?rev=1421385view=rev
Log:
Removing some deprecated classes, yet to deal with the deprecated
org.apache.wicket.extensions.markup.html.tree package
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1421385r1=1421384r2=1421385view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
Thu Dec 13 17:07:29 2012
@@ -124,7 +124,8 @@ public class AttributesPanel extends Pan
add(attributeView);
}
-private ListAttributeTO initEntityData(final AbstractAttributableTO
entityTO, final CollectionSchemaTO schemas) {
+private ListAttributeTO initEntityData(final AbstractAttributableTO
entityTO,
+final CollectionSchemaTO schemas) {
final ListAttributeTO entityData = new ArrayListAttributeTO();
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java?rev=1421385r1=1421384r2=1421385view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
Thu Dec 13 17:07:29 2012
@@ -19,12 +19,12 @@
package
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table;
import java.util.Date;
+import org.apache.syncope.console.SyncopeSession;
import
org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import
org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
-import org.apache.syncope.console.SyncopeSession;
/**
* Format column's value as date string.
@@ -42,15 +42,12 @@ public class DatePropertyColumnT exten
@Override
public void populateItem(final ItemICellPopulatorT item, final String
componentId, final IModelT rowModel) {
-IModel date = (IModelDate) createLabelModel(rowModel);
+IModelObject date = getDataModel(rowModel);
String convertedDate = ;
-
-if (date.getObject() != null) {
+if (date.getObject() instanceof Date) {
convertedDate =
SyncopeSession.get().getDateFormat().format(date.getObject());
-item.add(new Label(componentId, convertedDate));
-} else {
-item.add(new Label(componentId, convertedDate));
}
+item.add(new Label(componentId, convertedDate));
}
}
\ No newline at end of file
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java?rev=1421385r1=1421384r2=1421385view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
Thu Dec 13 17:07:29 2012
@@ -62,7 +62,7 @@ public class DateTimeFieldPanel extends
private static final long serialVersionUID = -1107858522700306810L;
@Override
-protected void onUpdate(AjaxRequestTarget art) {
+protected void onUpdate(final AjaxRequestTarget target) {
if (((DateTimeField) field).getHours() 12) {
cal.set(Calendar.HOUR_OF_DAY, ((DateTimeField)
field).getHours());
} else {
@@ -151,18 +151,18 @@ public class DateTimeFieldPanel extends
svn commit: r1423786 - in /syncope/trunk: LICENSE legal_ext/LICENSE
Author: ilgrosso Date: Wed Dec 19 08:30:58 2012 New Revision: 1423786 URL: http://svn.apache.org/viewvc?rev=1423786view=rev Log: Updating LICENSEs for JQuery upgrade as part of Wicket upgrade Modified: syncope/trunk/LICENSE syncope/trunk/legal_ext/LICENSE Modified: syncope/trunk/LICENSE URL: http://svn.apache.org/viewvc/syncope/trunk/LICENSE?rev=1423786r1=1423785r2=1423786view=diff == --- syncope/trunk/LICENSE (original) +++ syncope/trunk/LICENSE Wed Dec 19 08:30:58 2012 @@ -205,7 +205,7 @@ For jQuery (http://jquery.com/): -jquery-1.4.2.min.js +jquery-1.8.3.min.js jquery-ui-1.8.5.custom.min.js jquery.ui.button.js jquery.ui.core.js Modified: syncope/trunk/legal_ext/LICENSE URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/LICENSE?rev=1423786r1=1423785r2=1423786view=diff == --- syncope/trunk/legal_ext/LICENSE (original) +++ syncope/trunk/legal_ext/LICENSE Wed Dec 19 08:30:58 2012 @@ -784,7 +784,7 @@ This is licensed under the AL 2.0, see a For jQuery (http://jquery.com/): -jquery-1.4.2.min.js +jquery-1.8.3.min.js jquery-ui-1.8.5.custom.min.js jquery.ui.button.js jquery.ui.core.js
svn commit: r1424852 - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/search/ client/src/test/java/org/apache/syncope/client/test/ console/src/main/java/org/apache/syncope/console/p
Author: ilgrosso
Date: Fri Dec 21 10:31:10 2012
New Revision: 1424852
URL: http://svn.apache.org/viewvc?rev=1424852view=rev
Log:
[SYNCOPE-44] Enhancing search: AttributableCond now with boolean and
relationship fields support, EntitlementCond added
Added:
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/EntitlementCond.java
(with props)
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/SearchCond.java
(with props)
Removed:
syncope/trunk/core/src/main/java/org/apache/syncope/core/validation/
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributableCond.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributeCond.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/MembershipCond.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/NodeCond.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/ResourceCond.java
syncope/trunk/client/src/test/java/org/apache/syncope/client/test/JSONTest.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttributableSearchDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/NotificationValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttributableSearchTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/NotificationTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttributableSearchTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributableCond.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributableCond.java?rev=1424852r1=1424851r2=1424852view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributableCond.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributableCond.java
Fri Dec 21 10:31:10 2012
@@ -19,16 +19,16 @@
package org.apache.syncope.client.search;
/**
- * Search condition to be applied when comparing bean attribute values.
+ * Search condition to be applied when comparing bean field values.
*/
-public class AttributableCond extends AttributeCond {
+public class AttributableCond extends AttributeCond implements SearchCond {
private static final long serialVersionUID = -1880319220462653955L;
public AttributableCond() {
}
-public AttributableCond(Type conditionType) {
+public AttributableCond(final Type conditionType) {
super(conditionType);
}
}
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributeCond.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributeCond.java?rev=1424852r1=1424851r2=1424852view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributeCond.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/AttributeCond.java
Fri Dec 21 10:31:10 2012
@@ -23,7 +23,7 @@ import org.apache.syncope.client.Abstrac
/**
* Search condition to be applied when comparing attribute values.
*/
-public class AttributeCond extends AbstractBaseBean {
+public class AttributeCond extends AbstractBaseBean implements SearchCond {
private static final long serialVersionUID = 3275277728404021417L;
@@ -79,7 +79,8 @@ public class AttributeCond extends Abstr
this.type = conditionType;
}
-public final boolean checkValidity() {
+@Override
+public final boolean isValid() {
return type != null schema != null (type == Type.ISNULL || type
== Type.ISNOTNULL || expression != null);
}
}
Added:
syncope/trunk/client/src/main/java/org/apache/syncope/client/search/EntitlementCond.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/search/EntitlementCond.java?rev=1424852view=auto
svn commit: r1425615 - in /syncope/trunk: archetype/src/main/resources/archetype-resources/core/src/test/resources/ build-tools/src/main/resources/ core/src/main/java/org/apache/syncope/core/persisten
Author: ilgrosso Date: Mon Dec 24 09:56:52 2012 New Revision: 1425615 URL: http://svn.apache.org/viewvc?rev=1425615view=rev Log: [SYNCOPE-26] Added sample (but working) LDAPMembershipSyncActions Added: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java (with props) Modified: syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/content.xml syncope/trunk/build-tools/src/main/resources/content.ldif syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncActions.java syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFacadeProxy.java syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java syncope/trunk/core/src/main/java/org/apache/syncope/core/quartz/SampleJob.java syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java syncope/trunk/core/src/test/java/org/apache/syncope/core/quartz/TestSyncActions.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java syncope/trunk/core/src/test/resources/content.xml Modified: syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/content.xml URL: http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/content.xml?rev=1425615r1=1425614r2=1425615view=diff == --- syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/content.xml (original) +++ syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/content.xml Mon Dec 24 09:56:52 2012 @@ -542,7 +542,7 @@ under the License. UMapping id=11 resource_name=resource-ldap accountlink=apos;uid=apos; + username + apos;,ou=people,o=ispapos;/ UMappingItem id=311 accountid=1 password=0 mapping_id=11 -extAttrName=__NAME__ intAttrName=Username intMappingType=Username +extAttrName=__UID__ intAttrName=Username intMappingType=Username mandatoryCondition=true/ UMappingItem id=312 accountid=0 password=1 mapping_id=11 extAttrName=__PASSWORD__ intAttrName=Password intMappingType=Password @@ -551,7 +551,7 @@ under the License. extAttrName=sn intAttrName=surname intMappingType=UserSchema mandatoryCondition=true/ UMappingItem id=314 accountid=0 password=0 mapping_id=11 -extAttrName=cn intAttrName=firstname intMappingType=UserSchema +extAttrName=cn intAttrName=fullname intMappingType=UserSchema mandatoryCondition=true/ UMappingItem id=315 accountid=0 password=0 mapping_id=11 extAttrName=mail intAttrName=email intMappingType=UserSchema @@ -562,6 +562,9 @@ under the License. UMappingItem id=317 accountid=0 password=0 mapping_id=11 extAttrName=postalAddress intAttrName=postalAddress intMappingType=MembershipSchema mandatoryCondition=false/ + UMappingItem id=318 accountid=0 password=0 mapping_id=11 +extAttrName=mail intAttrName=userId intMappingType=UserSchema +mandatoryCondition=false/ RMapping id=1 resource_name=resource-ldap accountlink=apos;cn=apos; + name + apos;,ou=groups,o=ispapos;/ RMappingItem id=1 accountid=1 password=0 mapping_id=1 @@ -626,8 +629,9 @@ under the License. fullReconciliation=1 performCreate=1 performDelete=1 performUpdate=1 syncStatus=0 jobClassName=org.apache.syncope.core.sync.SyncJob/ Task DTYPE=SyncTask id=11 name=LDAP Sync Task resource_name=resource-ldap - fullReconciliation=1 performCreate=1 performDelete=1 performUpdate=1 syncStatus=0 - jobClassName=org.apache.syncope.core.sync.SyncJob/ +fullReconciliation=1 performCreate=1 performDelete=1 performUpdate=1 syncStatus=0 + actionsClassName=org.apache.syncope.core.sync.LDAPMembershipSyncActions +jobClassName=org.apache.syncope.core.sync.SyncJob/ NotificationTask_recipients notificationtask_id=8 address=recipi...@prova.org/ Modified: syncope/trunk/build-tools/src/main/resources/content.ldif URL: http://svn.apache.org/viewvc/syncope/trunk/build-tools/src/main/resources/content.ldif?rev=1425615r1=1425614r2=1425615view=diff == --- syncope/trunk/build-tools/src/main/resources/content.ldif (original) +++ syncope/trunk/build
svn commit: r1425623 - in /syncope/trunk: archetype/ archetype/src/main/resources/archetype-resources/console/ archetype/src/main/resources/archetype-resources/core/ archetype/src/main/resources/arche
Author: ilgrosso
Date: Mon Dec 24 10:29:43 2012
New Revision: 1425623
URL: http://svn.apache.org/viewvc?rev=1425623view=rev
Log:
Restoring the original procedure for archetype resources, dynamically copied
from core and console during the build process but currently statically
committed as plain files
Removed:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/META-INF/
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/security.properties
syncope/trunk/core/src/test/resources/security.properties
Modified:
syncope/trunk/archetype/pom.xml
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/
(props changed)
syncope/trunk/console/pom.xml
syncope/trunk/core/pom.xml
Modified: syncope/trunk/archetype/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/pom.xml?rev=1425623r1=1425622r2=1425623view=diff
==
--- syncope/trunk/archetype/pom.xml (original)
+++ syncope/trunk/archetype/pom.xml Mon Dec 24 10:29:43 2012
@@ -139,6 +139,7 @@ under the License.
copy
file=${basedir}/../core/src/main/resources/persistence.properties
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
copy
file=${basedir}/../core/src/main/resources/workflow.properties
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
+copy
file=${basedir}/../core/src/main/resources/security.properties
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
copy
file=${basedir}/../core/src/main/resources/content.xml
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
copy
file=${basedir}/../core/src/main/resources/logback.xml
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
copy
file=${basedir}/../core/src/main/resources/META-INF/spring-persistence.xml
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources/META-INF
overwrite=true /
@@ -153,6 +154,7 @@ under the License.
else
get
src=${SVNRepoURL}/core/src/test/resources/persistence.properties
dest=${basedir}/src/main/resources/archetype-resources/core/src/test/resources/persistence.properties
/
get
src=${SVNRepoURL}/core/src/test/resources/workflow.properties
dest=${basedir}/src/main/resources/archetype-resources/core/src/test/resources/workflow.properties
/
+get
src=${SVNRepoURL}/core/src/test/resources/security.properties
dest=${basedir}/src/main/resources/archetype-resources/core/src/test/resources/security.properties
/
get
src=${SVNRepoURL}/core/src/test/resources/content.xml
dest=${basedir}/src/main/resources/archetype-resources/core/src/test/resources/content.xml
/
get src=${SVNRepoURL}/core/src/test/resources/test.csv
dest=${basedir}/src/main/resources/archetype-resources/core/src/test/resources/test.csv
/
get src=${SVNRepoURL}/core/src/test/resources/db.jsp
dest=${basedir}/src/main/resources/archetype-resources/core/src/test/resources/db.jsp
/
Modified:
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1425623r1=1425622r2=1425623view=diff
==
---
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
(original)
+++
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
Mon Dec 24 10:29:43 2012
@@ -186,7 +186,6 @@ under the License.
patternset
exclude name=**/content.xml /
exclude name=**/persistence.properties /
-exclude name=**/security.properties /
exclude name=**/workflow.properties /
/patternset
/unzip
Modified:
syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml?rev=1425623r1=1425622r2=1425623view=diff
==
--- syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
(original)
+++ syncope/trunk/archetype/src/main/resources
svn commit: r1425625 - in /syncope/trunk/console: pom.xml src/main/webapp/WEB-INF/web.xml src/test/resources/web.xml
Author: ilgrosso
Date: Mon Dec 24 10:42:01 2012
New Revision: 1425625
URL: http://svn.apache.org/viewvc?rev=1425625view=rev
Log:
Enabling Wicket development mode only for profiles dev and jrebel
Added:
syncope/trunk/console/src/test/resources/web.xml
- copied unchanged from r1425623,
syncope/trunk/console/src/main/webapp/WEB-INF/web.xml
Modified:
syncope/trunk/console/pom.xml
syncope/trunk/console/src/main/webapp/WEB-INF/web.xml
Modified: syncope/trunk/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1425625r1=1425624r2=1425625view=diff
==
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Mon Dec 24 10:42:01 2012
@@ -500,6 +500,16 @@ under the License.
/properties
build
defaultGoalclean verify cargo:run/defaultGoal
+
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-war-plugin/artifactId
+configuration
+ webXml${project.build.directory}/test-classes/web.xml/webXml
+/configuration
+ /plugin
+/plugins
/build
/profile
@@ -514,6 +524,14 @@ under the License.
plugins
plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-war-plugin/artifactId
+configuration
+ webXml${project.build.directory}/test-classes/web.xml/webXml
+/configuration
+ /plugin
+
+ plugin
groupIdorg.zeroturnaround/groupId
artifactIdjrebel-maven-plugin/artifactId
inheritedtrue/inherited
Modified: syncope/trunk/console/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/WEB-INF/web.xml?rev=1425625r1=1425624r2=1425625view=diff
==
--- syncope/trunk/console/src/main/webapp/WEB-INF/web.xml (original)
+++ syncope/trunk/console/src/main/webapp/WEB-INF/web.xml Mon Dec 24 10:42:01
2012
@@ -25,12 +25,7 @@ under the License.
version=2.5
display-nameSyncope console/display-name
-
- context-param
-param-nameconfiguration/param-name
-param-valuedevelopment/param-value
- /context-param
-
+
context-param
param-namecontextConfigLocation/param-name
param-valueclasspath:applicationContext.xml/param-value
@@ -59,7 +54,7 @@ under the License.
dispatcherINCLUDE/dispatcher
/filter-mapping
-!-- SESSION TIMEOUT (MINUTES)--
+ !-- SESSION TIMEOUT (MINUTES)--
session-config
session-timeout30/session-timeout
/session-config
svn commit: r1426176 - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/to/ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/java/org/apache/syncope/console/pa
Author: ilgrosso
Date: Thu Dec 27 12:10:46 2012
New Revision: 1426176
URL: http://svn.apache.org/viewvc?rev=1426176view=rev
Log:
[SYNCOPE-172] Now showing role propagation status after CRUD
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.java
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java?rev=1426176r1=1426175r2=1426176view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java
Thu Dec 27 12:10:46 2012
@@ -23,8 +23,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.codehaus.jackson.annotate.JsonIgnore;
import org.apache.syncope.client.AbstractBaseBean;
+import org.codehaus.jackson.annotate.JsonIgnore;
public class ConnObjectTO extends AbstractBaseBean {
@@ -59,13 +59,13 @@ public class ConnObjectTO extends Abstra
MapString, AttributeTO result;
if (attributes == null) {
-result = Collections.emptyMap();
+result = Collections.String, AttributeTOemptyMap();
} else {
result = new HashMapString, AttributeTO(attributes.size());
for (AttributeTO attributeTO : attributes) {
result.put(attributeTO.getSchema(), attributeTO);
}
-result = Collections.unmodifiableMap(result);
+result = Collections.String, AttributeTOunmodifiableMap(result);
}
return result;
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java?rev=1426176r1=1426175r2=1426176view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
Thu Dec 27 12:10:46 2012
@@ -231,6 +231,11 @@ public class ResultStatusModalPage exten
attributes.addAll(beforeAttrMap.keySet());
attributes.addAll(afterAttrMap.keySet());
+if (!(attributable instanceof UserTO)) {
+attributes.remove(__PASSWORD__);
+attributes.remove(__ENABLE__);
+}
+
final ListString profile = new ArrayListString();
profile.addAll(attributes);
profile.removeAll(head);
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java?rev=1426176r1=1426175r2=1426176view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
Thu Dec 27 12:10:46 2012
@@ -18,6 +18,13 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.syncope.client.search.NodeCond;
+import org.apache.syncope.client.to.UserTO;
+import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel;
+import
org.apache.syncope.console.pages.panels.AbstractSearchResultPanel.EventDataWrapper;
+import org.apache.syncope.console.pages.panels.UserSearchPanel;
+import org.apache.syncope.console.pages.panels.UserSearchResultPanel;
+import org.apache.syncope.console.rest.UserRestClient;
import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -30,13 +37,6 @@ import org.apache.wicket.extensions.ajax
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.client.to.UserTO;
-import
svn commit: r1429894 - /syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java
Author: ilgrosso
Date: Mon Jan 7 16:54:01 2013
New Revision: 1429894
URL: http://svn.apache.org/viewvc?rev=1429894view=rev
Log:
[SYNCOPE-262] Reverting dynamic cast in policy spec serialization due to
Jenkins compilation error (not able to reproduce it with latest OpenJDK 6 / 7,
though)
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java?rev=1429894r1=1429893r2=1429894view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Policy.java
Mon Jan 7 16:54:01 2013
@@ -69,6 +69,6 @@ public abstract class Policy extends Abs
}
public T extends AbstractPolicySpec void setSpecification(final T
policy) {
-specification = XMLSerializer.Tserialize(policy);
+specification = XMLSerializer.serialize(policy);
}
}
svn commit: r1430794 - in /syncope/trunk/core/src: main/java/org/apache/syncope/core/init/ main/java/org/apache/syncope/core/rest/controller/ test/java/org/apache/syncope/core/rest/
Author: ilgrosso
Date: Wed Jan 9 11:29:37 2013
New Revision: 1430794
URL: http://svn.apache.org/viewvc?rev=1430794view=rev
Log:
[SYNCOPE-259] Fixing minor issues on WorkflowTestITCase
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java?rev=1430794r1=1430793r2=1430794view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
Wed Jan 9 11:29:37 2013
@@ -52,9 +52,11 @@ public class SpringContextInitializer im
private static String uwfAdapterClassName;
+private static String rwfAdapterClassName;
+
static {
try {
-initUWFAdapterClassName();
+initWFAdapterClassNames();
} catch (IOException e) {
LOG.error(Could not init uwfAdapterClassName, e);
}
@@ -65,13 +67,14 @@ public class SpringContextInitializer im
*
* @throws IOException if anything goes wrong
*/
-private static void initUWFAdapterClassName() throws IOException {
+private static void initWFAdapterClassNames() throws IOException {
Properties props = new java.util.Properties();
InputStream propStream = null;
try {
propStream =
ContentLoader.class.getResourceAsStream(/workflow.properties);
props.load(propStream);
uwfAdapterClassName = props.getProperty(uwfAdapter);
+rwfAdapterClassName = props.getProperty(rwfAdapter);
} catch (Exception e) {
LOG.error(Could not load workflow.properties, e);
} finally {
@@ -84,12 +87,23 @@ public class SpringContextInitializer im
/**
* Check if the configured user workflow adapter is Activiti's.
*
- * @return whether Activiti is configured for workflow or not
+ * @return whether Activiti is configured for user workflow or not
*/
public static boolean isActivitiEnabledForUsers() {
return uwfAdapterClassName != null
uwfAdapterClassName.equals(ActivitiUserWorkflowAdapter.class.getName());
}
+/**
+ * Check if the configured role workflow adapter is Activiti's.
+ *
+ * @return whether Activiti is configured for role workflow or not
+ */
+public static boolean isActivitiEnabledForRoles() {
+// ActivitiRoleWorkflowAdapter hasn't been developed (yet) as part of
SYNCOPE-173
+//return rwfAdapterClassName != null
rwfAdapterClassName.equals(ActivitiRoleWorkflowAdapter.class.getName());
+return false;
+}
+
@Autowired
private ConnectorFactory connInstanceLoader;
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java?rev=1430794r1=1430793r2=1430794view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
Wed Jan 9 11:29:37 2013
@@ -50,6 +50,7 @@ public class WorkflowController extends
@Autowired
private RoleWorkflowAdapter rwfAdapter;
+
private WorkflowDefinitionTO getDefinition(final WorkflowAdapter adapter)
throws WorkflowException {
WorkflowDefinitionTO result = adapter.getDefinition();
@@ -86,6 +87,7 @@ public class WorkflowController extends
@RequestMapping(method = RequestMethod.PUT, value = /definition/user)
public void updateUserDefinition(@RequestBody final WorkflowDefinitionTO
definition)
throws NotFoundException, WorkflowException {
+
updateDefinition(uwfAdapter, definition);
}
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1430794r1=1430793r2=1430794view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
(original
svn commit: r1430834 - in /syncope/trunk: ./ src/site/xdoc/ src/site/xdoc/features.xml
Author: ilgrosso Date: Wed Jan 9 13:07:15 2013 New Revision: 1430834 URL: http://svn.apache.org/viewvc?rev=1430834view=rev Log: Merge from 1_0_X Modified: syncope/trunk/ (props changed) syncope/trunk/src/site/xdoc/ (props changed) syncope/trunk/src/site/xdoc/features.xml Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1430777-1430833 Propchange: syncope/trunk/src/site/xdoc/ -- --- svn:ignore (added) +++ svn:ignore Wed Jan 9 13:07:15 2013 @@ -0,0 +1 @@ +.features.xml.swp Modified: syncope/trunk/src/site/xdoc/features.xml URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/features.xml?rev=1430834r1=1430833r2=1430834view=diff == --- syncope/trunk/src/site/xdoc/features.xml (original) +++ syncope/trunk/src/site/xdoc/features.xml Wed Jan 9 13:07:15 2013 @@ -69,7 +69,7 @@ under the License. section name=System Administration ul liRESTFul interface/li -liWeb-based AJAX administration console/li +liWeb-based multilingual AJAX administration console/li liRole-based administration/li liAttribute schema, Derived attribute schema and Virtual Attribute schema management/li liRole tree management/li
svn commit: r1431495 [2/2] - in /syncope/trunk/core: ./ src/main/java/org/apache/syncope/core/persistence/beans/ src/main/java/org/apache/syncope/core/sync/ src/test/java/org/apache/syncope/core/conni
Propchange:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/ResourceDataTest.java
--
svn:eol-style = native
Propchange:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/ResourceDataTest.java
--
svn:keywords = Date Author Id Revision HeadURL
Propchange:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/ResourceDataTest.java
--
svn:mime-type = text/plain
Added:
syncope/trunk/core/src/test/java/org/apache/syncope/core/sync/SyncTaskTest.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/sync/SyncTaskTest.java?rev=1431495view=auto
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/sync/SyncTaskTest.java
(added)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/sync/SyncTaskTest.java
Thu Jan 10 16:52:31 2013
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.core.sync;
+
+import static org.junit.Assert.*;
+
+import org.apache.syncope.client.to.UserTO;
+import org.apache.syncope.core.persistence.beans.ExternalResource;
+import org.apache.syncope.core.persistence.beans.SyncTask;
+import org.apache.syncope.core.persistence.dao.AbstractDAOTest;
+import org.apache.syncope.core.persistence.dao.ResourceDAO;
+import org.apache.syncope.core.persistence.dao.TaskDAO;
+import
org.apache.syncope.core.persistence.validation.entity.InvalidEntityException;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class SyncTaskTest extends AbstractDAOTest {
+
+@Autowired
+private TaskDAO taskDAO;
+
+@Autowired
+private ResourceDAO resourceDAO;
+
+@Test
+public void saveSyncTask() {
+ExternalResource resource = resourceDAO.find(ws-target-resource-1);
+assertNotNull(resource);
+
+SyncTask task = new SyncTask();
+task.setName(saveSyncTask);
+task.setDescription(SyncTask description);
+task.setUserTemplate(new UserTO());
+task.setCronExpression(BLA BLA);
+
+// this save() fails because of an invalid Cron Expression
+InvalidEntityException exception = null;
+try {
+taskDAO.save(task);
+} catch (InvalidEntityException e) {
+exception = e;
+}
+assertNotNull(exception);
+
+task.setCronExpression(null);
+// this save() fails because a SyncTask requires a target resource
+exception = null;
+try {
+taskDAO.save(task);
+} catch (InvalidEntityException e) {
+exception = e;
+}
+assertNotNull(exception);
+
+task.setResource(resource);
+task.setActionsClassName(getClass().getName());
+
+// this save() fails because jobActionsClassName does not implement
+// the right interface
+exception = null;
+try {
+taskDAO.save(task);
+} catch (InvalidEntityException e) {
+exception = e;
+}
+assertNotNull(exception);
+
+task.setActionsClassName(TestSyncActions.class.getName());
+// this save() finally works
+task = taskDAO.save(task);
+assertNotNull(task);
+
+SyncTask actual = taskDAO.find(task.getId());
+assertEquals(task, actual);
+}
+
+@Test
+public void issueSYNCOPE144() {
+ExternalResource resource = resourceDAO.find(ws-target-resource-1);
+assertNotNull(resource);
+
+SyncTask task = new SyncTask();
+
+task.setResource(resource);
+task.setName(issueSYNCOPE144);
+task.setDescription(issueSYNCOPE144 Description);
+task.setActionsClassName(TestSyncActions.class.getName());
+
+task = taskDAO.save(task);
+assertNotNull(task);
+
+
svn commit: r1434689 - in /syncope/trunk/archetype/src/main/resources/archetype-resources/core/src: main/resources/ test/resources/
Author: ilgrosso Date: Thu Jan 17 14:35:55 2013 New Revision: 1434689 URL: http://svn.apache.org/viewvc?rev=1434689view=rev Log: Removing (again) static archetype resources Removed: syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/activiticontent.xml syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/content.xml syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/logback.xml syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/persistence.properties syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/workflow.properties syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/db.jsp syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/persistence.properties syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/test.csv syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/test/resources/workflow.properties Modified: syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/ (props changed) Propchange: syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/resources/ -- --- svn:ignore (original) +++ svn:ignore Thu Jan 17 14:35:55 2013 @@ -1,3 +1,4 @@ +activiticontent.xml persistence.properties logback.xml workflow.properties
svn commit: r1435188 - /syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/webapp/WEB-INF/web.xml
Author: ilgrosso Date: Fri Jan 18 15:17:26 2013 New Revision: 1435188 URL: http://svn.apache.org/viewvc?rev=1435188view=rev Log: SYNCOPE-277 needs to be fixed ASAP... Removed: syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/main/webapp/WEB-INF/web.xml
svn commit: r1435892 - in /syncope: doap_Syncope.rdf trunk/doap_Syncope.rdf
Author: ilgrosso Date: Sun Jan 20 17:12:45 2013 New Revision: 1435892 URL: http://svn.apache.org/viewvc?rev=1435892view=rev Log: Moving DOAP file at SVN repo root Added: syncope/doap_Syncope.rdf (props changed) - copied unchanged from r1435891, syncope/trunk/doap_Syncope.rdf Removed: syncope/trunk/doap_Syncope.rdf Propchange: syncope/doap_Syncope.rdf -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jan 20 17:12:45 2013 @@ -0,0 +1,11 @@ +/incubator/syncope/branches/0_1_X/doap_Syncope.rdf:1246484-1246581 +/incubator/syncope/branches/0_2_X/doap_Syncope.rdf:1246657-1246688 +/incubator/syncope/branches/0_5_X/doap_Syncope.rdf:1246875-1246986 +/incubator/syncope/branches/0_6_X/doap_Syncope.rdf:1247008-1247042 +/incubator/syncope/branches/0_7_EA/doap_Syncope.rdf:1247056-1247077 +/incubator/syncope/branches/0_7_X/doap_Syncope.rdf:1247257-1247396 +/incubator/syncope/branches/1_0_X/doap_Syncope.rdf:1367153-1412627 +/incubator/syncope/tags/syncope-0.1/doap_Syncope.rdf:1246486-1246488 +/incubator/syncope/trunk/doap_Syncope.rdf:1247317-1247363,1405295-1412627 +/syncope/branches/1_0_X/doap_Syncope.rdf:1412628-1435069 +/syncope/trunk/doap_Syncope.rdf:1412628-1420167
svn commit: r1436262 - in /syncope/trunk: client/pom.xml common/pom.xml console/src/main/resources/applicationContext.xml
Author: ilgrosso
Date: Mon Jan 21 10:31:42 2013
New Revision: 1436262
URL: http://svn.apache.org/viewvc?rev=1436262view=rev
Log:
Bare XML formatting
Modified:
syncope/trunk/client/pom.xml
syncope/trunk/common/pom.xml
syncope/trunk/console/src/main/resources/applicationContext.xml
Modified: syncope/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/pom.xml?rev=1436262r1=1436261r2=1436262view=diff
==
--- syncope/trunk/client/pom.xml (original)
+++ syncope/trunk/client/pom.xml Mon Jan 21 10:31:42 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
--
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
@@ -43,16 +42,17 @@ under the License.
/distributionManagement
dependencies
- dependency
+dependency
groupIdorg.apache.syncope/groupId
artifactIdsyncope-common/artifactId
version${project.version}/version
/dependency
- dependency
- groupIdjavax.ws.rs/groupId
- artifactIdjavax.ws.rs-api/artifactId
+dependency
+ groupIdjavax.ws.rs/groupId
+ artifactIdjavax.ws.rs-api/artifactId
/dependency
+
dependency
groupIdcommons-lang/groupId
artifactIdcommons-lang/artifactId
@@ -87,7 +87,6 @@ under the License.
artifactIdjunit/artifactId
scopetest/scope
/dependency
-
/dependencies
build
Modified: syncope/trunk/common/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/pom.xml?rev=1436262r1=1436261r2=1436262view=diff
==
--- syncope/trunk/common/pom.xml (original)
+++ syncope/trunk/common/pom.xml Mon Jan 21 10:31:42 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
--
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
@@ -43,10 +42,11 @@ under the License.
/distributionManagement
dependencies
- dependency
- groupIdjavax.ws.rs/groupId
- artifactIdjavax.ws.rs-api/artifactId
+dependency
+ groupIdjavax.ws.rs/groupId
+ artifactIdjavax.ws.rs-api/artifactId
/dependency
+
dependency
groupIdcommons-lang/groupId
artifactIdcommons-lang/artifactId
@@ -81,7 +81,6 @@ under the License.
artifactIdjunit/artifactId
scopetest/scope
/dependency
-
/dependencies
build
Modified: syncope/trunk/console/src/main/resources/applicationContext.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/applicationContext.xml?rev=1436262r1=1436261r2=1436262view=diff
==
--- syncope/trunk/console/src/main/resources/applicationContext.xml (original)
+++ syncope/trunk/console/src/main/resources/applicationContext.xml Mon Jan 21
10:31:42 2013
@@ -18,11 +18,14 @@ specific language governing permissions
under the License.
--
-beans xmlns=http://www.springframework.org/schema/beans;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
- xmlns:aop=http://www.springframework.org/schema/aop;
xmlns:p=http://www.springframework.org/schema/p;
- xmlns:context=http://www.springframework.org/schema/context;
xmlns:oxm=http://www.springframework.org/schema/oxm;
- xmlns:tx=http://www.springframework.org/schema/tx;
- xsi:schemaLocation=http://www.springframework.org/schema/beans
+beans xmlns=http://www.springframework.org/schema/beans;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xmlns:aop=http://www.springframework.org/schema/aop;
+ xmlns:p=http://www.springframework.org/schema/p;
+ xmlns:context=http://www.springframework.org/schema/context;
+ xmlns:oxm=http://www.springframework.org/schema/oxm;
+ xmlns:tx=http://www.springframework.org/schema/tx;
+ xsi:schemaLocation=http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
@@ -31,92 +34,91 @@ under the License.
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring
svn commit: r1436264 - in /syncope/trunk: client/pom.xml common/pom.xml
Author: ilgrosso
Date: Mon Jan 21 10:34:33 2013
New Revision: 1436264
URL: http://svn.apache.org/viewvc?rev=1436264view=rev
Log:
Fixing maven-bundle-plugin warnings
Modified:
syncope/trunk/client/pom.xml
syncope/trunk/common/pom.xml
Modified: syncope/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/pom.xml?rev=1436264r1=1436263r2=1436264view=diff
==
--- syncope/trunk/client/pom.xml (original)
+++ syncope/trunk/client/pom.xml Mon Jan 21 10:34:33 2013
@@ -101,7 +101,7 @@ under the License.
Bundle-SymbolicNameorg.apache.syncope.client/Bundle-SymbolicName
Bundle-Version${project.version}/Bundle-Version
Export-Package
-
org.apache.syncope*;version=${project.version};-split-package:=merge-first
+
org.apache.syncope.client*;version=${project.version};-split-package:=merge-first
/Export-Package
Import-Package
org.apache.commons.lang*;version=[2.6,3),
Modified: syncope/trunk/common/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/pom.xml?rev=1436264r1=1436263r2=1436264view=diff
==
--- syncope/trunk/common/pom.xml (original)
+++ syncope/trunk/common/pom.xml Mon Jan 21 10:34:33 2013
@@ -92,10 +92,10 @@ under the License.
configuration
instructions
Bundle-Name${project.name}/Bundle-Name
-
Bundle-SymbolicNameorg.apache.syncope.client/Bundle-SymbolicName
+
Bundle-SymbolicNameorg.apache.syncope.common/Bundle-SymbolicName
Bundle-Version${project.version}/Bundle-Version
Export-Package
-
org.apache.syncope*;version=${project.version};-split-package:=merge-first
+
org.apache.syncope.common*;version=${project.version};-split-package:=merge-first
/Export-Package
Import-Package
org.apache.commons.lang*;version=[2.6,3),
svn commit: r1436280 - in /syncope/trunk: core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java core/src/main/java/org/apache/syncope/core/workflow/user/activiti/S
Author: ilgrosso
Date: Mon Jan 21 11:28:43 2013
New Revision: 1436280
URL: http://svn.apache.org/viewvc?rev=1436280view=rev
Log:
[SYNCOPE-253] Dependency upgraded and code adjusted accordinly
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
syncope/trunk/pom.xml
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java?rev=1436280r1=1436279r2=1436280view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
Mon Jan 21 11:28:43 2013
@@ -21,7 +21,6 @@ package org.apache.syncope.core.workflow
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-
import org.activiti.engine.identity.Group;
import org.activiti.engine.identity.GroupQuery;
import org.activiti.engine.impl.interceptor.Session;
@@ -97,7 +96,7 @@ public class SyncopeGroupManager extends
}
@Override
-public void updateGroup(final Group updatedGroup) {
+public void updateGroup(final GroupEntity updatedGroup) {
throw new UnsupportedOperationException();
}
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java?rev=1436280r1=1436279r2=1436280view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
Mon Jan 21 11:28:43 2013
@@ -21,7 +21,6 @@ package org.apache.syncope.core.workflow
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-
import org.activiti.engine.identity.Group;
import org.activiti.engine.identity.User;
import org.activiti.engine.identity.UserQuery;
@@ -99,13 +98,11 @@ public class SyncopeUserManager extends
@Override
public IdentityInfoEntity findUserInfoByUserIdAndKey(final String userId,
final String key) {
-
throw new UnsupportedOperationException();
}
@Override
public ListString findUserInfoKeysByUserIdAndType(final String userId,
final String type) {
-
throw new UnsupportedOperationException();
}
@@ -115,7 +112,7 @@ public class SyncopeUserManager extends
}
@Override
-public void updateUser(final User updatedUser) {
+public void updateUser(final UserEntity updatedUser) {
throw new UnsupportedOperationException();
}
}
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1436280r1=1436279r2=1436280view=diff
==
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Jan 21 11:28:43 2013
@@ -278,7 +278,7 @@ under the License.
httpcomponents.version4.2.3/httpcomponents.version
-activiti.version5.10/activiti.version
+activiti.version5.11/activiti.version
cxf.version2.7.0/cxf.version
spring.version3.1.3.RELEASE/spring.version
svn commit: r1436292 - in /syncope/trunk/core/src/main/java/org/apache/syncope/core: persistence/beans/ persistence/beans/membership/ persistence/beans/role/ persistence/beans/user/ util/
Author: ilgrosso
Date: Mon Jan 21 11:41:32 2013
New Revision: 1436292
URL: http://svn.apache.org/viewvc?rev=1436292view=rev
Log:
White noise (formatting and PMD / Checkstyle / Findbugs warnings) - please
ignore
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java?rev=1436292r1=1436291r2=1436292view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java
Mon Jan 21 11:41:32 2013
@@ -21,7 +21,6 @@ package org.apache.syncope.core.persiste
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
-
import org.apache.syncope.common.types.SchemaType;
@MappedSuperclass
@@ -39,7 +38,7 @@ public abstract class AbstractDerSchema
return name;
}
-public void setName(String name) {
+public void setName(final String name) {
this.name = name;
}
@@ -47,7 +46,7 @@ public abstract class AbstractDerSchema
return expression;
}
-public void setExpression(String expression) {
+public void setExpression(final String expression) {
this.expression = expression;
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java?rev=1436292r1=1436291r2=1436292view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
Mon Jan 21 11:41:32 2013
@@ -18,15 +18,13 @@
*/
package org.apache.syncope.core.persistence.beans;
-import static javax.persistence.EnumType.STRING;
-
import java.lang.reflect.Constructor;
import java.text.DecimalFormat;
import java.text.Format;
import java.text.SimpleDateFormat;
-
import javax.persistence.Basic;
import javax.persistence.Column;
+import static javax.persistence.EnumType.STRING;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Lob;
@@ -34,7 +32,6 @@ import javax.persistence.MappedSuperclas
import javax.persistence.Transient;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
-
import org.apache.syncope.common.types.SchemaType;
import
org.apache.syncope.core.persistence.validation.attrvalue.AbstractValidator;
import org.apache.syncope.core.persistence.validation.attrvalue.BasicValidator;
@@ -112,7 +109,7 @@ public abstract class AbstractSchema ext
return type;
}
-public void setType(SchemaType type) {
+public void setType(final SchemaType type) {
this.type = type;
}
@@ -211,6 +208,7 @@ public abstract class AbstractSchema ext
this.conversionPattern = conversionPattern;
}
+@SuppressWarnings(unchecked)
public T extends Format T getFormatter() {
T result = null;
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence
svn commit: r1436294 - /syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
Author: ilgrosso
Date: Mon Jan 21 11:50:38 2013
New Revision: 1436294
URL: http://svn.apache.org/viewvc?rev=1436294view=rev
Log:
Reverting incompatible change with PropagationManager
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java?rev=1436294r1=1436293r2=1436294view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
Mon Jan 21 11:50:38 2013
@@ -30,7 +30,6 @@ import org.apache.syncope.common.types.I
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
-import org.apache.syncope.core.persistence.beans.AbstractBaseBean;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
@@ -250,8 +249,8 @@ public final class MappingUtil {
* @param intMappingType source mapping type
* @return corresponding Class object, if any (can be null)
*/
-public static Class? extends AbstractBaseBean
getIntMappingTypeClass(final IntMappingType intMappingType) {
-Class? extends AbstractBaseBean result;
+public static Class getIntMappingTypeClass(final IntMappingType
intMappingType) {
+Class result;
switch (intMappingType) {
case UserSchema:
svn commit: r1436357 - in /syncope/trunk: client/pom.xml common/pom.xml pom.xml
Author: ilgrosso
Date: Mon Jan 21 14:07:23 2013
New Revision: 1436357
URL: http://svn.apache.org/viewvc?rev=1436357view=rev
Log:
Bare XML formatting
Modified:
syncope/trunk/client/pom.xml
syncope/trunk/common/pom.xml
syncope/trunk/pom.xml
Modified: syncope/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/pom.xml?rev=1436357r1=1436356r2=1436357view=diff
==
--- syncope/trunk/client/pom.xml (original)
+++ syncope/trunk/client/pom.xml Mon Jan 21 14:07:23 2013
@@ -53,7 +53,7 @@ under the License.
artifactIdjavax.ws.rs-api/artifactId
/dependency
- dependency
+dependency
groupIdorg.springframework/groupId
artifactIdspring-web/artifactId
/dependency
@@ -63,7 +63,7 @@ under the License.
artifactIdjackson-mapper-asl/artifactId
/dependency
- dependency
+dependency
groupIdorg.apache.httpcomponents/groupId
artifactIdhttpcore/artifactId
/dependency
Modified: syncope/trunk/common/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/pom.xml?rev=1436357r1=1436356r2=1436357view=diff
==
--- syncope/trunk/common/pom.xml (original)
+++ syncope/trunk/common/pom.xml Mon Jan 21 14:07:23 2013
@@ -56,7 +56,7 @@ under the License.
groupIdorg.springframework/groupId
artifactIdspring-webmvc/artifactId
/dependency
- dependency
+dependency
groupIdorg.springframework/groupId
artifactIdspring-web/artifactId
/dependency
@@ -70,10 +70,10 @@ under the License.
groupIdch.qos.logback/groupId
artifactIdlogback-classic/artifactId
/dependency
- dependency
+dependency
groupIdorg.slf4j/groupId
artifactIdslf4j-api/artifactId
- /dependency
+/dependency
/dependencies
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1436357r1=1436356r2=1436357view=diff
==
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Jan 21 14:07:23 2013
@@ -393,7 +393,7 @@ under the License.
artifactIdhttpcore/artifactId
version${httpcomponents.version}/version
/dependency
- dependency
+ dependency
groupIdorg.apache.httpcomponents/groupId
artifactIdhttpclient/artifactId
version${httpcomponents.version}/version
@@ -1256,7 +1256,7 @@ under the License.
modules
modulearchetype/module
modulebuild-tools/module
- modulecommon/module
+modulecommon/module
moduleclient/module
modulecore/module
moduleconsole/module
svn commit: r1436910 [3/3] - in /syncope/trunk: client/ common/src/main/java/org/apache/syncope/common/services/ common/src/main/java/org/apache/syncope/common/to/ common/src/main/java/org/apache/sync
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/DummyHTTPServletResponse.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/DummyHTTPServletResponse.java?rev=1436910r1=1436909r2=1436910view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/DummyHTTPServletResponse.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/DummyHTTPServletResponse.java
Tue Jan 22 13:33:22 2013
@@ -21,15 +21,18 @@ package org.apache.syncope.core.services
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-
import javax.servlet.ServletOutputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
+/**
+ * Dummy (empty) HttpServletResponse.
+ */
public class DummyHTTPServletResponse implements HttpServletResponse {
@Override
public void flushBuffer() throws IOException {
+// No action.
}
@Override
@@ -69,103 +72,124 @@ public class DummyHTTPServletResponse im
@Override
public void reset() {
+// No action.
}
@Override
public void resetBuffer() {
+// No action.
}
@Override
-public void setBufferSize(int arg0) {
+public void setBufferSize(final int arg0) {
+// No action.
}
@Override
-public void setCharacterEncoding(String arg0) {
+public void setCharacterEncoding(final String arg0) {
+// No action.
}
@Override
-public void setContentLength(int arg0) {
+public void setContentLength(final int arg0) {
+// No action.
}
@Override
-public void setContentType(String arg0) {
+public void setContentType(final String arg0) {
+// No action.
}
@Override
-public void setLocale(Locale arg0) {
+public void setLocale(final Locale arg0) {
+// No action.
}
@Override
-public void addCookie(Cookie arg0) {
+public void addCookie(final Cookie arg0) {
+// No action.
}
@Override
-public void addDateHeader(String arg0, long arg1) {
+public void addDateHeader(final String arg0, final long arg1) {
+// No action.
}
@Override
-public void addHeader(String arg0, String arg1) {
+public void addHeader(final String arg0, final String arg1) {
+// No action.
}
@Override
-public void addIntHeader(String arg0, int arg1) {
+public void addIntHeader(final String arg0, final int arg1) {
+// No action.
}
@Override
-public boolean containsHeader(String arg0) {
+public boolean containsHeader(final String arg0) {
return false;
}
@Override
-public String encodeRedirectURL(String arg0) {
-return null;
+public String encodeRedirectURL(final String arg0) {
+return arg0;
}
@Override
-public String encodeRedirectUrl(String arg0) {
-return null;
+@Deprecated
+public String encodeRedirectUrl(final String arg0) {
+return arg0;
}
@Override
-public String encodeURL(String arg0) {
-return null;
+public String encodeURL(final String arg0) {
+return arg0;
}
@Override
-public String encodeUrl(String arg0) {
-return null;
+@Deprecated
+public String encodeUrl(final String arg0) {
+return arg0;
}
@Override
-public void sendError(int arg0) throws IOException {
+public void sendError(final int arg0) throws IOException {
+// No action.
}
@Override
-public void sendError(int arg0, String arg1) throws IOException {
+public void sendError(final int arg0, final String arg1) throws
IOException {
+// No action.
}
@Override
-public void sendRedirect(String arg0) throws IOException {
+public void sendRedirect(final String arg0) throws IOException {
+// No action.
}
@Override
-public void setDateHeader(String arg0, long arg1) {
+public void setDateHeader(final String arg0, final long arg1) {
+// No action.
}
@Override
-public void setHeader(String arg0, String arg1) {
+public void setHeader(final String arg0, final String arg1) {
+// No action.
}
@Override
-public void setIntHeader(String arg0, int arg1) {
+public void setIntHeader(final String arg0, final int arg1) {
+// No action.
}
@Override
-public void setStatus(int arg0) {
+public void setStatus(final int arg0) {
+// No action.
}
@Override
-public void setStatus(int arg0, String arg1) {
+@Deprecated
+public void setStatus(final int arg0, final String arg1) {
+// No action.
}
-
}
Modified:
svn commit: r1437293 - in /syncope/trunk/archetype/src/test/resources/projects: ./ default/ default/archetype.properties default/goal.txt
Author: ilgrosso Date: Wed Jan 23 08:38:50 2013 New Revision: 1437293 URL: http://svn.apache.org/viewvc?rev=1437293view=rev Log: [SYNCOPE-14] Merge from 1_0_X (added 'secretKey' archetype property) Added: syncope/trunk/archetype/src/test/resources/projects/ syncope/trunk/archetype/src/test/resources/projects/default/ syncope/trunk/archetype/src/test/resources/projects/default/archetype.properties (with props) syncope/trunk/archetype/src/test/resources/projects/default/goal.txt (with props) Added: syncope/trunk/archetype/src/test/resources/projects/default/archetype.properties URL: http://svn.apache.org/viewvc/syncope/trunk/archetype/src/test/resources/projects/default/archetype.properties?rev=1437293view=auto == --- syncope/trunk/archetype/src/test/resources/projects/default/archetype.properties (added) +++ syncope/trunk/archetype/src/test/resources/projects/default/archetype.properties Wed Jan 23 08:38:50 2013 @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +groupId=org.apache.syncope.test +artifactId=syncope-test +version=1.0-SNAPSHOT +secretKey=testSecretKey Propchange: syncope/trunk/archetype/src/test/resources/projects/default/archetype.properties -- svn:eol-style = native Propchange: syncope/trunk/archetype/src/test/resources/projects/default/archetype.properties -- svn:keywords = Date Revision Author HeadURL Id Added: syncope/trunk/archetype/src/test/resources/projects/default/goal.txt URL: http://svn.apache.org/viewvc/syncope/trunk/archetype/src/test/resources/projects/default/goal.txt?rev=1437293view=auto == --- syncope/trunk/archetype/src/test/resources/projects/default/goal.txt (added) +++ syncope/trunk/archetype/src/test/resources/projects/default/goal.txt Wed Jan 23 08:38:50 2013 @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. Propchange: syncope/trunk/archetype/src/test/resources/projects/default/goal.txt -- svn:eol-style = native Propchange: syncope/trunk/archetype/src/test/resources/projects/default/goal.txt -- svn:keywords = Date Revision Author HeadURL Id Propchange: syncope/trunk/archetype/src/test/resources/projects/default/goal.txt -- svn:mime-type = text/plain
svn commit: r1437313 - /syncope/branches/1_0_X/archetype/src/test/resources/projects/default/archetype.properties
Author: ilgrosso Date: Wed Jan 23 09:47:57 2013 New Revision: 1437313 URL: http://svn.apache.org/viewvc?rev=1437313view=rev Log: [SYNCOPE-14] Missing secretKey property Modified: syncope/branches/1_0_X/archetype/src/test/resources/projects/default/archetype.properties Modified: syncope/branches/1_0_X/archetype/src/test/resources/projects/default/archetype.properties URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/archetype/src/test/resources/projects/default/archetype.properties?rev=1437313r1=1437312r2=1437313view=diff == --- syncope/branches/1_0_X/archetype/src/test/resources/projects/default/archetype.properties (original) +++ syncope/branches/1_0_X/archetype/src/test/resources/projects/default/archetype.properties Wed Jan 23 09:47:57 2013 @@ -17,3 +17,4 @@ groupId=org.apache.syncope.test artifactId=syncope-test version=1.0-SNAPSHOT +secretKey=testSecretKey
svn commit: r1437878 - in /syncope/trunk: ./ CHANGES pom.xml
Author: ilgrosso Date: Thu Jan 24 07:39:00 2013 New Revision: 1437878 URL: http://svn.apache.org/viewvc?rev=1437878view=rev Log: Merge from 1_0_X Modified: syncope/trunk/ (props changed) syncope/trunk/CHANGES syncope/trunk/pom.xml Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1437393-1437877 Modified: syncope/trunk/CHANGES URL: http://svn.apache.org/viewvc/syncope/trunk/CHANGES?rev=1437878r1=1437877r2=1437878view=diff == --- syncope/trunk/CHANGES (original) +++ syncope/trunk/CHANGES Thu Jan 24 07:39:00 2013 @@ -2,6 +2,29 @@ Apache Syncope - CHANGES Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 +Release Notes - Syncope - Version 1.0.5 + +** Bug +* [SYNCOPE-260] - Update propagation with null virtual attribute values +* [SYNCOPE-267] - Possible NullPointerException into SchemaMappingUtil.getAccountIdValue() +* [SYNCOPE-269] - AES encryption key defined in source code +* [SYNCOPE-272] - During sync null attributes from template are considered +* [SYNCOPE-273] - Role deletion inhibits notification update +* [SYNCOPE-274] - Sync: during update with user template existing memberships break update + + + +** Improvement +* [SYNCOPE-14] - Solve some warnings and verify if generated projects still work +* [SYNCOPE-67] - Display all Execute Tasks (Propagation, Notification and Scheduled) and related Execution history items sortered in descending order +* [SYNCOPE-201] - AbstractSchema enumerationValues and enumerationKeys too short +* [SYNCOPE-255] - Hide Global Password/Account/Sync policy in security resource selections +* [SYNCOPE-263] - Inject Recipient and Event variable in Velocity Email Notification Template +* [SYNCOPE-264] - Email Notification Templates Documentation +* [SYNCOPE-266] - Password should be provided again at resource subscription time if a Password schema mapping for that resource exists +* [SYNCOPE-279] - Connector instance timeout +* [SYNCOPE-283] - website edits + Release Notes - Syncope - Version 1.0.4 ** Bug Modified: syncope/trunk/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1437878r1=1437877r2=1437878view=diff == --- syncope/trunk/pom.xml (original) +++ syncope/trunk/pom.xml Thu Jan 24 07:39:00 2013 @@ -292,7 +292,7 @@ under the License. activiti.version5.11/activiti.version cxf.version2.7.0/cxf.version -spring.version3.1.3.RELEASE/spring.version +spring.version3.1.4.RELEASE/spring.version spring-security.version3.1.3.RELEASE/spring-security.version aspectj.version1.7.1/aspectj.version jackson.version1.9.11/jackson.version
svn commit: r1439800 - /syncope/trunk/pom.xml
Author: ilgrosso Date: Tue Jan 29 09:40:37 2013 New Revision: 1439800 URL: http://svn.apache.org/viewvc?rev=1439800view=rev Log: Updating ASF parent to 13 Modified: syncope/trunk/pom.xml Modified: syncope/trunk/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1439800r1=1439799r2=1439800view=diff == --- syncope/trunk/pom.xml (original) +++ syncope/trunk/pom.xml Tue Jan 29 09:40:37 2013 @@ -33,8 +33,8 @@ under the License. parent groupIdorg.apache/groupId artifactIdapache/artifactId -version12/version -relativePath / +version13/version +relativePath/ /parent urlhttp://syncope.apache.org//url
svn commit: r1439860 - in /syncope/trunk/console/src/main/java/org/apache/syncope/console: commons/StatusUtils.java rest/UserRestClient.java
Author: ilgrosso
Date: Tue Jan 29 12:37:25 2013
New Revision: 1439860
URL: http://svn.apache.org/viewvc?rev=1439860view=rev
Log:
[SYNCOPE-122] Fixing attempting re-enablement of enabled user
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java?rev=1439860r1=1439859r2=1439860view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
Tue Jan 29 12:37:25 2013
@@ -217,13 +217,24 @@ public class StatusUtils implements Seri
}
public static PropagationRequestTO buildPropagationRequestTO(final
CollectionStatusBean statuses) {
+return buildPropagationRequestTO(statuses, null);
+}
+
+public static PropagationRequestTO buildPropagationRequestTO(final
CollectionStatusBean statuses,
+final Boolean enable) {
+
PropagationRequestTO propagationRequestTO = new PropagationRequestTO();
for (StatusBean status : statuses) {
-if (Syncope.equals(status.getResourceName())) {
-propagationRequestTO.setOnSyncope(true);
-} else {
-propagationRequestTO.addResource(status.getResourceName());
+if (enable == null
+|| (enable !status.getStatus().isActive()) || (!enable
status.getStatus().isActive())) {
+
+if (Syncope.equals(status.getResourceName())) {
+propagationRequestTO.setOnSyncope(true);
+} else {
+propagationRequestTO.addResource(status.getResourceName());
+}
+
}
}
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java?rev=1439860r1=1439859r2=1439860view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
Tue Jan 29 12:37:25 2013
@@ -111,10 +111,10 @@ public class UserRestClient extends Abst
}
public UserTO suspend(final long userId, final ListStatusBean statuses) {
-return getService(UserService.class).suspend(userId,
StatusUtils.buildPropagationRequestTO(statuses));
+return getService(UserService.class).suspend(userId,
StatusUtils.buildPropagationRequestTO(statuses, false));
}
public UserTO reactivate(final long userId, final ListStatusBean
statuses) {
-return getService(UserService.class).reactivate(userId,
StatusUtils.buildPropagationRequestTO(statuses));
+return getService(UserService.class).reactivate(userId,
StatusUtils.buildPropagationRequestTO(statuses, true));
}
}
svn commit: r1440375 - /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Author: ilgrosso
Date: Wed Jan 30 12:40:24 2013
New Revision: 1440375
URL: http://svn.apache.org/viewvc?rev=1440375view=rev
Log:
White noise - formatting
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1440375r1=1440374r2=1440375view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Wed Jan 30 12:40:24 2013
@@ -105,15 +105,16 @@ public class ConnectorModalPage extends
? EnumSet.noneOf(ConnectorCapability.class)
: connectorTO.getCapabilities());
-final IModelListConnectorCapability capabilities = new
LoadableDetachableModelListConnectorCapability() {
+final IModelListConnectorCapability capabilities =
+new LoadableDetachableModelListConnectorCapability() {
-private static final long serialVersionUID = 5275935387613157437L;
+private static final long serialVersionUID =
5275935387613157437L;
-@Override
-protected ListConnectorCapability load() {
-return Arrays.asList(ConnectorCapability.values());
-}
-};
+@Override
+protected ListConnectorCapability load() {
+return Arrays.asList(ConnectorCapability.values());
+}
+};
final MapString, MapString, ConnBundleTO mapConnBundleTO = new
HashMapString, MapString, ConnBundleTO();
for (ConnBundleTO connBundleTO : restClient.getAllBundles()) {
@@ -415,7 +416,8 @@ public class ConnectorModalPage extends
add(connectorForm);
}
-private ConnBundleTO getSelectedBundleTO(final MapString, MapString,
ConnBundleTO bundles, final ConnInstanceTO connTO) {
+private ConnBundleTO getSelectedBundleTO(final MapString, MapString,
ConnBundleTO bundles,
+final ConnInstanceTO connTO) {
if (connTO != null StringUtils.isNotBlank(connTO.getBundleName())
StringUtils.isNotBlank(connTO.getVersion())) {
svn commit: r1440376 - /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Author: ilgrosso
Date: Wed Jan 30 12:43:21 2013
New Revision: 1440376
URL: http://svn.apache.org/viewvc?rev=1440376view=rev
Log:
Restoring commit 1439839, involuntarily reverted by 1439854
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1440376r1=1440375r2=1440376view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Wed Jan 30 12:43:21 2013
@@ -279,7 +279,15 @@ public class ConnectorModalPage extends
properties.clear();
version.setEnabled(connectorTO.getBundleName() != null);
version.getField().setModelValue(null);
-version.setChoices(new
ArrayListString(mapConnBundleTO.get(connectorTO.getBundleName()).keySet()));
+ListString choices = new
ArrayListString(mapConnBundleTO.get(connectorTO.getBundleName()).keySet());
+version.setChoices(choices);
+if (choices.size() == 1) {
+connectorTO.setVersion(choices.get(0));
+version.getField().setModelObject(choices.get(0));
+connectorTO.setDisplayName(displayName.getModelObject());
+bundleTO = getSelectedBundleTO(mapConnBundleTO,
connectorTO);
+properties = fillProperties(bundleTO, connectorTO);
+}
target.add(bundleName);
target.add(version);
target.add(propertiesContainer);
svn commit: r1440512 - in /syncope/branches/1_0_X/core/src: main/java/org/apache/syncope/core/persistence/beans/ main/java/org/apache/syncope/core/persistence/beans/user/ main/java/org/apache/syncope/
Author: ilgrosso
Date: Wed Jan 30 16:44:24 2013
New Revision: 1440512
URL: http://svn.apache.org/viewvc?rev=1440512view=rev
Log:
[SYNCOPE-301] Fix for branch 1_0_X
Modified:
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/scheduling/SyncJob.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/WorkflowResult.java
syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/branches/1_0_X/core/src/test/resources/content.xml
Modified:
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java?rev=1440512r1=1440511r2=1440512view=diff
==
---
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
(original)
+++
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
Wed Jan 30 16:44:24 2013
@@ -68,7 +68,7 @@ public abstract class AbstractBaseBean i
* @param property the integer representing a boolean value
* @return the boolean value corresponding to the property param
*/
-public final Boolean isBooleanAsInteger(final Integer property) {
+public final boolean isBooleanAsInteger(final Integer property) {
return property != null property == 1;
}
@@ -98,7 +98,7 @@ public abstract class AbstractBaseBean i
}
}
-return excludeFields.toArray(new String[] {});
+return excludeFields.toArray(new String[]{});
}
@Override
Modified:
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java?rev=1440512r1=1440511r2=1440512view=diff
==
---
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
(original)
+++
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
Wed Jan 30 16:44:24 2013
@@ -544,8 +544,8 @@ public class SyncopeUser extends Abstrac
this.suspended = getBooleanAsInteger(suspended);
}
-public Boolean getSuspended() {
-return isBooleanAsInteger(suspended);
+public Boolean isSuspended() {
+return suspended == null ? null : isBooleanAsInteger(suspended);
}
private String encodePassword(final String password, final CipherAlgorithm
cipherAlgoritm)
Modified:
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java?rev=1440512r1=1440511r2=1440512view=diff
==
---
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java
(original)
+++
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java
Wed Jan 30 16:44:24 2013
@@ -104,7 +104,7 @@ public class AccountPolicyEnforcer exten
// check for subsequent failed logins
if (user.getFailedLogins() != null
policy.getPermittedLoginRetries() 0
- user.getFailedLogins() policy.getPermittedLoginRetries()
!user.getSuspended()) {
+ user.getFailedLogins() policy.getPermittedLoginRetries()
!user.isSuspended()) {
try {
LOG.debug(User {}:{} is over to max failed logins,
user.getId(), user.getUsername());
Modified:
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/scheduling/SyncJob.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/scheduling/SyncJob.java?rev=1440512r1=1440511r2=1440512view=diff
svn commit: r1440542 - /syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Author: ilgrosso
Date: Wed Jan 30 17:36:56 2013
New Revision: 1440542
URL: http://svn.apache.org/viewvc?rev=1440542view=rev
Log:
Fixing some minor typos
Modified:
syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Modified:
syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1440542r1=1440541r2=1440542view=diff
==
---
syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
(original)
+++
syncope/branches/1_0_X/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Wed Jan 30 17:36:56 2013
@@ -365,7 +365,7 @@ public class TaskTestITCase extends Abst
SyncTaskTO task = restTemplate.getForObject(BASE_URL +
task/read/{taskId}, SyncTaskTO.class, 7);
assertNotNull(task);
-// add user template
+// add user template
UserTO template = new UserTO();
AttributeTO attrTO = new AttributeTO();
@@ -429,11 +429,11 @@ public class TaskTestITCase extends Abst
assertEquals(reconci...@syncope.apache.org,
userTO.getAttributeMap().get(userId).getValues().get(0));
assertEquals(suspended, userTO.getStatus());
-//enable user on external resource
+// enable user on external resource
JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource);
jdbcTemplate.execute(UPDATE TEST SET STATUS=TRUE);
-// re-execute the same SyncTask: now user must me active
+// re-execute the same SyncTask: now user must be active
preSyncSize = actual.getExecutions().size();
execution = restTemplate.postForObject(BASE_URL +
task/execute/{taskId}, null, TaskExecTO.class,
svn commit: r1440561 - in /syncope/trunk: ./ core/src/main/java/org/apache/syncope/core/persistence/beans/ core/src/main/java/org/apache/syncope/core/persistence/beans/user/ core/src/main/java/org/apa
Author: ilgrosso
Date: Wed Jan 30 17:56:47 2013
New Revision: 1440561
URL: http://svn.apache.org/viewvc?rev=1440561view=rev
Log:
[SYNCOPE-301] Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowResult.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Propchange: syncope/trunk/
--
Merged /syncope/branches/1_0_X:r1439847-1440543
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java?rev=1440561r1=1440560r2=1440561view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
Wed Jan 30 17:56:47 2013
@@ -26,7 +26,6 @@ import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.syncope.common.SyncopeConstants;
@@ -69,7 +68,7 @@ public abstract class AbstractBaseBean i
* @param property the integer representing a boolean value
* @return the boolean value corresponding to the property param
*/
-public final Boolean isBooleanAsInteger(final Integer property) {
+public final boolean isBooleanAsInteger(final Integer property) {
return property != null property == 1;
}
@@ -99,7 +98,7 @@ public abstract class AbstractBaseBean i
}
}
-return excludeFields.toArray(new String[] {});
+return excludeFields.toArray(new String[]{});
}
@Override
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java?rev=1440561r1=1440560r2=1440561view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/SyncopeUser.java
Wed Jan 30 17:56:47 2013
@@ -492,7 +492,7 @@ public class SyncopeUser extends Abstrac
}
public Boolean isSuspended() {
-return isBooleanAsInteger(suspended);
+return suspended == null ? null : isBooleanAsInteger(suspended);
}
private String encodePassword(final String password, final CipherAlgorithm
cipherAlgoritm)
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java?rev=1440561r1=1440560r2=1440561view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
Wed Jan 30 17:56:47 2013
@@ -19,7 +19,6 @@
package org.apache.syncope.core.security;
import java.util.Date;
-
import org.apache.syncope.common.types.AuditElements.AuthenticationSubCategory;
import org.apache.syncope.common.types.AuditElements.Category;
import org.apache.syncope.common.types.AuditElements.Result;
@@ -123,7 +122,7 @@ public class SyncopeAuthenticationProvid
} else {
user = userDAO.find(username);
-if (user != null) {
+if (user != null user.isSuspended() != null) {
if (user.isSuspended()) {
throw new DisabledException(User + user.getUsername() +
is suspended);
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
URL:
http
svn commit: r1440624 - /syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/AuthenticationTestITCaseJAXRS.java
Author: ilgrosso Date: Wed Jan 30 19:54:34 2013 New Revision: 1440624 URL: http://svn.apache.org/viewvc?rev=1440624view=rev Log: Adding missing license header causing failure of https://builds.apache.org/job/Syncope-trunk/36/ Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/AuthenticationTestITCaseJAXRS.java Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/AuthenticationTestITCaseJAXRS.java URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/AuthenticationTestITCaseJAXRS.java?rev=1440624r1=1440623r2=1440624view=diff == --- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/AuthenticationTestITCaseJAXRS.java (original) +++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/AuthenticationTestITCaseJAXRS.java Wed Jan 30 19:54:34 2013 @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.syncope.core.rest.jaxrs; import org.apache.syncope.core.rest.AuthenticationTestITCase;
svn commit: r1440920 - /syncope/trunk/core/src/main/resources/restContext.xml
Author: ilgrosso Date: Thu Jan 31 11:49:21 2013 New Revision: 1440920 URL: http://svn.apache.org/viewvc?rev=1440920view=rev Log: Restoring the build after commit r1440904 Modified: syncope/trunk/core/src/main/resources/restContext.xml Modified: syncope/trunk/core/src/main/resources/restContext.xml URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/restContext.xml?rev=1440920r1=1440919r2=1440920view=diff == --- syncope/trunk/core/src/main/resources/restContext.xml (original) +++ syncope/trunk/core/src/main/resources/restContext.xml Thu Jan 31 11:49:21 2013 @@ -78,7 +78,7 @@ under the License. ref bean=schemaServiceImpl/ ref bean=userRequestServiceImpl/ ref bean=userServiceImpl/ - ref bean=workflowServiceImpl/ + !--ref bean=workflowServiceImpl/-- /jaxrs:serviceBeans jaxrs:resourceComparator bean id=myServiceComparator class=org.apache.syncope.core.rest.utils.QueryResourceInfoComperator/
svn commit: r1440951 - /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
Author: ilgrosso
Date: Thu Jan 31 13:18:02 2013
New Revision: 1440951
URL: http://svn.apache.org/viewvc?rev=1440951view=rev
Log:
Fixing bad error reporting
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1440951r1=1440950r2=1440951view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
Thu Jan 31 13:18:02 2013
@@ -116,7 +116,7 @@ public class ResourceModalPage extends B
}
if (accountIdError) {
-error(new ResourceModel(accountIdValidation,
accountIdValidation).getObject());
+error(getString(accountIdValidation));
target.add(feedbackPanel);
} else {
try {
@@ -130,7 +130,7 @@ public class ResourceModalPage extends B
window.close(target);
} catch (Exception e) {
LOG.error(Failure managing resource {}, resourceTO,
e);
-error(new ResourceModel(error, error).getObject()
+ : + e.getMessage());
+error(getString(error) + : + e.getMessage());
target.add(feedbackPanel);
}
}
svn commit: r1441341 - /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
Author: ilgrosso
Date: Fri Feb 1 08:41:20 2013
New Revision: 1441341
URL: http://svn.apache.org/viewvc?rev=1441341view=rev
Log:
More robust handling of Long - long conversion
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java?rev=1441341r1=1441340r2=1441341view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
Fri Feb 1 08:41:20 2013
@@ -331,7 +331,9 @@ public class RoleDetailsPanel extends Pa
@Override
public void setObject(final Object object) {
-roleTO.setParent((Long) object);
+long parentId = (object instanceof Long)
+? ((Long) object).longValue() : 0;
+roleTO.setParent(parentId);
}
@Override
svn commit: r1441361 - in /syncope/trunk/console/src/main: java/org/apache/syncope/console/pages/ java/org/apache/syncope/console/pages/panels/ java/org/apache/syncope/console/rest/ resources/org/apac
Author: ilgrosso
Date: Fri Feb 1 09:35:21 2013
New Revision: 1441361
URL: http://svn.apache.org/viewvc?rev=1441361view=rev
Log:
[SYNCOPE-294] UserTO re-read from REST before opening the edit modal page
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/AbstractAttributableRestClient.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1441361r1=1441360r2=1441361view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
Fri Feb 1 09:35:21 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.commons.lang.StringUtils;
import org.apache.syncope.common.to.MappingItemTO;
import org.apache.syncope.common.to.ResourceTO;
import org.apache.syncope.common.types.AttributableType;
@@ -32,8 +33,10 @@ import org.apache.wicket.ajax.markup.htm
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
@@ -52,6 +55,14 @@ public class ResourceModalPage extends B
super();
+this.add(new Label(new, StringUtils.isBlank(resourceTO.getName())
+? new ResourceModel(new)
+: new Model()));
+
+this.add(new Label(name, StringUtils.isBlank(resourceTO.getName())
+?
+: resourceTO.getName()));
+
final Form form = new Form(form);
form.setModel(new CompoundPropertyModel(resourceTO));
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java?rev=1441361r1=1441360r2=1441361view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
Fri Feb 1 09:35:21 2013
@@ -33,6 +33,7 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.ResultStatusModalPage;
import org.apache.syncope.console.pages.StatusModalPage;
import org.apache.syncope.console.rest.AbstractAttributableRestClient;
+import org.apache.syncope.console.rest.UserRestClient;
import
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.AttrColumn;
import
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import
org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.TokenColumn;
@@ -147,14 +148,15 @@ public class UserSearchResultPanel exten
@Override
public Page createPage() {
-return new EditUserModalPage(
-page.getPageReference(), editmodal,
(UserTO) model.getObject());
+// SYNCOPE-294: re-read userTO before edit
+UserTO userTO = ((UserRestClient)
restClient).read(model.getObject().getId());
+return new
EditUserModalPage(page.getPageReference(), editmodal, userTO);
}
});
editmodal.show(target);
}
-}, ActionLink.ActionType.EDIT, Users, update);
+}, ActionLink.ActionType.EDIT, Users, read);
panel.add(new ActionLink() {
Modified
svn commit: r1442055 - in /syncope/trunk: archetype/ archetype/src/main/resources/META-INF/maven/ archetype/src/main/resources/archetype-resources/console/ archetype/src/main/resources/archetype-resou
Author: ilgrosso
Date: Mon Feb 4 09:37:59 2013
New Revision: 1442055
URL: http://svn.apache.org/viewvc?rev=1442055view=rev
Log:
[SYNCOPE-277] Copying archetype-resources from core and console modules at
build-time by leveraging Maven's resource handling, no more need to handle
these manually
Removed:
syncope/trunk/archetype/src/main/resources/archetype-resources/console/src/
syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/
syncope/trunk/core/src/test/resources/exploredb.jsp
syncope/trunk/core/src/test/resources/spring.jsp
Modified:
syncope/trunk/archetype/pom.xml
syncope/trunk/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
Modified: syncope/trunk/archetype/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/archetype/pom.xml?rev=1442055r1=1442054r2=1442055view=diff
==
--- syncope/trunk/archetype/pom.xml (original)
+++ syncope/trunk/archetype/pom.xml Mon Feb 4 09:37:59 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
--
project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
@@ -42,16 +41,6 @@ under the License.
/site
/distributionManagement
- properties
-SVNRepoURLhttp://svn.apache.org/repos/asf/syncope/trunk/SVNRepoURL
- /properties
-
- scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/syncope/trunk/archetype/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/syncope/trunk/archetype/developerConnection
-urlhttp://svn.apache.org/repos/asf/syncope/trunk/archetype/url
- /scm
-
build
extensions
extension
@@ -64,6 +53,7 @@ under the License.
pluginManagement
plugins
plugin
+ groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-archetype-plugin/artifactId
version2.2/version
extensionstrue/extensions
@@ -119,79 +109,6 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-antrun-plugin/artifactId
-inheritedtrue/inherited
-executions
- execution
-idsetupResources/id
-phasevalidate/phase
-configuration
- target
-taskdef resource=net/sf/antcontrib/antcontrib.properties
classpathref=maven.plugin.classpath /
-if
- available file=${basedir}/../core/pom.xml /
- then
-copy
file=${basedir}/../core/src/test/resources/persistence.properties
todir=${basedir}/src/main/resources/archetype-resources/core/src/test/resources
overwrite=true /
-copy
file=${basedir}/../core/src/test/resources/workflow.properties
todir=${basedir}/src/main/resources/archetype-resources/core/src/test/resources
overwrite=true /
-copy
file=${basedir}/../core/src/test/resources/content.xml
todir=${basedir}/src/main/resources/archetype-resources/core/src/test/resources
overwrite=true /
-copy
file=${basedir}/../core/src/test/resources/test.csv
todir=${basedir}/src/main/resources/archetype-resources/core/src/test/resources
overwrite=true /
-copy file=${basedir}/../core/src/test/resources/db.jsp
todir=${basedir}/src/main/resources/archetype-resources/core/src/test/resources
overwrite=true /
-
-copy
file=${basedir}/../core/src/main/resources/persistence.properties
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
-copy
file=${basedir}/../core/src/main/resources/workflow.properties
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
-copy
file=${basedir}/../core/src/main/resources/security.properties
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
-copy
file=${basedir}/../core/src/main/resources/content.xml
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
-copy
file=${basedir}/../core/src/main/resources/activiticontent.xml
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
-copy
file=${basedir}/../core/src/main/resources/logback.xml
todir=${basedir}/src/main/resources/archetype-resources/core/src/main/resources
overwrite=true /
-copy
file=${basedir}/../core/src/main/resources/META-INF/spring
svn commit: r1442495 - /syncope/branches/1_0_X/legal_ext/LICENSE
Author: ilgrosso Date: Tue Feb 5 08:22:48 2013 New Revision: 1442495 URL: http://svn.apache.org/viewvc?rev=1442495view=rev Log: Adding missing Eclipse Public License v 1.0 Modified: syncope/branches/1_0_X/legal_ext/LICENSE Modified: syncope/branches/1_0_X/legal_ext/LICENSE URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/legal_ext/LICENSE?rev=1442495r1=1442494r2=1442495view=diff == --- syncope/branches/1_0_X/legal_ext/LICENSE (original) +++ syncope/branches/1_0_X/legal_ext/LICENSE Tue Feb 5 08:22:48 2013 @@ -210,7 +210,53 @@ This is licensed under the AL 2.0, see a For Logback (http://logback.qos.ch): This program and the accompanying materials are licensed under -the terms of the Eclipse Public License v1.0, see above. +the terms of the Eclipse Public License v 1.0. + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (AGREEMENT). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. +1. DEFINITIONS +Contribution means: +a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and +b) in the case of each subsequent Contributor: +i) changes to the Program, and +ii) additions to the Program; +where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. +Contributor means any person or entity that distributes the Program. +Licensed Patents mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. +Program means the Contributions distributed in accordance with this Agreement. +Recipient means anyone who receives the Program under this Agreement, including all Contributors. +2. GRANT OF RIGHTS +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. +3. REQUIREMENTS +A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: +a) it complies with the terms and conditions of this Agreement; and +b) its license agreement: +i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; +ii) effectively excludes on behalf of all Contributors all liability for damages
svn commit: r1442634 - in /syncope/trunk/legal_ext: ./ LICENSE
Author: ilgrosso Date: Tue Feb 5 15:52:42 2013 New Revision: 1442634 URL: http://svn.apache.org/viewvc?rev=1442634view=rev Log: Fixing typo Modified: syncope/trunk/legal_ext/ (props changed) syncope/trunk/legal_ext/LICENSE Propchange: syncope/trunk/legal_ext/ -- --- svn:ignore (added) +++ svn:ignore Tue Feb 5 15:52:42 2013 @@ -0,0 +1 @@ +.LICENSE.swp Modified: syncope/trunk/legal_ext/LICENSE URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/LICENSE?rev=1442634r1=1442633r2=1442634view=diff == --- syncope/trunk/legal_ext/LICENSE (original) +++ syncope/trunk/legal_ext/LICENSE Tue Feb 5 15:52:42 2013 @@ -857,7 +857,7 @@ This is licensed under CDDL 1.0, see abo == -For SERB (http://serp.sourceforge.net/): +For SERP (http://serp.sourceforge.net/): This is licensed under the BSD license, see above. ==
svn commit: r1442663 - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/rest/utils/ client/src/main/java/org/apache/syncope/client/services/proxy/ common/src/main/java/org/apache/sync
Author: ilgrosso
Date: Tue Feb 5 17:05:59 2013
New Revision: 1442663
URL: http://svn.apache.org/viewvc?rev=1442663view=rev
Log:
Centralizing stream handling (db and report export) in SpringServiceProxy +
Various small fixes
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/utils/RestClientExceptionMapper.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConfigurationServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ReportServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/SpringServiceProxy.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/SyncopeConstants.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ReportExecExportFormat.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/HttpResourceStream.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportExecResultDownloadModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ReportRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/FieldPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportExecResultDownloadModalPage.html
syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/report/ReportJob.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/XMLSerializer.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/utils/RestClientExceptionMapper.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/utils/RestClientExceptionMapper.java?rev=1442663r1=1442662r2=1442663view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/utils/RestClientExceptionMapper.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/rest/utils/RestClientExceptionMapper.java
Tue Feb 5 17:05:59 2013
@@ -23,13 +23,11 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import javax.ws.rs.BadRequestException;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import javax.xml.ws.WebServiceException;
-
import org.apache.cxf.jaxrs.client.ResponseExceptionMapper;
import org.apache.http.HttpStatus;
import org.apache.syncope.common.types.SyncopeClientExceptionType;
@@ -83,8 +81,7 @@ public class RestClientExceptionMapper i
private SyncopeClientCompositeErrorException checkCompositeException(final
Response response) {
final int statusCode = response.getStatus();
-ListObject exTypesInHeaders = response.getHeaders().get(
-SyncopeClientErrorHandler.EXCEPTION_TYPE_HEADER);
+ListObject exTypesInHeaders =
response.getHeaders().get(SyncopeClientErrorHandler.EXCEPTION_TYPE_HEADER);
if (exTypesInHeaders == null) {
LOG.debug(No + SyncopeClientErrorHandler.EXCEPTION_TYPE_HEADER
+ provided);
return null;
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConfigurationServiceProxy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConfigurationServiceProxy.java?rev=1442663r1=1442662r2=1442663view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConfigurationServiceProxy.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConfigurationServiceProxy.java
svn commit: r1443356 - /syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/
Author: ilgrosso Date: Thu Feb 7 08:51:03 2013 New Revision: 1443356 URL: http://svn.apache.org/viewvc?rev=1443356view=rev Log: Fixing some italian typos Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_it.properties syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage_it.properties syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage_it.properties Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties?rev=1443356r1=1443355r2=1443356view=diff == --- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties (original) +++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties Thu Feb 7 08:51:03 2013 @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -title=Account policy management +title=Policy Management description=Description type=Type @@ -55,12 +55,6 @@ mustntEndWithAlpha=Mustn't end with alph #- # Account policy specification properties #- -#minLength=Minimum size -#maxLength=Maximum size -#wordsNotPermitted=Substrings not permitted -#schemasNotPermitted=Mustn't contain value of the following attributes -#prefixesNotPermitted=Prefixes not permitted -#suffixesNotPermitted=Suffixes not permitted allUpperCase=All upper case allLowerCase=All lower case propagateSuspension=Propagate suspension Modified: syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties?rev=1443356r1=1443355r2=1443356view=diff == --- syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties (original) +++ syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties Thu Feb 7 08:51:03 2013 @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -title=Gestiona Account Policy +title=Gestione Policy description=Descrizione type=Tipo @@ -40,28 +40,22 @@ mustStartWithDigit=Deve iniziare con un mustntStartWithDigit=Non deve iniziare con un numero mustEndWithDigit=Deve terminare con un numero mustntEndWithDigit=Non deve terminare con un numero -mustStartWithNonAlpha=Deve iniziare con un caratter non alfanumerico -mustStartWithAlpha=Deve iniziare con un caratter alfanumerico -mustntStartWithNonAlpha=Non deve iniziare con un caratter non alfanumerico -mustntStartWithAlpha=Non deve iniziare con un caratter alfanumerico -mustEndWithNonAlpha=Deve terminare con un caratter non alfanumerico -mustEndWithAlpha=Deve terminare con un caratter alfanumerico -mustntEndWithNonAlpha=Non deve terminare con un caratter non alfanumerico -mustntEndWithAlpha=Non deve terminare con un caratter alfanumerico +mustStartWithNonAlpha=Deve iniziare con un carattere non alfanumerico +mustStartWithAlpha=Deve iniziare con un carattere alfanumerico +mustntStartWithNonAlpha=Non deve iniziare con un carattere non alfanumerico +mustntStartWithAlpha=Non deve iniziare con un carattere alfanumerico +mustEndWithNonAlpha=Deve terminare con un carattere non alfanumerico +mustEndWithAlpha=Deve terminare con un carattere alfanumerico +mustntEndWithNonAlpha=Non deve terminare con un carattere non alfanumerico +mustntEndWithAlpha=Non deve terminare con un carattere alfanumerico #- #- # Account policy specification properties #- -#minLength=Lunghezza minima -#maxLength=Lunghezza massima -#wordsNotPermitted=Sottostringhe non permesse -#schemasNotPermitted=Non deve contenere i valore dei seguenti attributi -#prefixesNotPermitted=Prefissi non permessi -#suffixesNotPermitted=Suffissi non permessi allUpperCase=Tutte maiuscole allLowerCase=Tutte minuscole -propagateSuspension=Propagate sospensione +propagateSuspension=Propagare sospensione
svn commit: r1443362 - in /syncope/trunk: ./ console/src/main/resources/org/apache/syncope/console/pages/
Author: ilgrosso Date: Thu Feb 7 09:00:52 2013 New Revision: 1443362 URL: http://svn.apache.org/viewvc?rev=1443362view=rev Log: Merge from 1_0_X Modified: syncope/trunk/ (props changed) syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_it.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage_it.properties syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage_it.properties Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1442496-1443356 Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties?rev=1443362r1=1443361r2=1443362view=diff == --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.properties Thu Feb 7 09:00:52 2013 @@ -55,12 +55,6 @@ mustntEndWithAlpha=Mustn't end with alph #- # Account policy specification properties #- -#minLength=Minimum size -#maxLength=Maximum size -#wordsNotPermitted=Substrings not permitted -#schemasNotPermitted=Mustn't contain value of the following attributes -#prefixesNotPermitted=Prefixes not permitted -#suffixesNotPermitted=Suffixes not permitted allUpperCase=All upper case allLowerCase=All lower case propagateSuspension=Propagate suspension Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties?rev=1443362r1=1443361r2=1443362view=diff == --- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties (original) +++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_it.properties Thu Feb 7 09:00:52 2013 @@ -40,28 +40,22 @@ mustStartWithDigit=Deve iniziare con un mustntStartWithDigit=Non deve iniziare con un numero mustEndWithDigit=Deve terminare con un numero mustntEndWithDigit=Non deve terminare con un numero -mustStartWithNonAlpha=Deve iniziare con un caratter non alfanumerico -mustStartWithAlpha=Deve iniziare con un caratter alfanumerico -mustntStartWithNonAlpha=Non deve iniziare con un caratter non alfanumerico -mustntStartWithAlpha=Non deve iniziare con un caratter alfanumerico -mustEndWithNonAlpha=Deve terminare con un caratter non alfanumerico -mustEndWithAlpha=Deve terminare con un caratter alfanumerico -mustntEndWithNonAlpha=Non deve terminare con un caratter non alfanumerico -mustntEndWithAlpha=Non deve terminare con un caratter alfanumerico +mustStartWithNonAlpha=Deve iniziare con un carattere non alfanumerico +mustStartWithAlpha=Deve iniziare con un carattere alfanumerico +mustntStartWithNonAlpha=Non deve iniziare con un carattere non alfanumerico +mustntStartWithAlpha=Non deve iniziare con un carattere alfanumerico +mustEndWithNonAlpha=Deve terminare con un carattere non alfanumerico +mustEndWithAlpha=Deve terminare con un carattere alfanumerico +mustntEndWithNonAlpha=Non deve terminare con un carattere non alfanumerico +mustntEndWithAlpha=Non deve terminare con un carattere alfanumerico #- #- # Account policy specification properties #- -#minLength=Lunghezza minima -#maxLength=Lunghezza massima -#wordsNotPermitted=Sottostringhe non permesse -#schemasNotPermitted=Non deve contenere i valore dei seguenti attributi -#prefixesNotPermitted=Prefissi non permessi -#suffixesNotPermitted=Suffissi non permessi allUpperCase=Tutte maiuscole allLowerCase=Tutte minuscole -propagateSuspension=Propagate sospensione +propagateSuspension=Propagare sospensione permittedLoginRetries=Numero massimo di login consecutivi falliti #- Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_it.properties URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_it.properties?rev=1443362r1=1443361r2=1443362view=diff
svn commit: r1443410 - in /syncope/trunk/core/src/test: java/org/apache/syncope/core/rest/UserTestITCase.java resources/content.xml
Author: ilgrosso
Date: Thu Feb 7 11:08:42 2013
New Revision: 1443410
URL: http://svn.apache.org/viewvc?rev=1443410view=rev
Log:
[SYNCOPE-265] Renaming ws-target-resource-3 to ws-target-resource-timeout
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1443410r1=1443409r2=1443410view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Thu Feb 7 11:08:42 2013
@@ -1814,7 +1814,7 @@ public class UserTestITCase extends Abst
public void issueSYNCOPE279() {
UserTO userTO = getUniqueSampleTO(syncope...@apache.org);
userTO.getResources().clear();
-userTO.addResource(ws-target-resource-3);
+userTO.addResource(ws-target-resource-timeout);
createUser(userTO);
}
Modified: syncope/trunk/core/src/test/resources/content.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1443410r1=1443409r2=1443410view=diff
==
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Thu Feb 7 11:08:42 2013
@@ -346,7 +346,7 @@ under the License.
randomPwdIfNotProvided=0 enforceMandatoryCondition=1
propagationMode=TWO_PHASES
propagationPriority=0 propagationPrimary=1
createTraceLevel=FAILURES deleteTraceLevel=NONE updateTraceLevel=ALL
syncTraceLevel=ALL
syncPolicy_id=9/
- ExternalResource name=ws-target-resource-3 connector_id=102
+ ExternalResource name=ws-target-resource-timeout connector_id=102
randomPwdIfNotProvided=0 enforceMandatoryCondition=1
propagationMode=TWO_PHASES
propagationPriority=0 propagationPrimary=1
createTraceLevel=FAILURES deleteTraceLevel=NONE updateTraceLevel=ALL
syncTraceLevel=ALL
xmlConfiguration=%3Cset%3E%0A++%3Corg.apache.syncope.common.types.ConnConfProperty%3E%0A%3Cschema%3E%0A++%3Cname%3Eendpoint%3C/name%3E%0A++%3Ctype%3Ejava.lang.String%3C/type%3E%0A++%3Crequired%3Etrue%3C/required%3E%0A%3C/schema%3E%0A%3Cvalues%3E%0A++%3Cjava.lang.String%3Ehttp%3A//localhost%3A9080/syncope-build-tools/services/provisioning%3C/java.lang.String%3E%0A%3C/values%3E%0A%3Coverridable%3Etrue%3C/overridable%3E%0A++%3C/org.apache.syncope.common.types.ConnConfProperty%3E%0A%3C/set%3E/
@@ -618,7 +618,7 @@ under the License.
extAttrName=USERNAME intAttrName=virtualdata
intMappingType=UserVirtualSchema
mandatoryCondition=false /
- UMapping id=18 resource_name=ws-target-resource-3/
+ UMapping id=18 resource_name=ws-target-resource-timeout/
UMappingItem id=333 mapping_id=18 accountid=1 password=0
extAttrName=__NAME__ intAttrName=fullname
intMappingType=UserSchema
mandatoryCondition=true/
svn commit: r1443482 - in /syncope/trunk/core/src/test: java/org/apache/syncope/core/rest/TaskTestITCase.java java/org/apache/syncope/core/rest/UserTestITCase.java resources/content.xml
Author: ilgrosso
Date: Thu Feb 7 13:59:04 2013
New Revision: 1443482
URL: http://svn.apache.org/viewvc?rev=1443482view=rev
Log:
[SYNCOPE-265] Making ws-target-resource-2 non propagation-primary so that
propagation failures aren't blocking
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1443482r1=1443481r2=1443482view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Thu Feb 7 13:59:04 2013
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import javax.ws.rs.core.Response;
+import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.search.AttributableCond;
import org.apache.syncope.common.search.AttributeCond;
import org.apache.syncope.common.search.MembershipCond;
@@ -47,7 +48,6 @@ import org.apache.syncope.common.to.Sync
import org.apache.syncope.common.to.TaskExecTO;
import org.apache.syncope.common.to.TaskTO;
import org.apache.syncope.common.to.UserTO;
-import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.to.SyncPolicyTO;
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.types.PolicyType;
@@ -825,7 +825,7 @@ public class TaskTestITCase extends Abst
userMod.addAttributeToBeUpdated(attributeMod(email,
s...@apache.org));
userTO = userService.update(userMod.getId(), userMod);
-
+
execSyncTask(actual.getId(), 50, false);
SyncTaskTO executed = taskService.read(TaskType.SYNCHRONIZATION,
actual.getId());
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1443482r1=1443481r2=1443482view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Thu Feb 7 13:59:04 2013
@@ -33,9 +33,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
-
import javax.ws.rs.core.Response;
-
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.mod.MembershipMod;
import org.apache.syncope.common.mod.UserMod;
@@ -1912,7 +1910,7 @@ public class UserTestITCase extends Abst
// 4. update user, assign a propagation primary resource but don't
provide any password
UserMod userMod = new UserMod();
userMod.setId(userTO.getId());
-userMod.addResourceToBeAdded(ws-target-resource-2);
+userMod.addResourceToBeAdded(ws-target-resource-1);
userTO = userService.update(userMod.getId(), userMod);
assertNotNull(userTO);
@@ -1923,7 +1921,7 @@ public class UserTestITCase extends Abst
assertEquals(1, props.size());
PropagationStatusTO prop = props.iterator().next();
assertNotNull(prop);
-assertEquals(ws-target-resource-2, prop.getResource());
+assertEquals(ws-target-resource-1, prop.getResource());
assertEquals(PropagationTaskExecStatus.SUCCESS, prop.getStatus());
} catch (Exception e) {
LOG.error(Unexpected exception, e);
@@ -1978,5 +1976,4 @@ public class UserTestITCase extends Abst
}
return newMaxId;
}
-
}
Modified: syncope/trunk/core/src/test/resources/content.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1443482r1=1443481r2=1443482view=diff
==
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Thu Feb 7 13:59:04 2013
@@ -344,7 +344,7 @@ under the License.
propagationPriority=0 propagationPrimary=1
createTraceLevel=ALL deleteTraceLevel=ALL updateTraceLevel=ALL
syncTraceLevel=ALL/
ExternalResource name=ws-target-resource-2 connector_id=100
randomPwdIfNotProvided=0 enforceMandatoryCondition=1
propagationMode=TWO_PHASES
-propagationPriority=0 propagationPrimary=1
createTraceLevel=FAILURES deleteTraceLevel=NONE updateTraceLevel
svn commit: r1443510 - in /syncope/trunk/core/src: main/java/org/apache/syncope/core/persistence/beans/ main/java/org/apache/syncope/core/persistence/validation/attrvalue/ test/java/org/apache/syncope
Author: ilgrosso
Date: Thu Feb 7 14:48:47 2013
New Revision: 1443510
URL: http://svn.apache.org/viewvc?rev=1443510view=rev
Log:
White noise: formatting
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ReportTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/ReportTest.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java?rev=1443510r1=1443509r2=1443510view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
Thu Feb 7 14:48:47 2013
@@ -18,13 +18,14 @@
*/
package org.apache.syncope.core.persistence.beans;
+import static javax.persistence.EnumType.STRING;
+
import java.lang.reflect.Constructor;
import java.text.DecimalFormat;
import java.text.Format;
import java.text.SimpleDateFormat;
import javax.persistence.Basic;
import javax.persistence.Column;
-import static javax.persistence.EnumType.STRING;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Lob;
@@ -157,7 +158,7 @@ public abstract class AbstractSchema ext
validator = (AbstractValidator)
validatorConstructor.newInstance(this);
} catch (Exception e) {
LOG.error(Could not instantiate validator of type +
getValidatorClass()
-+ , reverting to AttributeBasicValidator, e);
++ , reverting to +
BasicValidator.class.getSimpleName(), e);
}
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java?rev=1443510r1=1443509r2=1443510view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Report.java
Thu Feb 7 14:48:47 2013
@@ -20,14 +20,12 @@ package org.apache.syncope.core.persiste
import java.util.ArrayList;
import java.util.List;
-
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
-
import org.apache.syncope.common.report.ReportletConf;
import org.apache.syncope.core.persistence.validation.entity.ReportCheck;
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java?rev=1443510r1=1443509r2=1443510view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/attrvalue/BasicValidator.java
Thu Feb 7 14:48:47 2013
@@ -19,7 +19,6 @@
package org.apache.syncope.core.persistence.validation.attrvalue;
import java.util.Arrays;
-
import org.apache.syncope.common.types.AttributeSchemaType;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
@@ -33,24 +32,21 @@ public class BasicValidator extends Abst
}
@Override
-protected void doValidate(AbstractAttrValue attributeValue) throws
InvalidAttrValueException {
-
+protected void doValidate(final AbstractAttrValue attributeValue) throws
InvalidAttrValueException {
if (AttributeSchemaType.Enum.equals(schema.getType())) {
final String[] enumeration =
schema.getEnumerationValues().split(AbstractSchema.enumValuesSeparator);
final String value = attributeValue.getStringValue();
-Boolean found = Boolean.FALSE;
-
+boolean found = false;
for (int i = 0; i enumeration.length !found; i++) {
if (enumeration[i].trim().equals(value)) {
-found
svn commit: r1443936 - /syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
Author: ilgrosso
Date: Fri Feb 8 11:08:40 2013
New Revision: 1443936
URL: http://svn.apache.org/r1443936
Log:
UserController is meant to be extended, changing private into protected
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1443936r1=1443935r2=1443936view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
Fri Feb 8 11:08:40 2013
@@ -696,18 +696,17 @@ public class UserController {
return savedTO;
}
- private WorkflowResultLong setStatusOnWfAdapter(
- final SyncopeUser user, final String token, final
String task) {
- WorkflowResultLong updated;
- if (suspend.equals(task)) {
- updated = uwfAdapter.suspend(user.getId());
- } else if (reactivate.equals(task)) {
- updated = uwfAdapter.reactivate(user.getId());
- } else {
- updated = uwfAdapter.activate(user.getId(), token);
- }
- return updated;
- }
+protected WorkflowResultLong setStatusOnWfAdapter(final SyncopeUser
user, final String token, final String task) {
+WorkflowResultLong updated;
+if (suspend.equals(task)) {
+updated = uwfAdapter.suspend(user.getId());
+} else if (reactivate.equals(task)) {
+updated = uwfAdapter.reactivate(user.getId());
+} else {
+updated = uwfAdapter.activate(user.getId(), token);
+}
+return updated;
+}
protected UserTO doDelete(final Long userId)
throws NotFoundException, WorkflowException, PropagationException,
UnauthorizedRoleException {
svn commit: r1443945 - in /syncope/branches/1_0_X/console/src: main/java/org/apache/syncope/console/pages/panels/ main/java/org/apache/syncope/console/wicket/markup/html/form/ main/resources/org/apach
Author: ilgrosso
Date: Fri Feb 8 11:37:35 2013
New Revision: 1443945
URL: http://svn.apache.org/r1443945
Log:
[SYNCOPE-310] Workaround waiting for WICKET-5029 availability
Added:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.java
(with props)
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/NonI18nPalette.html
(with props)
syncope/branches/1_0_X/console/src/main/webapp/img/left-icon.png (with
props)
syncope/branches/1_0_X/console/src/main/webapp/img/right-icon.png (with
props)
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.java
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/panels/PolicyBeanPanel.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/SingleColumnPalette.html
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java?rev=1443945r1=1443944r2=1443945view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
Fri Feb 8 11:37:35 2013
@@ -26,6 +26,15 @@ import java.util.Arrays;
import java.util.List;
import java.util.Set;
import org.apache.syncope.annotation.SchemaList;
+import org.apache.syncope.console.commons.XMLRolesReader;
+import org.apache.syncope.console.rest.SchemaRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.AbstractFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import
org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
+import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
import org.apache.syncope.types.AbstractPolicySpec;
import org.apache.syncope.types.AttributableType;
import org.apache.syncope.types.ConflictResolutionAction;
@@ -45,15 +54,6 @@ import org.apache.wicket.spring.injectio
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
-import org.apache.syncope.console.commons.XMLRolesReader;
-import org.apache.syncope.console.rest.SchemaRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AbstractFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
-import
org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
-import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
public class PolicyBeanPanel extends Panel {
@@ -104,8 +104,7 @@ public class PolicyBeanPanel extends Pan
private static final long serialVersionUID = 9101744072914090143L;
@Override
-protected void populateItem(ListItemFieldWrapper item) {
-
+protected void populateItem(final ListItemFieldWrapper item) {
final FieldWrapper field = item.getModelObject();
item.add(new Label(label, new
ResourceModel(field.getName(;
@@ -135,7 +134,6 @@ public class PolicyBeanPanel extends Pan
field.getName
svn commit: r1444147 - in /syncope/trunk: ./ common/src/main/java/org/apache/syncope/common/to/ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/resources/org/apache/syncope/co
Author: ilgrosso
Date: Fri Feb 8 17:01:18 2013
New Revision: 1444147
URL: http://svn.apache.org/r1444147
Log:
[SYNCOPE-311] Merge from 1_0_X
Added:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ViewUserModalPage.java
- copied, changed from r1444083,
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ViewUserModalPage.java
Modified:
syncope/trunk/ (props changed)
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Todo.html
syncope/trunk/console/src/main/webapp/css/style.css
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Update.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Propchange: syncope/trunk/
--
Merged /syncope/branches/1_0_X:r1443946-1444141
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java?rev=1444147r1=1444146r2=1444147view=diff
==
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/WorkflowFormTO.java
Fri Feb 8 17:01:18 2013
@@ -25,14 +25,12 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
import org.apache.syncope.common.AbstractBaseBean;
+import org.codehaus.jackson.annotate.JsonIgnore;
@XmlRootElement(name = workflowForm)
@XmlType
@@ -40,6 +38,8 @@ public class WorkflowFormTO extends Abst
private static final long serialVersionUID = -7044543391316529128L;
+private long userId;
+
private String taskId;
private String key;
@@ -58,6 +58,14 @@ public class WorkflowFormTO extends Abst
properties = new ArrayListWorkflowFormPropertyTO();
}
+public long getUserId() {
+return userId;
+}
+
+public void setUserId(long userId) {
+this.userId = userId;
+}
+
public String getTaskId() {
return taskId;
}
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java?rev=1444147r1=1444146r2=1444147view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ApprovalModalPage.java
Fri Feb 8 17:01:18 2013
@@ -31,12 +31,15 @@ import org.apache.syncope.common.to.Work
import org.apache.syncope.common.to.WorkflowFormTO;
import
org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.MapChoiceRenderer;
+import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.rest.ApprovalRestClient;
+import org.apache.syncope.console.rest.UserRestClient;
import
org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.DateTimeFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
+import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget
svn commit: r1444739 - in /syncope/trunk/core/src: main/java/org/apache/syncope/core/rest/data/ test/java/org/apache/syncope/core/persistence/dao/
Author: ilgrosso
Date: Mon Feb 11 11:13:07 2013
New Revision: 1444739
URL: http://svn.apache.org/r1444739
Log:
[SYNCOPE-215] Implement usage of AbstractVirSchema#isReadonly() + basci test
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/VirSchemaTest.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java?rev=1444739r1=1444738r2=1444739view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
Mon Feb 11 11:13:07 2013
@@ -131,7 +131,7 @@ public abstract class AbstractAttributab
} else if (schema.isReadonly()) {
schema = null;
-LOG.debug(Ignoring virtual or readonly schema {},
schemaName);
+LOG.debug(Ignoring readonly schema {}, schemaName);
}
}
@@ -157,6 +157,10 @@ public abstract class AbstractAttributab
if (virtualSchema == null) {
LOG.debug(Ignoring invalid virtual schema {}, virSchemaName);
+} else if (virtualSchema.isReadonly()) {
+virtualSchema = null;
+
+LOG.debug(Ignoring readonly virtual schema {},
virtualSchema);
}
}
@@ -274,6 +278,7 @@ public abstract class AbstractAttributab
}
for (AbstractVirSchema virSchema :
virSchemaDAO.findAll(attrUtil.virSchemaClass())) {
if (attributable.getVirtualAttribute(virSchema.getName()) == null
+ !virSchema.isReadonly()
evaluateMandatoryCondition(attrUtil, attributable,
virSchema.getName(),
attrUtil.virIntMappingType())) {
@@ -294,11 +299,11 @@ public abstract class AbstractAttributab
// 1. virtual attributes to be removed
for (String vAttrToBeRemoved : vAttrsToBeRemoved) {
-AbstractVirSchema virtualSchema =
getVirtualSchema(vAttrToBeRemoved, attrUtil.virSchemaClass());
-if (virtualSchema != null) {
-AbstractVirAttr virAttr =
attributable.getVirtualAttribute(virtualSchema.getName());
+AbstractVirSchema virSchema = getVirtualSchema(vAttrToBeRemoved,
attrUtil.virSchemaClass());
+if (virSchema != null) {
+AbstractVirAttr virAttr =
attributable.getVirtualAttribute(virSchema.getName());
if (virAttr == null) {
-LOG.debug(No virtual attribute found for schema {},
virtualSchema.getName());
+LOG.debug(No virtual attribute found for schema {},
virSchema.getName());
} else {
attributable.removeVirtualAttribute(virAttr);
virAttrDAO.delete(virAttr);
@@ -306,7 +311,7 @@ public abstract class AbstractAttributab
for (ExternalResource resource : resourceDAO.findAll()) {
for (AbstractMappingItem mapItem :
attrUtil.getMappingItems(resource)) {
-if
(virtualSchema.getName().equals(mapItem.getIntAttrName())
+if
(virSchema.getName().equals(mapItem.getIntAttrName())
mapItem.getIntMappingType() ==
attrUtil.virIntMappingType()
attributable.getResources().contains(resource)) {
@@ -731,7 +736,7 @@ public abstract class AbstractAttributab
attributeTO = new AttributeTO();
attributeTO.setSchema(virtualAttribute.getVirtualSchema().getName());
attributeTO.setValues(virtualAttribute.getValues());
-attributeTO.setReadonly(false);
+
attributeTO.setReadonly(virtualAttribute.getVirtualSchema().isReadonly());
abstractAttributableTO.addVirtualAttribute(attributeTO);
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java?rev=1444739r1=1444738r2=1444739view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
Mon Feb 11 11:13:07 2013
@@ -19,7 +19,6 @@
package
svn commit: r1444850 - in /syncope/branches/1_0_X: console/src/main/resources/org/apache/syncope/console/pages/ core/src/main/java/org/apache/syncope/core/workflow/ core/src/main/java/org/apache/synco
Author: ilgrosso
Date: Mon Feb 11 16:26:31 2013
New Revision: 1444850
URL: http://svn.apache.org/r1444850
Log:
[SYNCOPE-308] Default workflow changed to raise exception when update of
rejected user is attempted
Modified:
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java
syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
Modified:
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html?rev=1444850r1=1444849r2=1444850view=diff
==
---
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html
(original)
+++
syncope/branches/1_0_X/console/src/main/resources/org/apache/syncope/console/pages/Users.html
Mon Feb 11 16:26:31 2013
@@ -12,26 +12,6 @@
limitations under the License.
under the License.
--
-wicket:head
-style type=text/css
-/* SET THE DEFAULT ERROR PANEL'S' STYLE, INVALIDATING THE CSS RENDERING
-FOR THE CURRENT PAGE */
-.feedbackPanelERROR {
-background: none !important;
-font-weight: normal;
-color: red;
-border:0 none !important;
-list-style-type: disc;
-padding: 5px;
-margin: 5px;
-}
-
-.feedbackPanelERROR span {
-padding: 0px;
-margin: 0px;
-}
-/style
-/wicket:head
wicket:extend
div id=tabs
ul
Modified:
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java?rev=1444850r1=1444849r2=1444850view=diff
==
---
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
(original)
+++
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
Mon Feb 11 16:26:31 2013
@@ -269,7 +269,7 @@ public class ActivitiUserWorkflowAdapter
}
if (StringUtils.isBlank(user.getWorkflowId())) {
-throw new WorkflowException(new NotFoundException(Empty workflow
id));
+throw new WorkflowException(new NotFoundException(Empty workflow
id for + user));
}
ListTask tasks =
taskService.createTaskQuery().processInstanceId(user.getWorkflowId()).list();
Modified:
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java?rev=1444850r1=1444849r2=1444850view=diff
==
---
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java
(original)
+++
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java
Mon Feb 11 16:26:31 2013
@@ -34,7 +34,6 @@ public class Delete extends AbstractActi
user.checkToken();
}
-
// remove SyncopeUser variable
execution.removeVariable(ActivitiUserWorkflowAdapter.SYNCOPE_USER);
}
Modified: syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml?rev=1444850r1=1444849r2=1444850view=diff
==
--- syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
(original)
+++ syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml Mon
Feb 11 16:26:31 2013
@@ -164,8 +164,13 @@ under the License.
userTask id=rejected name=Rejected/
-sequenceFlow id=flow14 sourceRef=rejected targetRef=delete/
-
+sequenceFlow id=flow14 sourceRef=rejected targetRef=rejectedGw/
+
+exclusiveGateway id=rejectedGw/
+sequenceFlow id=rejected2Delete sourceRef=rejectedGw
targetRef=delete
+ conditionExpression xsi:type=tFormalExpression${task ==
'delete'}/conditionExpression
+/sequenceFlow
+
!-- Delete an user (created, active or suspended) --
serviceTask id=delete name=Delete
activiti:class=org.apache.syncope.core.workflow.activiti.Delete/
svn commit: r1444867 - /syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
Author: ilgrosso
Date: Mon Feb 11 17:06:06 2013
New Revision: 1444867
URL: http://svn.apache.org/r1444867
Log:
[SYNCOPE-308] Re-merging user workflow definition from trunk
Modified:
syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
Modified: syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml?rev=1444867r1=1444866r2=1444867view=diff
==
--- syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
(original)
+++ syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml Mon
Feb 11 17:06:06 2013
@@ -23,12 +23,12 @@ under the License.
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:activiti=http://activiti.org/bpmn;
xmlns:bpmndi=http://www.omg.org/spec/BPMN/20100524/DI;
- xmlns:omgdc=http://www.omg.org/spec/DD/20100524/DC;
+ xmlns:omgdc=http://www.omg.org/spec/DD/20100524/DC;
xmlns:omgdi=http://www.omg.org/spec/DD/20100524/DI;
xsi:schemaLocation=http://www.omg.org/spec/BPMN/20100524/MODEL
http://www.omg.org/spec/BPMN/2.0/20100501/BPMN20.xsd;
- process id=userWorkflow name=User Workflow
+ process id=userWorkflow name=User Workflow isExecutable=true
startEvent id=theStart/
@@ -165,11 +165,14 @@ under the License.
userTask id=rejected name=Rejected/
sequenceFlow id=flow14 sourceRef=rejected targetRef=rejectedGw/
-
+
exclusiveGateway id=rejectedGw/
sequenceFlow id=rejected2Delete sourceRef=rejectedGw
targetRef=delete
conditionExpression xsi:type=tFormalExpression${task ==
'delete'}/conditionExpression
/sequenceFlow
+sequenceFlow id=rejected2Rejected sourceRef=rejectedGw
targetRef=rejected
+ conditionExpression xsi:type=tFormalExpression${empty
task}/conditionExpression
+/sequenceFlow
!-- Delete an user (created, active or suspended) --
serviceTask id=delete name=Delete
activiti:class=org.apache.syncope.core.workflow.activiti.Delete/
svn commit: r1446679 - /syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java
Author: ilgrosso Date: Fri Feb 15 16:41:31 2013 New Revision: 1446679 URL: http://svn.apache.org/r1446679 Log: [SYNCOPE-312] Fixing missing consideration of admin console by commit r1446632 Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java?rev=1446679r1=1446678r2=1446679view=diff == --- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java Fri Feb 15 16:41:31 2013 @@ -34,6 +34,7 @@ import org.apache.syncope.client.service import org.apache.syncope.client.services.proxy.TaskServiceProxy; import org.apache.syncope.client.services.proxy.UserRequestServiceProxy; import org.apache.syncope.client.services.proxy.UserServiceProxy; +import org.apache.syncope.client.services.proxy.UserWorkflowServiceProxy; import org.apache.syncope.client.services.proxy.WorkflowServiceProxy; import org.apache.syncope.common.services.ConfigurationService; import org.apache.syncope.common.services.ConnectorService; @@ -48,6 +49,7 @@ import org.apache.syncope.common.service import org.apache.syncope.common.services.TaskService; import org.apache.syncope.common.services.UserRequestService; import org.apache.syncope.common.services.UserService; +import org.apache.syncope.common.services.UserWorkflowService; import org.apache.syncope.common.services.WorkflowService; import org.apache.syncope.console.commons.Constants; import org.apache.wicket.Session; @@ -108,6 +110,7 @@ public class SyncopeSession extends WebS services.put(TaskService.class, new TaskServiceProxy(baseURL, restTemplate)); services.put(UserRequestService.class, new UserRequestServiceProxy(baseURL, restTemplate)); services.put(UserService.class, new UserServiceProxy(baseURL, restTemplate)); +services.put(UserWorkflowService.class, new UserWorkflowServiceProxy(baseURL, restTemplate)); services.put(WorkflowService.class, new WorkflowServiceProxy(baseURL, restTemplate)); }
svn commit: r1446680 - /syncope/trunk/pom.xml
Author: ilgrosso Date: Fri Feb 15 16:42:03 2013 New Revision: 1446680 URL: http://svn.apache.org/r1446680 Log: White noise: formatting Modified: syncope/trunk/pom.xml Modified: syncope/trunk/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1446680r1=1446679r2=1446680view=diff == --- syncope/trunk/pom.xml (original) +++ syncope/trunk/pom.xml Fri Feb 15 16:42:03 2013 @@ -818,8 +818,12 @@ under the License. repository idsonatype/id urlhttps://oss.sonatype.org/content/repositories/snapshots/url - releasesenabledfalse/enabled/releases - snapshotsenabledtrue/enabled/snapshots + releases +enabledfalse/enabled + /releases + snapshots +enabledtrue/enabled + /snapshots /repository /repositories
svn commit: r1447193 - /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Author: ilgrosso
Date: Mon Feb 18 11:11:47 2013
New Revision: 1447193
URL: http://svn.apache.org/r1447193
Log:
[SYNCOPE-316] Empty (instead of null) list returned in case of no connector
bundles
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java?rev=1447193r1=1447192r2=1447193view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Mon Feb 18 11:11:47 2013
@@ -91,7 +91,7 @@ public class ConnectorRestClient extends
}
public ListConnBundleTO getAllBundles() {
-ListConnBundleTO bundles = null;
+ListConnBundleTO bundles = Collections.ConnBundleTOemptyList();
try {
bundles =
Arrays.asList(SyncopeSession.get().getRestTemplate().getForObject(
svn commit: r1447194 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Author: ilgrosso
Date: Mon Feb 18 11:13:25 2013
New Revision: 1447194
URL: http://svn.apache.org/r1447194
Log:
[SYNCOPE-316] Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Propchange: syncope/trunk/
--
Merged /syncope/branches/1_0_X:r1447181-1447193
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java?rev=1447194r1=1447193r2=1447194view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Mon Feb 18 11:13:25 2013
@@ -92,7 +92,7 @@ public class ConnectorRestClient extends
}
public ListConnBundleTO getAllBundles() {
-ListConnBundleTO bundles = null;
+ListConnBundleTO bundles = Collections.ConnBundleTOemptyList();
try {
bundles =
getService(ConnectorService.class).getBundles(SyncopeSession.get().getLocale().toString());
svn commit: r1447389 - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/services/proxy/ common/src/main/java/org/apache/syncope/common/services/ common/src/main/java/org/apache/syncop
Author: ilgrosso
Date: Mon Feb 18 16:51:22 2013
New Revision: 1447389
URL: http://svn.apache.org/r1447389
Log:
Removing unused (and little meaningful) methods for listing report and task
executions form everywhere
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ReportServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ReportService.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/TaskService.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AuditElements.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserTemplateModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ExecutionRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ReportRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ReportController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/TaskController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ReportServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/TaskServiceImpl.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ReportServiceProxy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ReportServiceProxy.java?rev=1447389r1=1447388r2=1447389view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ReportServiceProxy.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ReportServiceProxy.java
Mon Feb 18 16:51:22 2013
@@ -65,11 +65,6 @@ public class ReportServiceProxy extends
}
@Override
-public ListReportExecTO listExecutions() {
-return Arrays.asList(getRestTemplate().getForObject(baseUrl +
report/execution/list, ReportExecTO[].class));
-}
-
-@Override
public ReportletConfClasses getReportletConfClasses() {
ListString confClasses =
Arrays.asList(getRestTemplate().getForObject(
baseUrl + report/reportletConfClasses.json, String[].class));
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java?rev=1447389r1=1447388r2=1447389view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/TaskServiceProxy.java
Mon Feb 18 16:51:22 2013
@@ -61,8 +61,8 @@ public class TaskServiceProxy extends Sp
String subTypeString = (taskTO instanceof SyncTaskTO)
? sync
: (taskTO instanceof SchedTaskTO)
-? sched
-: ;
+? sched
+: ;
TaskTO task = getRestTemplate().postForObject(baseUrl +
task/create/{type}, taskTO, taskTO.getClass(),
subTypeString);
@@ -167,12 +167,6 @@ public class TaskServiceProxy extends Sp
}
@Override
-public ListTaskExecTO listExecutions(final TaskType type) {
-return Arrays.asList(getRestTemplate().getForObject(baseUrl +
task/{type}/execution/list.json,
-TaskExecTO[].class, type));
-}
-
-@Override
public T extends TaskTO T read(final TaskType type, final Long taskId) {
return (T) getRestTemplate().getForObject(baseUrl +
task/read/{taskId}.json, getTOClass(type), taskId);
}
@@ -195,8 +189,8 @@ public class TaskServiceProxy extends Sp
String path = (taskTO instanceof SyncTaskTO)
? sync
: (taskTO instanceof SchedTaskTO)
-? sched
-: null;
+? sched
+: null;
if (path == null) {
throw new IllegalArgumentException(Task can only be instance of
SchedTaskTO or SyncTaskTO);
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ReportService.java
svn commit: r1448710 - in /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages: DerivedSchemaModalPage.java panels/AttributesPanel.java panels/DerivedAttributesPanel.java panels/Virtu
Author: ilgrosso
Date: Thu Feb 21 16:26:16 2013
New Revision: 1448710
URL: http://svn.apache.org/r1448710
Log:
[SYNCOPE-321] Replacing back ClearIndicatingAjax... with IndicatingAjax in
modal windows
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1448710r1=1448709r2=1448710view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
Thu Feb 21 16:26:16 2013
@@ -23,13 +23,13 @@ import org.apache.syncope.common.to.Deri
import org.apache.syncope.common.types.AttributableType;
import
org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.commons.JexlHelpUtil;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -78,12 +78,12 @@ public class DerivedSchemaModalPage exte
name.setEnabled(createFlag);
-final AjaxButton submit = new ClearIndicatingAjaxButton(apply, new
ResourceModel(submit), pageRef) {
+final AjaxButton submit = new IndicatingAjaxButton(apply, new
ResourceModel(submit)) {
private static final long serialVersionUID = -958724007591692537L;
@Override
-protected void onSubmitInternal(final AjaxRequestTarget target,
final Form form) {
+protected void onSubmit(final AjaxRequestTarget target, final Form
form) {
DerivedSchemaTO schemaTO = (DerivedSchemaTO)
form.getDefaultModelObject();
try {
@@ -109,12 +109,12 @@ public class DerivedSchemaModalPage exte
}
};
-final AjaxButton cancel = new ClearIndicatingAjaxButton(cancel, new
ResourceModel(cancel), pageRef) {
+final AjaxButton cancel = new IndicatingAjaxButton(cancel, new
ResourceModel(cancel)) {
private static final long serialVersionUID = -958724007591692537L;
@Override
-protected void onSubmitInternal(final AjaxRequestTarget target,
final Form? form) {
+protected void onSubmit(final AjaxRequestTarget target, final
Form? form) {
window.close(target);
}
};
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1448710r1=1448709r2=1448710view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
Thu Feb 21 16:26:16 2013
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import org.apache.commons.lang.StringUtils;
import org.apache.syncope.common.SyncopeConstants;
import org.apache.syncope.common.to.AbstractAttributableTO;
@@ -87,7 +88,7 @@ public class AttributesPanel extends Pan
schemaTOs =
schemaRestClient.getSchemas(AttributableType.MEMBERSHIP);
}
-final MapString, SchemaTO schemas = new HashMapString,
SchemaTO();
+final MapString, SchemaTO schemas = new TreeMapString,
SchemaTO();
for (SchemaTO schemaTO : schemaTOs) {
schemas.put(schemaTO.getName(), schemaTO
svn commit: r1449136 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/java/org/apache/syncope/console/pages/panels/ console/src/main/resources/org/apach
Author: ilgrosso
Date: Fri Feb 22 17:10:14 2013
New Revision: 1449136
URL: http://svn.apache.org/r1449136
Log:
Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.html
Propchange: syncope/trunk/
--
Merged /syncope/branches/1_0_X:r1447609-1449127
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java?rev=1449136r1=1449135r2=1449136view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
Fri Feb 22 17:10:14 2013
@@ -95,13 +95,13 @@ public class MembershipModalPage extends
//
// Derived attributes container
//
-form.add(new DerivedAttributesPanel(derivedAttributes, membershipTO,
pageRef));
+form.add(new DerivedAttributesPanel(derivedAttributes,
membershipTO));
//
//
// Virtual attributes container
//
-form.add(new VirtualAttributesPanel(virtualAttributes, membershipTO,
templateMode, pageRef));
+form.add(new VirtualAttributesPanel(virtualAttributes, membershipTO,
templateMode));
//
add(form);
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1449136r1=1449135r2=1449136view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
Fri Feb 22 17:10:14 2013
@@ -92,7 +92,7 @@ public class RoleModalPage extends BaseM
form.setModel(new CompoundPropertyModel(roleTO));
-this.rolePanel = new RolePanel(rolePanel, form, roleTO, mode,
pageRef);
+this.rolePanel = new RolePanel(rolePanel, form, roleTO, mode);
form.add(rolePanel);
final AjaxButton submit = new ClearIndicatingAjaxButton(submit, new
ResourceModel(submit), pageRef) {
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1449136r1=1449135r2=1449136view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Fri Feb 22 17:10:14 2013
@@ -122,13 +122,13 @@ public abstract class UserModalPage exte
//
// Derived attributes panel
//
-form.add(new DerivedAttributesPanel(derivedAttributes, userTO,
pageRef));
+form.add(new DerivedAttributesPanel(derivedAttributes, userTO));
//
//
// Virtual attributes panel
//
-form.add(new VirtualAttributesPanel(virtualAttributes, userTO, mode
== Mode.TEMPLATE, pageRef));
+form.add(new VirtualAttributesPanel(virtualAttributes
svn commit: r1449639 - in /syncope/branches/1_0_X/console/src/main/webapp/WEB-INF: jboss-deployment-structure.xml web.xml
Author: ilgrosso Date: Mon Feb 25 10:06:57 2013 New Revision: 1449639 URL: http://svn.apache.org/r1449639 Log: [SYNCOPE-325] Missing directives for JBoss handling of SLF4J Added: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (with props) Modified: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml Added: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml?rev=1449639view=auto == --- syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (added) +++ syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Mon Feb 25 10:06:57 2013 @@ -0,0 +1,31 @@ +?xml version=1.0 encoding=UTF-8? +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- +jboss-deployment-structure xmlns=urn:jboss:deployment-structure:1.0 + deployment +dependencies + module name=org.apache.xerces / + module name=org.apache.xalan / +/dependencies +exclusions + module name=org.slf4j / + module name=org.slf4j.impl / +/exclusions + /deployment +/jboss-deployment-structure \ No newline at end of file Propchange: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml -- svn:eol-style = native Propchange: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml -- svn:keywords = Date Revision Author HeadURL Id Propchange: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml -- svn:mime-type = text/xml Modified: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml?rev=1449639r1=1449638r2=1449639view=diff == --- syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml (original) +++ syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml Mon Feb 25 10:06:57 2013 @@ -16,7 +16,6 @@ software distributed under the License i KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -- web-app xmlns=http://java.sun.com/xml/ns/javaee; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
svn commit: r1450234 - /syncope/branches/1_0_X/parent/pom.xml
Author: ilgrosso Date: Tue Feb 26 15:46:21 2013 New Revision: 1450234 URL: http://svn.apache.org/r1450234 Log: Upgrading XStream and Jackson Modified: syncope/branches/1_0_X/parent/pom.xml Modified: syncope/branches/1_0_X/parent/pom.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/parent/pom.xml?rev=1450234r1=1450233r2=1450234view=diff == --- syncope/branches/1_0_X/parent/pom.xml (original) +++ syncope/branches/1_0_X/parent/pom.xml Tue Feb 26 15:46:21 2013 @@ -273,8 +273,8 @@ under the License. spring.version3.1.4.RELEASE/spring.version spring-security.version3.1.3.RELEASE/spring-security.version aspectj.version1.7.1/aspectj.version -jackson.version1.9.11/jackson.version -xstream.version1.4.3/xstream.version +jackson.version1.9.12/jackson.version +xstream.version1.4.4/xstream.version velocity.version1.7/velocity.version quartz.version1.8.6/quartz.version
svn commit: r1450240 - in /syncope/trunk: ./ pom.xml
Author: ilgrosso Date: Tue Feb 26 16:01:15 2013 New Revision: 1450240 URL: http://svn.apache.org/r1450240 Log: Merge from 1_0_X Modified: syncope/trunk/ (props changed) syncope/trunk/pom.xml Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1449640-1450234 Modified: syncope/trunk/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1450240r1=1450239r2=1450240view=diff == --- syncope/trunk/pom.xml (original) +++ syncope/trunk/pom.xml Tue Feb 26 16:01:15 2013 @@ -294,8 +294,8 @@ under the License. spring.version3.2.1.RELEASE/spring.version spring-security.version3.1.3.RELEASE/spring-security.version aspectj.version1.7.2.RELEASE/aspectj.version -jackson.version1.9.11/jackson.version -xstream.version1.4.3/xstream.version +jackson.version1.9.12/jackson.version +xstream.version1.4.4/xstream.version velocity.version1.7/velocity.version quartz.version2.1.6/quartz.version
svn commit: r1450674 - /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Author: ilgrosso
Date: Wed Feb 27 08:35:34 2013
New Revision: 1450674
URL: http://svn.apache.org/r1450674
Log:
More ClearIndicatingAjaxButton - IndicatingAjaxButton back conversion
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1450674r1=1450673r2=1450674view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Wed Feb 27 08:35:34 2013
@@ -26,11 +26,11 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.panels.UserDetailsPanel;
import org.apache.syncope.console.pages.panels.UserManagementResultPanel;
import org.apache.syncope.console.pages.panels.VirtualAttributesPanel;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -179,12 +179,12 @@ public abstract class UserModalPage exte
}
protected AjaxButton getOnSubmit() {
-return new ClearIndicatingAjaxButton(apply, new
ResourceModel(submit), pageRef) {
+return new IndicatingAjaxButton(apply, new ResourceModel(submit)) {
private static final long serialVersionUID = -958724007591692537L;
@Override
-protected void onSubmitInternal(final AjaxRequestTarget target,
final Form? form) {
+protected void onSubmit(final AjaxRequestTarget target, final
Form? form) {
try {
submitAction(target, form);
svn commit: r1450678 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Author: ilgrosso
Date: Wed Feb 27 08:45:52 2013
New Revision: 1450678
URL: http://svn.apache.org/r1450678
Log:
Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Propchange: syncope/trunk/
--
Merged /syncope/branches/1_0_X:r1450235-1450674
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1450678r1=1450677r2=1450678view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Wed Feb 27 08:45:52 2013
@@ -25,11 +25,11 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.panels.ResourcesPanel;
import org.apache.syncope.console.pages.panels.UserDetailsPanel;
import org.apache.syncope.console.pages.panels.VirtualAttributesPanel;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -177,12 +177,12 @@ public abstract class UserModalPage exte
}
protected AjaxButton getOnSubmit() {
-return new ClearIndicatingAjaxButton(apply, new
ResourceModel(submit), pageRef) {
+return new IndicatingAjaxButton(apply, new ResourceModel(submit)) {
private static final long serialVersionUID = -958724007591692537L;
@Override
-protected void onSubmitInternal(final AjaxRequestTarget target,
final Form? form) {
+protected void onSubmit(final AjaxRequestTarget target, final
Form? form) {
try {
submitAction(target, form);
svn commit: r1452290 - in /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages: EditUserModalPage.java UserModalPage.java
Author: ilgrosso Date: Mon Mar 4 13:16:19 2013 New Revision: 1452290 URL: http://svn.apache.org/r1452290 Log: [SYNCOPE-334] Passing the right page reference Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java?rev=1452290r1=1452289r2=1452290view=diff == --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java Mon Mar 4 13:16:19 2013 @@ -71,7 +71,7 @@ public class EditUserModalPage extends U form.addOrReplace(new ResourcesPanel(resources, userTO, statusPanel)); -form.addOrReplace(new MembershipsPanel(memberships, userTO, false, statusPanel, pageRef)); +form.addOrReplace(new MembershipsPanel(memberships, userTO, false, statusPanel, getPageReference())); } } Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1452290r1=1452289r2=1452290view=diff == --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Mon Mar 4 13:16:19 2013 @@ -140,7 +140,7 @@ public abstract class UserModalPage exte // // Roles panel // -form.add(new MembershipsPanel(memberships, userTO, mode == Mode.TEMPLATE, null, pageRef)); +form.add(new MembershipsPanel(memberships, userTO, mode == Mode.TEMPLATE, null, getPageReference())); // final AjaxButton submit = getOnSubmit();
svn commit: r1452385 - /syncope/branches/1_0_X/parent/src/site/xdoc/release-process.xml
Author: ilgrosso Date: Mon Mar 4 16:45:08 2013 New Revision: 1452385 URL: http://svn.apache.org/r1452385 Log: Adding release process prerequisite: a recent Subversion installed Modified: syncope/branches/1_0_X/parent/src/site/xdoc/release-process.xml Modified: syncope/branches/1_0_X/parent/src/site/xdoc/release-process.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/parent/src/site/xdoc/release-process.xml?rev=1452385r1=1452384r2=1452385view=diff == --- syncope/branches/1_0_X/parent/src/site/xdoc/release-process.xml (original) +++ syncope/branches/1_0_X/parent/src/site/xdoc/release-process.xml Mon Mar 4 16:45:08 2013 @@ -16,7 +16,6 @@ software distributed under the License i KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -- document xmlns=http://maven.apache.org/XDOC/2.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd; @@ -42,17 +41,22 @@ under the License. /section section name=Prerequisites + subsection name=Apache Subversion +pInstall Apache Subversion 1.7.0 or higher; + a href=http://subversion.apache.org/packages.html;binary packages/a for various platforms are available. +/p + /subsection + subsection name=GPG -Install/Configure -codeGPG/code - The artifacts that are deployed to the ASF central repository need to +pInstall/Configure GPG - The artifacts that are deployed to the ASF central repository need to be signed. To do this you will need to have a public and private keypair. There is a very good a href=http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/;guide/a that -will walk you though this. +will walk you though this./p /subsection subsection name=Apache Maven pInstall Apache Maven 3.0.3 or higher; we strongly encourage our committers to install - a href=http://maven.apache.org/download.html;Apache Maven 3.0.4/a. + a href=http://maven.apache.org/download.html;Apache Maven 3.0.5/a. /p pMaven allows you to encrypt your servers' passwords. We highly recommend that you follow this
svn commit: r1452386 - in /syncope/trunk: ./ src/site/xdoc/release-process.xml
Author: ilgrosso Date: Mon Mar 4 16:45:55 2013 New Revision: 1452386 URL: http://svn.apache.org/r1452386 Log: Merge from 1_0_X Modified: syncope/trunk/ (props changed) syncope/trunk/src/site/xdoc/release-process.xml Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1452349-1452385 Modified: syncope/trunk/src/site/xdoc/release-process.xml URL: http://svn.apache.org/viewvc/syncope/trunk/src/site/xdoc/release-process.xml?rev=1452386r1=1452385r2=1452386view=diff == --- syncope/trunk/src/site/xdoc/release-process.xml (original) +++ syncope/trunk/src/site/xdoc/release-process.xml Mon Mar 4 16:45:55 2013 @@ -16,7 +16,6 @@ software distributed under the License i KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -- document xmlns=http://maven.apache.org/XDOC/2.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd; @@ -42,17 +41,22 @@ under the License. /section section name=Prerequisites + subsection name=Apache Subversion +pInstall Apache Subversion 1.7.0 or higher; + a href=http://subversion.apache.org/packages.html;binary packages/a for various platforms are available. +/p + /subsection + subsection name=GPG -Install/Configure -codeGPG/code - The artifacts that are deployed to the ASF central repository need to +pInstall/Configure GPG - The artifacts that are deployed to the ASF central repository need to be signed. To do this you will need to have a public and private keypair. There is a very good a href=http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/;guide/a that -will walk you though this. +will walk you though this./p /subsection subsection name=Apache Maven pInstall Apache Maven 3.0.3 or higher; we strongly encourage our committers to install - a href=http://maven.apache.org/download.html;Apache Maven 3.0.4/a. + a href=http://maven.apache.org/download.html;Apache Maven 3.0.5/a. /p pMaven allows you to encrypt your servers' passwords. We highly recommend that you follow this
svn commit: r1452817 - in /syncope/trunk: ./ core/ core/src/main/java/org/apache/syncope/core/sync/impl/ core/src/main/java/org/apache/syncope/core/util/ core/src/main/java/org/apache/syncope/core/wor
Author: ilgrosso
Date: Tue Mar 5 14:42:42 2013
New Revision: 1452817
URL: http://svn.apache.org/r1452817
Log:
[SYNCOPE-330] #resolve
Added:
syncope/trunk/core/src/test/resources/noopworkflow/stripActivitiFromContent.xsl
(with props)
Modified:
syncope/trunk/core/pom.xml
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/pom.xml
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1452817r1=1452816r2=1452817view=diff
==
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Tue Mar 5 14:42:42 2013
@@ -234,6 +234,10 @@ under the License.
groupIdorg.apache.avalon.framework/groupId
artifactIdavalon-framework-impl/artifactId
/dependency
+dependency
+ groupIdxalan/groupId
+ artifactIdxalan/artifactId
+/dependency
dependency
groupIdorg.apache.geronimo.specs/groupId
@@ -877,6 +881,42 @@ under the License.
build
defaultGoalclean verify/defaultGoal
+plugins
+ !-- Strip Activiti-related entries from content.xml --
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdxml-maven-plugin/artifactId
+inheritedtrue/inherited
+executions
+ execution
+phaseprocess-test-resources/phase
+goals
+ goaltransform/goal
+/goals
+ /execution
+/executions
+configuration
+ forceCreationtrue/forceCreation
+ transformationSets
+transformationSet
+ dir${project.build.directory}/test-classes/dir
+ includes
+includecontent.xml/include
+ /includes
+
outputDir${project.build.directory}/test-classes//outputDir
+
stylesheet${basedir}/src/test/resources/noopworkflow/stripActivitiFromContent.xsl/stylesheet
+ outputProperties
+outputProperty
+ nameindent/name
+ valueyes/value
+/outputProperty
+ /outputProperties
+/transformationSet
+ /transformationSets
+/configuration
+ /plugin
+/plugins
+
testResources
testResource
directorysrc/test/resources/directory
@@ -889,6 +929,10 @@ under the License.
testResource
directorysrc/test/resources/noopworkflow/directory
filteringtrue/filtering
+includes
+ includeworkflowContext.xml/include
+ includeworkflow.properties/include
+/includes
/testResource
/testResources
/build
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java?rev=1452817r1=1452816r2=1452817view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
Tue Mar 5 14:42:42 2013
@@ -346,8 +346,9 @@ public class SyncopeSyncResultHandler im
final MapString, Attribute extValues = new HashMapString,
Attribute();
-for (AbstractMappingItem item :
-attrUtil.getMappingItems(syncTask.getResource(),
MappingPurpose.SYNCHRONIZATION)) {
+for (AbstractMappingItem item
+: attrUtil.getMappingItems(syncTask.getResource(),
MappingPurpose.SYNCHRONIZATION)) {
+
extValues.put(item.getIntAttrName(),
connObj.getAttributeByName(item.getExtAttrName()));
}
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java?rev=1452817r1=1452816r2=1452817view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java
Tue Mar 5 14:42:42 2013
@@ -95,8 +95,6 @@ public class ImportExport extends
svn commit: r1452852 - in /syncope/trunk/core/src: main/java/org/apache/syncope/core/connid/ main/java/org/apache/syncope/core/persistence/dao/ main/java/org/apache/syncope/core/persistence/validation
Author: ilgrosso
Date: Tue Mar 5 15:34:56 2013
New Revision: 1452852
URL: http://svn.apache.org/r1452852
Log:
[SYNCOPE-328] Widespread check of non-null deref of global policies
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/PolicyDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/PolicyValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/connid/PasswordGeneratorTest.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java?rev=1452852r1=1452851r2=1452852view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
Tue Mar 5 15:34:56 2013
@@ -44,6 +44,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
import org.apache.syncope.core.persistence.beans.ExternalResource;
+import org.apache.syncope.core.persistence.beans.PasswordPolicy;
import org.apache.syncope.core.persistence.beans.SyncTask;
import org.apache.syncope.core.persistence.beans.membership.Membership;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
@@ -133,7 +134,7 @@ public class ConnObjectUtil {
}
/**
- * Build an UserTO out of connector object attributes and schema mapping.
+ * Build a UserTO / RoleTO out of connector object attributes and schema
mapping.
*
* @param obj connector object
* @param syncTask synchronization task
@@ -147,37 +148,44 @@ public class ConnObjectUtil {
T subjectTO = getAttributableTOFromConnObject(obj, syncTask, attrUtil);
-// if password was not set above, generate
-if (AttributableType.USER == attrUtil.getType()
StringUtils.isBlank(((UserTO) subjectTO).getPassword())) {
+// (for users) if password was not set above, generate
+if (subjectTO instanceof UserTO StringUtils.isBlank(((UserTO)
subjectTO).getPassword())) {
+final UserTO userTO = (UserTO) subjectTO;
+
ListPasswordPolicySpec ppSpecs = new
ArrayListPasswordPolicySpec();
-ppSpecs.add((PasswordPolicySpec)
policyDAO.getGlobalPasswordPolicy().getSpecification());
-for (MembershipTO memb : ((UserTO) subjectTO).getMemberships()) {
+PasswordPolicy globalPP = policyDAO.getGlobalPasswordPolicy();
+if (globalPP != null globalPP.getSpecification() != null) {
+ppSpecs.add(globalPP.PasswordPolicySpecgetSpecification());
+}
+
+for (MembershipTO memb : userTO.getMemberships()) {
SyncopeRole role = roleDAO.find(memb.getRoleId());
if (role != null role.getPasswordPolicy() != null
role.getPasswordPolicy().getSpecification() !=
null) {
-ppSpecs.add((PasswordPolicySpec)
role.getPasswordPolicy().getSpecification());
+
ppSpecs.add(role.getPasswordPolicy().PasswordPolicySpecgetSpecification());
}
}
-for (String resName : subjectTO.getResources()) {
+
+for (String resName : userTO.getResources()) {
ExternalResource resource = resourceDAO.find(resName);
if (resource != null resource.getPasswordPolicy() != null
resource.getPasswordPolicy().getSpecification() !=
null) {
-ppSpecs.add((PasswordPolicySpec)
resource.getPasswordPolicy().getSpecification());
+
ppSpecs.add(resource.getPasswordPolicy().PasswordPolicySpecgetSpecification());
}
}
String password;
try {
-password = pwdGen.generatePasswordFromPwdSpec(ppSpecs);
+password = pwdGen.generate(ppSpecs);
} catch (InvalidPasswordPolicySpecException e) {
-LOG.error(Could not generate policy-compliant random password
for {}, subjectTO, e);
+LOG.error(Could not generate policy-compliant random password
for {}, userTO, e);
password
svn commit: r1452895 - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/services/proxy/ common/src/main/java/org/apache/syncope/common/services/ console/src/main/java/org/apache/synco
Author: ilgrosso
Date: Tue Mar 5 17:00:36 2013
New Revision: 1452895
URL: http://svn.apache.org/r1452895
Log:
[SYNCOPE-331] Refactored ResourceController#getConnectorObject for resolving -
rather than requiring - the account id value
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ResourceService.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/StatusUtils.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/StatusPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/AbstractAttributableRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/RoleRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
syncope/trunk/console/src/main/resources/authorizations.xml
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ResourceServiceImpl.java
syncope/trunk/core/src/main/resources/content.xml
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java?rev=1452895r1=1452894r2=1452895view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java
Tue Mar 5 17:00:36 2013
@@ -54,9 +54,9 @@ public class ResourceServiceProxy extend
+ resource/read/
+ URLEncoder.encode(resource.getName(),
SyncopeConstants.DEFAULT_ENCODING)
+ .json);
-return Response.created(location)
-.header(SyncopeConstants.REST_HEADER_ID,
resource.getName())
-.build();
+return Response.created(location).
+header(SyncopeConstants.REST_HEADER_ID,
resource.getName()).
+build();
} catch (UnsupportedEncodingException e) {
throw new InternalServerErrorException(e);
}
@@ -93,23 +93,21 @@ public class ResourceServiceProxy extend
@Override
public ListResourceTO list(final Long connInstanceId) {
-if (connInstanceId == null) {
-return list();
-}
-
-return Arrays.asList(getRestTemplate().getForObject(baseUrl +
resource/list.json?connInstanceId={connId},
+return connInstanceId == null
+? list()
+: Arrays.asList(getRestTemplate().getForObject(baseUrl +
resource/list.json?connInstanceId={connId},
ResourceTO[].class, connInstanceId));
}
@Override
-public ConnObjectTO getConnector(final String resourceName, final
AttributableType type, final String objectId) {
-return getRestTemplate().getForObject(baseUrl +
resource/{resourceName}/read/{type}/{objectId}.json,
-ConnObjectTO.class, resourceName, type.name(), objectId);
+public ConnObjectTO getConnectorObject(final String resourceName, final
AttributableType type, final Long id) {
+return getRestTemplate().getForObject(baseUrl +
resource/{resourceName}/read/{type}/{id}.json,
+ConnObjectTO.class, resourceName, type.name(), id);
}
@Override
public boolean check(final ResourceTO resourceTO) {
-return getRestTemplate().postForObject(baseUrl +
resource/check.json, resourceTO, Boolean.class)
-.booleanValue();
+return getRestTemplate().postForObject(baseUrl +
resource/check.json, resourceTO, Boolean.class).
+booleanValue();
}
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ResourceService.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ResourceService.java?rev=1452895r1=1452894r2=1452895view=diff
==
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ResourceService.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ResourceService.java
Tue
svn commit: r1453438 - in /syncope/trunk: core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java core/src/main/java/org/apache/syncope/core/workflow/user/activiti/S
Author: ilgrosso
Date: Wed Mar 6 17:23:30 2013
New Revision: 1453438
URL: http://svn.apache.org/r1453438
Log:
Reverting r1453421 as Activiti 5.12 makes build fail under JDK 6
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
syncope/trunk/pom.xml
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java?rev=1453438r1=1453437r2=1453438view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
Wed Mar 6 17:23:30 2013
@@ -25,14 +25,14 @@ import org.activiti.engine.identity.Grou
import org.activiti.engine.identity.GroupQuery;
import org.activiti.engine.impl.interceptor.Session;
import org.activiti.engine.impl.persistence.entity.GroupEntity;
-import org.activiti.engine.impl.persistence.entity.GroupEntityManager;
+import org.activiti.engine.impl.persistence.entity.GroupManager;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.dao.RoleDAO;
import org.apache.syncope.core.persistence.dao.UserDAO;
import org.springframework.beans.factory.annotation.Autowired;
-public class SyncopeGroupManager extends GroupEntityManager implements
SyncopeSession {
+public class SyncopeGroupManager extends GroupManager implements
SyncopeSession {
@Autowired
private UserDAO userDAO;
@@ -42,7 +42,7 @@ public class SyncopeGroupManager extends
@Override
public Class? extends Session getType() {
-return GroupEntityManager.class;
+return GroupManager.class;
}
@Override
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java?rev=1453438r1=1453437r2=1453438view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
Wed Mar 6 17:23:30 2013
@@ -28,14 +28,14 @@ import org.activiti.engine.impl.intercep
import org.activiti.engine.impl.persistence.entity.GroupEntity;
import org.activiti.engine.impl.persistence.entity.IdentityInfoEntity;
import org.activiti.engine.impl.persistence.entity.UserEntity;
-import org.activiti.engine.impl.persistence.entity.UserEntityManager;
+import org.activiti.engine.impl.persistence.entity.UserManager;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.dao.EntitlementDAO;
import org.apache.syncope.core.persistence.dao.RoleDAO;
import org.apache.syncope.core.persistence.dao.UserDAO;
import org.springframework.beans.factory.annotation.Autowired;
-public class SyncopeUserManager extends UserEntityManager implements
SyncopeSession {
+public class SyncopeUserManager extends UserManager implements SyncopeSession {
@Autowired
private UserDAO userDAO;
@@ -48,7 +48,7 @@ public class SyncopeUserManager extends
@Override
public Class? extends Session getType() {
-return UserEntityManager.class;
+return UserManager.class;
}
@Override
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1453438r1=1453437r2=1453438view=diff
==
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Mar 6 17:23:30 2013
@@ -288,7 +288,7 @@ under the License.
httpcomponents.version4.2.3/httpcomponents.version
-activiti.version5.12/activiti.version
+activiti.version5.11/activiti.version
cxf.version2.7.3/cxf.version
spring.version3.2.1.RELEASE/spring.version
svn commit: r1453752 - in /syncope/trunk: core/pom.xml core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java core/src/main/java/org/apache/syncope/core/workflow/us
Author: ilgrosso
Date: Thu Mar 7 10:01:47 2013
New Revision: 1453752
URL: http://svn.apache.org/r1453752
Log:
Upgrading Activiti to 5.12 (this time for true) - with JDK 6 additional Xerces
dependency is needed
Modified:
syncope/trunk/core/pom.xml
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
syncope/trunk/pom.xml
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1453752r1=1453751r2=1453752view=diff
==
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Thu Mar 7 10:01:47 2013
@@ -234,10 +234,15 @@ under the License.
groupIdorg.apache.avalon.framework/groupId
artifactIdavalon-framework-impl/artifactId
/dependency
+
dependency
groupIdxalan/groupId
artifactIdxalan/artifactId
/dependency
+dependency
+ groupIdxerces/groupId
+ artifactIdxercesImpl/artifactId
+/dependency
dependency
groupIdorg.apache.geronimo.specs/groupId
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java?rev=1453752r1=1453751r2=1453752view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
Thu Mar 7 10:01:47 2013
@@ -25,14 +25,14 @@ import org.activiti.engine.identity.Grou
import org.activiti.engine.identity.GroupQuery;
import org.activiti.engine.impl.interceptor.Session;
import org.activiti.engine.impl.persistence.entity.GroupEntity;
-import org.activiti.engine.impl.persistence.entity.GroupManager;
+import org.activiti.engine.impl.persistence.entity.GroupEntityManager;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.dao.RoleDAO;
import org.apache.syncope.core.persistence.dao.UserDAO;
import org.springframework.beans.factory.annotation.Autowired;
-public class SyncopeGroupManager extends GroupManager implements
SyncopeSession {
+public class SyncopeGroupManager extends GroupEntityManager implements
SyncopeSession {
@Autowired
private UserDAO userDAO;
@@ -42,7 +42,7 @@ public class SyncopeGroupManager extends
@Override
public Class? extends Session getType() {
-return GroupManager.class;
+return GroupEntityManager.class;
}
@Override
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java?rev=1453752r1=1453751r2=1453752view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
Thu Mar 7 10:01:47 2013
@@ -28,14 +28,14 @@ import org.activiti.engine.impl.intercep
import org.activiti.engine.impl.persistence.entity.GroupEntity;
import org.activiti.engine.impl.persistence.entity.IdentityInfoEntity;
import org.activiti.engine.impl.persistence.entity.UserEntity;
-import org.activiti.engine.impl.persistence.entity.UserManager;
+import org.activiti.engine.impl.persistence.entity.UserEntityManager;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.dao.EntitlementDAO;
import org.apache.syncope.core.persistence.dao.RoleDAO;
import org.apache.syncope.core.persistence.dao.UserDAO;
import org.springframework.beans.factory.annotation.Autowired;
-public class SyncopeUserManager extends UserManager implements SyncopeSession {
+public class SyncopeUserManager extends UserEntityManager implements
SyncopeSession {
@Autowired
private UserDAO userDAO;
@@ -48,7 +48,7 @@ public class SyncopeUserManager extends
@Override
public Class? extends Session getType() {
-return UserManager.class;
+return UserEntityManager.class;
}
@Override
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1453752r1=1453751r2=1453752view=diff
svn commit: r1453905 - in /syncope/trunk/core/src/main/java/org/apache/syncope/core: rest/controller/PolicyController.java services/PolicyServiceImpl.java
Author: ilgrosso
Date: Thu Mar 7 15:00:24 2013
New Revision: 1453905
URL: http://svn.apache.org/r1453905
Log:
Spring MVC had troubles in dealing with empty collections: 'Cannot generate
variable name for non-typed Collection return type and an empty Collection
value'
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java?rev=1453905r1=1453904r2=1453905view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.java
Thu Mar 7 15:00:24 2013
@@ -142,13 +142,13 @@ public class PolicyController extends Ab
@PreAuthorize(hasRole('POLICY_LIST'))
@RequestMapping(method = RequestMethod.GET, value = /{kind}/list)
-public T extends PolicyTO ListT listByType(@PathVariable(kind) final
String kind) {
+public ListPolicyTO list(@PathVariable(kind) final String kind) {
LOG.debug(Listing policies);
List? extends Policy policies =
policyDAO.find(PolicyType.valueOf(kind.toUpperCase(Locale.ENGLISH)));
-final ListT policyTOs = new ArrayListT();
+final ListPolicyTO policyTOs = new ArrayListPolicyTO();
for (Policy policy : policies) {
-policyTOs.add(binder.TgetPolicyTO(policy));
+policyTOs.add(binder.getPolicyTO(policy));
}
auditManager.audit(Category.policy, PolicySubCategory.list,
Result.success,
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java?rev=1453905r1=1453904r2=1453905view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/PolicyServiceImpl.java
Thu Mar 7 15:00:24 2013
@@ -58,8 +58,9 @@ public class PolicyServiceImpl implement
}
@Override
+@SuppressWarnings(unchecked)
public T extends PolicyTO ListT list(final PolicyType type) {
-return policyController.listByType(type.toString());
+return (ListT) policyController.list(type.toString());
}
@Override
svn commit: r1454388 - in /syncope/trunk/core: pom.xml src/main/java/org/apache/syncope/core/rest/controller/UserController.java src/test/resources/context.xml src/test/resources/mysql/persistence.pro
Author: ilgrosso
Date: Fri Mar 8 13:51:32 2013
New Revision: 1454388
URL: http://svn.apache.org/r1454388
Log:
Verified with MySQL: small fixes
Modified:
syncope/trunk/core/pom.xml
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
syncope/trunk/core/src/test/resources/context.xml
syncope/trunk/core/src/test/resources/mysql/persistence.properties
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1454388r1=1454387r2=1454388view=diff
==
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Fri Mar 8 13:51:32 2013
@@ -1044,7 +1044,7 @@ under the License.
dependency
groupIdmysql/groupId
artifactIdmysql-connector-java/artifactId
- version5.1.21/version
+ version5.1.23/version
scopetest/scope
/dependency
/dependencies
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1454388r1=1454387r2=1454388view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
Fri Mar 8 13:51:32 2013
@@ -557,7 +557,7 @@ public class UserController {
@PreAuthorize(hasRole('WORKFLOW_FORM_LIST'))
@RequestMapping(method = RequestMethod.GET, value = /workflow/form/list)
-@Transactional(readOnly = true, rollbackFor = {Throwable.class})
+@Transactional(rollbackFor = {Throwable.class})
public ListWorkflowFormTO getForms() {
ListWorkflowFormTO forms = uwfAdapter.getForms();
Modified: syncope/trunk/core/src/test/resources/context.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/context.xml?rev=1454388r1=1454387r2=1454388view=diff
==
--- syncope/trunk/core/src/test/resources/context.xml (original)
+++ syncope/trunk/core/src/test/resources/context.xml Fri Mar 8 13:51:32 2013
@@ -20,8 +20,4 @@ under the License.
Context
!-- Disable session persistence across Tomcat restarts --
Manager pathname= /
-
- Loader className=org.apache.catalina.loader.VirtualWebappLoader
-
virtualClasspath=${project.build.directory}/classes:${project.build.directory}/${project.build.finalName}/WEB-INF/lib/*.jar
- searchVirtualFirst=true/
/Context
Modified: syncope/trunk/core/src/test/resources/mysql/persistence.properties
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/mysql/persistence.properties?rev=1454388r1=1454387r2=1454388view=diff
==
--- syncope/trunk/core/src/test/resources/mysql/persistence.properties
(original)
+++ syncope/trunk/core/src/test/resources/mysql/persistence.properties Fri Mar
8 13:51:32 2013
@@ -20,5 +20,5 @@ jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.MySQLDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-quartz.sql=tables_mysql_innodb.sql
-logback.sql=mysql.sql
\ No newline at end of file
+quartz.sql=tables_mysql.sql
+logback.sql=mysql.sql
svn commit: r1455498 - in /syncope/branches/1_0_X/core/src/main/resources/META-INF: orm.xml.oracle orm.xml.sqlserver
Author: ilgrosso Date: Tue Mar 12 11:42:35 2013 New Revision: 1455498 URL: http://svn.apache.org/r1455498 Log: Outdate start value for Oracle and SQL Server Modified: syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.oracle syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.sqlserver Modified: syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.oracle URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.oracle?rev=1455498r1=1455497r2=1455498view=diff == --- syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.oracle (original) +++ syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.oracle Tue Mar 12 11:42:35 2013 @@ -175,7 +175,7 @@ under the License. attributes id name=id generated-value generator=SEQ_Task strategy=TABLE/ -table-generator name=SEQ_Task pk-column-value=SEQ_Task initial-value=10/ +table-generator name=SEQ_Task pk-column-value=SEQ_Task initial-value=100/ /id /attributes /entity Modified: syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.sqlserver URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.sqlserver?rev=1455498r1=1455497r2=1455498view=diff == --- syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.sqlserver (original) +++ syncope/branches/1_0_X/core/src/main/resources/META-INF/orm.xml.sqlserver Tue Mar 12 11:42:35 2013 @@ -199,7 +199,7 @@ under the License. attributes id name=id generated-value generator=SEQ_Task strategy=TABLE/ -table-generator name=SEQ_Task pk-column-value=SEQ_Task initial-value=10/ +table-generator name=SEQ_Task pk-column-value=SEQ_Task initial-value=100/ /id /attributes /entity
svn commit: r1455927 - /syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql
Author: ilgrosso Date: Wed Mar 13 13:24:32 2013 New Revision: 1455927 URL: http://svn.apache.org/r1455927 Log: H2, MySQL, Oracle and SQL Server are on; still PostgreSQL to go Modified: syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql Modified: syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql?rev=1455927r1=1455926r2=1455927view=diff == --- syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql (original) +++ syncope/trunk/core/src/main/resources/quartz/tables_sqlServer.sql Wed Mar 13 13:24:32 2013 @@ -15,101 +15,11 @@ -- specific language governing permissions and limitations -- under the License. ---# thanks to George Papastamatopoulos for submitting this ... and Marko Lahma for ---# updating it. ---# ---# In your Quartz properties file, you'll need to set ---# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.MSSQLDelegate ---# ---# you shouse enter your DB instance's name on the next line in place of enter_db_name_here ---# ---# ---# From a helpful (but anonymous) Quartz user: ---# ---# Regarding this error message: ---# ---# [Microsoft][SQLServer 2000 Driver for JDBC]Can't start a cloned connection while in manual transaction mode. ---# ---# ---# I added SelectMethod=cursor; to my Connection URL in the config file. ---# It Seems to work, hopefully no side effects. ---# ---#example: ---# jdbc:microsoft:sqlserver://dbmachine:1433;SelectMethod=cursor; ---# ---# Another user has pointed out that you will probably need to use the ---# JTDS driver ---# - -USE [enter_db_name_here] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1) -ALTER TABLE [dbo].[QRTZ_TRIGGERS] DROP CONSTRAINT FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1) -ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] DROP CONSTRAINT FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1) -ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1) -ALTER TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPROP_TRIGGERS_QRTZ_TRIGGERS -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_CALENDARS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_CALENDARS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_CRON_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_CRON_TRIGGERS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_BLOB_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_BLOB_TRIGGERS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_FIRED_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_FIRED_TRIGGERS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_PAUSED_TRIGGER_GRPS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SCHEDULER_STATE]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_SCHEDULER_STATE] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_LOCKS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_LOCKS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_JOB_DETAILS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPLE_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPROP_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_SIMPROP_TRIGGERS] -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1) -DROP TABLE [dbo].[QRTZ_TRIGGERS] -GO - CREATE TABLE [dbo].[QRTZ_CALENDARS] ( [SCHED_NAME] [VARCHAR] (120) NOT NULL , [CALENDAR_NAME] [VARCHAR] (200) NOT NULL , [CALENDAR
svn commit: r1456410 [1/2] - in /syncope/trunk/console/src/main/webapp: css/jquery-ui.css scripts/jquery-ui.js
Author: ilgrosso
Date: Thu Mar 14 12:59:33 2013
New Revision: 1456410
URL: http://svn.apache.org/r1456410
Log:
Upgrade JQUery-UI to 1.10.1, both JS and CSS thus solving display issues in the
Schema tab
Modified:
syncope/trunk/console/src/main/webapp/css/jquery-ui.css
syncope/trunk/console/src/main/webapp/scripts/jquery-ui.js
Modified: syncope/trunk/console/src/main/webapp/css/jquery-ui.css
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/jquery-ui.css?rev=1456410r1=1456409r2=1456410view=diff
==
--- syncope/trunk/console/src/main/webapp/css/jquery-ui.css (original)
+++ syncope/trunk/console/src/main/webapp/css/jquery-ui.css Thu Mar 14 12:59:33
2013
@@ -1,474 +1,5 @@
-/*! jQuery UI - v1.9.2 - 2012-11-23
+/*! jQuery UI - v1.10.1 - 2013-02-15
* http://jqueryui.com
* Includes: jquery.ui.core.css, jquery.ui.accordion.css,
jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css,
jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css,
jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css,
jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css,
jquery.ui.theme.css
-* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
---*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px;
margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height:
1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ; display:
table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position:
absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
---*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
---*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -9px; overflow: hidden;
background-repeat: no-repeat; }
-
-
-/* Misc visuals
---*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height:
100%; }
-
-.ui-accordion .ui-accordion-header { display: block; cursor: pointer;
position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
-.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
-.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position:
absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0;
overflow: auto; zoom: 1; }
-
-.ui-autocomplete {
- position: absolute;
- top: 0;
- left: 0;
- cursor: default;
-}
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to
100% in IE6 */
-
-.ui-button { display: inline-block; position: relative; padding: 0;
margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow:
visible; } /* the overflow property removes extra width in IE */
-.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover,
.ui-button:active { text-decoration: none; }
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width
needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a
little more width */
-.ui-button-icons-only { width: 3.4em; }
-button.ui-button-icons-only { width: 3.7em; }
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4; }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text {
padding: .4em; text-indent: -999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons
.ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons
.ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right:
2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon,
.ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon,
.ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top:
-8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon
svn commit: r1456598 - /syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Author: ilgrosso
Date: Thu Mar 14 18:28:10 2013
New Revision: 1456598
URL: http://svn.apache.org/r1456598
Log:
Removing usage of deprecated method
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1456598r1=1456597r2=1456598view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Thu Mar 14 18:28:10 2013
@@ -641,7 +641,8 @@ public class UserTestITCase extends Abst
Exception exception = null;
try {
-jdbcTemplate.queryForInt(SELECT id FROM test WHERE id=?,
userTO.getUsername());
+jdbcTemplate.queryForObject(SELECT id FROM test WHERE id=?,
+new String[]{userTO.getUsername()}, Integer.class);
} catch (EmptyResultDataAccessException e) {
exception = e;
}
svn commit: r1456601 - in /syncope/trunk: core/pom.xml core/src/test/resources/jboss/META-INF/ core/src/test/resources/jboss/META-INF/MANIFEST.MF pom.xml
Author: ilgrosso
Date: Thu Mar 14 18:29:59 2013
New Revision: 1456601
URL: http://svn.apache.org/r1456601
Log:
Glassfish and JBoss verified - note that for JBoss the OSGi stuff needs to be
disabled until SYNCOPE-204
Added:
syncope/trunk/core/src/test/resources/jboss/META-INF/
syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF
Modified:
syncope/trunk/core/pom.xml
syncope/trunk/pom.xml
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1456601r1=1456600r2=1456601view=diff
==
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Thu Mar 14 18:29:59 2013
@@ -1069,7 +1069,7 @@ under the License.
profile
idglassfish-it/id
-
+
dependencies
dependency
groupIdcom.h2database/groupId
@@ -1113,7 +1113,7 @@ under the License.
profile
idjboss-it/id
-
+
dependencies
dependency
groupIdcom.h2database/groupId
@@ -1134,7 +1134,46 @@ under the License.
skipTeststrue/skipTests
/configuration
/plugin
-
+
+ !-- Disable MANIFEST.MF OSGi handling --
+ plugin
+groupIdorg.apache.felix/groupId
+artifactIdmaven-bundle-plugin/artifactId
+executions
+ execution
+idbundle-manifest/id
+phasenone/phase
+ /execution
+/executions
+ /plugin
+
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-antrun-plugin/artifactId
+inheritedtrue/inherited
+executions
+ execution
+idsetupBuildToolsForJBoss/id
+phasepre-integration-test/phase
+configuration
+ target
+unzip
src=${settings.localRepository}/org/apache/syncope/syncope-build-tools/${project.version}/syncope-build-tools-${project.version}.war
+
dest=${project.build.directory}/syncope-build-tools-test/
+copy
file=${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
todir=${project.build.directory}/syncope-build-tools-test/META-INF
+ overwrite=true/
+copy
file=${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar
+
todir=${project.build.directory}/syncope-build-tools-test/WEB-INF/lib
+ overwrite=true/
+ /target
+/configuration
+goals
+ goalrun/goal
+/goals
+ /execution
+/executions
+ /plugin
+
plugin
groupIdorg.codehaus.cargo/groupId
artifactIdcargo-maven2-plugin/artifactId
@@ -1155,7 +1194,31 @@ under the License.
cargo.jvmargs-Xms1024m -Xmx2048m -XX:PermSize=512m
-XX:MaxPermSize=1024m -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled
-XX:+CMSClassUnloadingEnabled/cargo.jvmargs
/properties
/configuration
-/configuration
+ deployables
+deployable
+ location${cargo.run.dir}/location
+
pingURLhttp://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml/pingURL
+ pingTimeout120/pingTimeout
+ properties
+contextsyncope/context
+ /properties
+/deployable
+deployable
+ groupIdorg.connid.bundles.soap/groupId
+ artifactIdwssample/artifactId
+ typewar/type
+ properties
+contextwssample/context
+ /properties
+/deployable
+deployable
+
location${project.build.directory}/syncope-build-tools-test/location
+ properties
+contextsyncope-build-tools/context
+ /properties
+/deployable
+ /deployables
+/configuration
/plugin
/plugins
@@ -1171,9 +1234,6 @@ under the License.
resource
directorysrc/test/resources/jboss/directory
filteringtrue/filtering
-includes
- includepersistenceContextEMFactory.xml/include
-/includes
/resource
resource
directorysrc/test/resources/directory
Added: syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF?rev=1456601view=auto
svn commit: r1456898 - /syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Author: ilgrosso
Date: Fri Mar 15 11:18:46 2013
New Revision: 1456898
URL: http://svn.apache.org/r1456898
Log:
Suppressing warnings
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1456898r1=1456897r2=1456898view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Fri Mar 15 11:18:46 2013
@@ -54,7 +54,6 @@ import org.apache.syncope.common.to.User
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.common.types.PropagationTaskExecStatus;
-import org.apache.syncope.common.types.SyncPolicySpec;
import org.apache.syncope.common.types.TaskType;
import org.apache.syncope.common.types.TraceLevel;
import org.apache.syncope.core.sync.TestSyncActions;
@@ -786,7 +785,7 @@ public class TaskTestITCase extends Abst
// Add a custom correlation rule
// -
SyncPolicyTO policyTO = policyService.read(PolicyType.SYNC, 9L);
-((SyncPolicySpec)
policyTO.getSpecification()).setUserJavaRule(TestSyncRule.class.getName());
+
policyTO.getSpecification().setUserJavaRule(TestSyncRule.class.getName());
policyService.update(PolicyType.SYNC, policyTO.getId(), policyTO);
// -
@@ -887,6 +886,7 @@ public class TaskTestITCase extends Abst
@Test
public void bulkAction() {
+@SuppressWarnings(unchecked)
final ListPropagationTaskTO before = (ListPropagationTaskTO)
taskService.list(TaskType.PROPAGATION);
// create user with testdb resource
@@ -894,6 +894,7 @@ public class TaskTestITCase extends Abst
userTO.addResource(resource-testdb);
createUser(userTO);
+@SuppressWarnings(unchecked)
final ListPropagationTaskTO after =
new ArrayListPropagationTaskTO((ListPropagationTaskTO)
taskService.list(TaskType.PROPAGATION));
@@ -914,7 +915,7 @@ public class TaskTestITCase extends Abst
}
/**
- * remove initial and synchronized users to make test re-runnable
+ * Remove initial and synchronized users to make test re-runnable.
*/
public void removeTestUsers() {
for (int i = 0; i 10; i++) {
svn commit: r1456903 - /syncope/trunk/core/pom.xml
Author: ilgrosso
Date: Fri Mar 15 11:33:00 2013
New Revision: 1456903
URL: http://svn.apache.org/r1456903
Log:
Weblogic verified
Modified:
syncope/trunk/core/pom.xml
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1456903r1=1456902r2=1456903view=diff
==
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Fri Mar 15 11:33:00 2013
@@ -1275,26 +1275,24 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-dependency-plugin/artifactId
+artifactIdmaven-antrun-plugin/artifactId
inheritedtrue/inherited
executions
execution
-idexplode-build-tools-for-weblogic/id
-phasetest/phase
-goals
- goalunpack/goal
-/goals
+idsetupBuildToolsForWeblogic/id
+phasepre-integration-test/phase
configuration
- artifactItems
-artifactItem
- groupIdorg.apache.syncope/groupId
- artifactIdsyncope-build-tools/artifactId
- version${project.version}/version
-
outputDirectory${project.build.directory}/syncope-build-tools-test/outputDirectory
- typewar/type
-/artifactItem
- /artifactItems
+ target
+unzip
src=${settings.localRepository}/org/apache/syncope/syncope-build-tools/${project.version}/syncope-build-tools-${project.version}.war
+
dest=${project.build.directory}/syncope-build-tools-test/
+copy
file=${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar
+
todir=${project.build.directory}/syncope-build-tools-test/WEB-INF/lib
+ overwrite=true/
+ /target
/configuration
+goals
+ goalrun/goal
+/goals
/execution
/executions
/plugin
@@ -1305,25 +1303,12 @@ under the License.
inheritedfalse/inherited
configuration
container
-containerIdweblogic103x/containerId
+containerIdweblogic12x/containerId
typeinstalled/type
home${weblogic.home}/wlserver/home
-dependencies
- dependency
-
location${weblogic.home}/patch_wls1211/profiles/default/sys_manifest_classpath/weblogic_patch.jar/location
- /dependency
- dependency
-
location${weblogic.home}/patch_ocp371/profiles/default/sys_manifest_classpath/weblogic_patch.jar/location
- /dependency
-/dependencies
-
log${cargo.log}/log
-output${cargo.output}/output
-
-systemProperties
-
java.endorsed.dirs${weblogic.home}/wlserver/endorsed/java.endorsed.dirs
-/systemProperties
+output${cargo.output}/output
/container
configuration
properties
svn commit: r1457265 - /syncope/trunk/core/pom.xml
Author: ilgrosso
Date: Sat Mar 16 15:37:29 2013
New Revision: 1457265
URL: http://svn.apache.org/r1457265
Log:
Enabling the skipTests profile to download Tomcat if not already done
Modified:
syncope/trunk/core/pom.xml
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1457265r1=1457264r2=1457265view=diff
==
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Sat Mar 16 15:37:29 2013
@@ -660,9 +660,17 @@ under the License.
profile
idskipTests/id
+
properties
javaagent/
/properties
+
+ dependencies
+dependency
+ groupIdcom.h2database/groupId
+ artifactIdh2/artifactId
+/dependency
+ /dependencies
build
plugins
@@ -687,8 +695,22 @@ under the License.
groupIdorg.codehaus.cargo/groupId
artifactIdcargo-maven2-plugin/artifactId
inheritedtrue/inherited
+configuration
+ deployables
+deployable
+
location${project.build.directory}/${project.build.finalName}.war/location
+/deployable
+ /deployables
+/configuration
executions
execution
+idinstall-container/id
+phasepackage/phase
+goals
+ goalinstall/goal
+/goals
+ /execution
+ execution
idstart-container/id
phasenone/phase
/execution
svn commit: r1458215 - /syncope/trunk/pom.xml
Author: ilgrosso Date: Tue Mar 19 10:42:15 2013 New Revision: 1458215 URL: http://svn.apache.org/r1458215 Log: Upgrading everything about ConnId (but CSVDir not yet available) Modified: syncope/trunk/pom.xml Modified: syncope/trunk/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1458215r1=1458214r2=1458215view=diff == --- syncope/trunk/pom.xml (original) +++ syncope/trunk/pom.xml Tue Mar 19 10:42:15 2013 @@ -277,11 +277,11 @@ under the License. jsp-api.version2.2/jsp-api.version jstl.version1.2/jstl.version -connid.version1.3.3-SNAPSHOT/connid.version -connid.soap.version1.2.6-SNAPSHOT/connid.soap.version -connid.db.table.version2.1.5-SNAPSHOT/connid.db.table.version +connid.version1.3.3/connid.version +connid.soap.version1.2.6/connid.soap.version +connid.db.table.version2.1.5/connid.db.table.version connid.csvdir.version0.7-SNAPSHOT/connid.csvdir.version -connid.ldap.version1.3.5-SNAPSHOT/connid.ldap.version +connid.ldap.version1.3.5/connid.ldap.version commons-jexl.version2.1.1/commons-jexl.version commons-lang.version2.6/commons-lang.version
svn commit: r1459336 - in /syncope/trunk/console/src: main/java/org/apache/syncope/console/pages/SchemaModalPage.java test/java/org/apache/syncope/console/SchemaTestITCase.java
Author: ilgrosso
Date: Thu Mar 21 14:36:29 2013
New Revision: 1459336
URL: http://svn.apache.org/r1459336
Log:
Fixing errors in Selenium tests
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1459336r1=1459335r2=1459336view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
Thu Mar 21 14:36:29 2013
@@ -131,13 +131,13 @@ public class SchemaModalPage extends Abs
enumerationKeys.setModelObject((Serializable)
getEnumValuesAsList(schema.getEnumerationKeys()));
-if (schema == null ||
AttributeSchemaType.Enum.equals(schema.getType())) {
-enumerationValues.setEnabled(Boolean.FALSE);
-enumerationKeys.setEnabled(Boolean.FALSE);
-} else {
+if (AttributeSchemaType.Enum == schema.getType()) {
enumerationValues.setEnabled(Boolean.TRUE);
enumerationKeys.setEnabled(Boolean.TRUE);
enumerationValuesPanel.addRequiredLabel();
+} else {
+enumerationValues.setEnabled(Boolean.FALSE);
+enumerationKeys.setEnabled(Boolean.FALSE);
}
type.getField().add(new AjaxFormComponentUpdatingBehavior(onchange) {
Modified:
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java?rev=1459336r1=1459335r2=1459336view=diff
==
---
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
(original)
+++
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
Thu Mar 21 14:36:29 2013
@@ -28,8 +28,8 @@ public class SchemaTestITCase extends Ab
selenium.waitForCondition(selenium.isElementPresent(\//div[@id='tabs']\);,
3);
-selenium.click(//div[@id='tabs']/ul/li[2]/a/span);
-selenium.click(//div[@id='role']/div/a);
+selenium.click(//div[@id='tabs']/ul/li[3]/a);
+selenium.click(//div[@id='rschema']/div/div/div/a);
selenium.waitForCondition(selenium.isElementPresent( +
\//*[@id='_wicket_window_0']\);, 3);
@@ -48,10 +48,7 @@ public class SchemaTestITCase extends Ab
selenium.waitForCondition(selenium.isElementPresent(\//div[@id='tabs']\);,
3);
-selenium.click(//div[@id='tabs']/ul/li[3]/a/span);
-selenium.click(//div[@id='membership']/ul/li[3]/a/span);
-
-selenium.click(//table/tbody/tr/td[3]/div/span[11]/a);
+
selenium.click(//div[3]/div/div/div/div/div/span/table/tbody/tr/td[7]/div/span[11]/a);
assertTrue(selenium.getConfirmation().matches(^Do you really want to
delete the selected item[\\s\\S]$));
}
svn commit: r1459736 - in /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console: pages/DisplayAttributesModalPage.java pages/panels/ResultSetPanel.java rest/SchemaRestClient.java
Author: ilgrosso
Date: Fri Mar 22 11:55:27 2013
New Revision: 1459736
URL: http://svn.apache.org/r1459736
Log:
[SYNCOPE-341] Refreshing schemas, dschemas and vschemas at Users page load
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/SchemaRestClient.java
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java?rev=1459736r1=1459735r2=1459736view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
Fri Mar 22 11:55:27 2013
@@ -29,8 +29,6 @@ import org.apache.commons.lang.ArrayUtil
import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
-import org.apache.syncope.console.rest.SchemaRestClient;
-import org.apache.syncope.types.AttributableType;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -66,105 +64,79 @@ public class DisplayAttributesModalPage
attributes, derivedAttributes, virtualAttributes, memberships,
resources,
serialVersionUID, password, propagationTOs};
-public static final ListString DEFAULT_SELECTION = Arrays.asList(new
String[]{id, username, status});
+public static final ListString DEFAULT_SELECTION = Arrays.asList(new
String[] {id, username, status});
@SpringBean
private PreferenceManager prefMan;
-/**
- * Schema rest client.
- */
-@SpringBean
-private SchemaRestClient schemaRestClient;
+private final ListString selectedDetails;
-final private IModelListString dnames = new
LoadableDetachableModelListString() {
+private final ListString selectedSchemas;
-private static final long serialVersionUID = 5275935387613157437L;
+private final ListString selectedVirSchemas;
-@Override
-protected ListString load() {
+private final ListString selectedDerSchemas;
-final ListString details = new ArrayListString();
+public DisplayAttributesModalPage(final PageReference pageRef, final
ModalWindow window,
+final ListString schemaNames, final ListString dSchemaNames,
final ListString vSchemaNames) {
-Class? clazz = UserTO.class;
+super();
-// loop on class and all superclasses searching for field
-while (clazz != null clazz != Object.class) {
-for (Field field : clazz.getDeclaredFields()) {
-if (!ArrayUtils.contains(ATTRIBUTES_TO_HIDE,
field.getName())) {
-details.add(field.getName());
-}
-}
-clazz = clazz.getSuperclass();
-}
+final IModelListString fnames = new
LoadableDetachableModelListString() {
-Collections.reverse(details);
-return details;
-}
-};
+private static final long serialVersionUID = 5275935387613157437L;
-final private IModelListString names = new
LoadableDetachableModelListString() {
+@Override
+protected ListString load() {
-private static final long serialVersionUID = 5275935387613157437L;
+final ListString details = new ArrayListString();
-@Override
-protected ListString load() {
+Class? clazz = UserTO.class;
-ListString schemas =
schemaRestClient.getSchemaNames(AttributableType.USER);
+// loop on class and all superclasses searching for field
+while (clazz != null clazz != Object.class) {
+for (Field field : clazz.getDeclaredFields()) {
+if (!ArrayUtils.contains(ATTRIBUTES_TO_HIDE,
field.getName())) {
+details.add(field.getName());
+}
+}
+clazz = clazz.getSuperclass();
+}
-if (schemas == null) {
-schemas = new ArrayListString();
+Collections.reverse(details);
+return details;
}
+};
-return schemas;
-}
-};
-
-final private IModelListString dsnames = new
svn commit: r1459775 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/java/org/apache/syncope/console/pages/panels/ console/src/main/java/org/apache/syn
Author: ilgrosso
Date: Fri Mar 22 13:55:04 2013
New Revision: 1459775
URL: http://svn.apache.org/r1459775
Log:
[SYNCOPE-341] Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SelectOnlyUserSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/SchemaRestClient.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.html
Propchange: syncope/trunk/
--
Merged /syncope/branches/1_0_X:r1459693-1459736
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java?rev=1459775r1=1459774r2=1459775view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
Fri Mar 22 13:55:04 2013
@@ -26,10 +26,8 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang.ArrayUtils;
import org.apache.syncope.common.to.UserTO;
-import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
-import org.apache.syncope.console.rest.SchemaRestClient;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -52,6 +50,7 @@ import org.apache.wicket.spring.injectio
/**
* Modal window with Display attributes form.
*/
+@SuppressWarnings({unchecked, rawtypes})
public class DisplayAttributesModalPage extends BaseModalPage {
private static final long serialVersionUID = -4274117450918385110L;
@@ -70,100 +69,75 @@ public class DisplayAttributesModalPage
@SpringBean
private PreferenceManager prefMan;
-/**
- * Schema rest client.
- */
-@SpringBean
-private SchemaRestClient schemaRestClient;
+private final ListString selectedDetails;
-final private IModelListString dnames = new
LoadableDetachableModelListString() {
+private final ListString selectedSchemas;
-private static final long serialVersionUID = 5275935387613157437L;
+private final ListString selectedDerSchemas;
-@Override
-protected ListString load() {
+private final ListString selectedVirSchemas;
-final ListString details = new ArrayListString();
+public DisplayAttributesModalPage(final PageReference pageRef, final
ModalWindow window,
+final ListString schemaNames, final ListString dSchemaNames,
final ListString vSchemaNames) {
-Class? clazz = UserTO.class;
+super();
-// loop on class and all superclasses searching for field
-while (clazz != null clazz != Object.class) {
-for (Field field : clazz.getDeclaredFields()) {
-if (!ArrayUtils.contains(ATTRIBUTES_TO_HIDE,
field.getName())) {
-details.add(field.getName());
-}
-}
-clazz = clazz.getSuperclass();
-}
+final IModelListString fnames = new
LoadableDetachableModelListString() {
-Collections.reverse(details);
-return details;
-}
-};
+private static final long serialVersionUID = 5275935387613157437L;
-final private IModelListString names = new
LoadableDetachableModelListString() {
+@Override
+protected ListString load() {
-private static final long serialVersionUID = 5275935387613157437L;
+final ListString details = new ArrayListString();
-@Override
-protected ListString load() {
+Class? clazz = UserTO.class;
-ListString schemas =
schemaRestClient.getSchemaNames(AttributableType.USER);
+// loop on class and all superclasses
svn commit: r1461002 - in /syncope/branches/1_0_X: CHANGES parent/src/site/xdoc/downloads.xml
Author: ilgrosso Date: Tue Mar 26 07:46:07 2013 New Revision: 1461002 URL: http://svn.apache.org/r1461002 Log: updating files for release Modified: syncope/branches/1_0_X/CHANGES syncope/branches/1_0_X/parent/src/site/xdoc/downloads.xml Modified: syncope/branches/1_0_X/CHANGES URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/CHANGES?rev=1461002r1=1461001r2=1461002view=diff == --- syncope/branches/1_0_X/CHANGES (original) +++ syncope/branches/1_0_X/CHANGES Tue Mar 26 07:46:07 2013 @@ -2,6 +2,18 @@ Apache Syncope - CHANGES Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0 +Release Notes - Syncope - Version 1.0.7 + +** Bug +* [SYNCOPE-332] - User List sorting via Derived attributes column doesn't work +* [SYNCOPE-336] - Use a auto-complete textfield to chose for external attribute to be mapped during schema mapping creation +* [SYNCOPE-339] - enum schema multivalue doesn't work +* [SYNCOPE-341] - When deleting user schema, user list attributes head don't get updated +* [SYNCOPE-342] - Console might fail to connect when core is deployed on virtual host + +** Task +* [SYNCOPE-326] - Check console style (CSS) on Internet Explorer + Release Notes - Syncope - Version 1.0.6 ** Bug @@ -16,8 +28,6 @@ Release Notes - Syncope - Version 1.0.6 * [SYNCOPE-316] - Exception when creating connector instances with no bundles available * [SYNCOPE-325] - Stacktrace when accessing the Configuration page on JBoss - - ** Improvement * [SYNCOPE-154] - Virtual attribute cache * [SYNCOPE-299] - Add row to display selector in resources @@ -33,8 +43,6 @@ Release Notes - Syncope - Version 1.0.5 * [SYNCOPE-273] - Role deletion inhibits notification update * [SYNCOPE-274] - Sync: during update with user template existing memberships break update - - ** Improvement * [SYNCOPE-14] - Solve some warnings and verify if generated projects still work * [SYNCOPE-67] - Display all Execute Tasks (Propagation, Notification and Scheduled) and related Execution history items sortered in descending order Modified: syncope/branches/1_0_X/parent/src/site/xdoc/downloads.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/parent/src/site/xdoc/downloads.xml?rev=1461002r1=1461001r2=1461002view=diff == --- syncope/branches/1_0_X/parent/src/site/xdoc/downloads.xml (original) +++ syncope/branches/1_0_X/parent/src/site/xdoc/downloads.xml Tue Mar 26 07:46:07 2013 @@ -54,8 +54,8 @@ under the License. /section section name=Current Releases - subsection name=1.0.6 Espressivo -pRelease date: Feb 27th, 2013/p + subsection name=1.0.7 Espressivo +pRelease date: Mar 26th, 2013/p p a href=https://cwiki.apache.org/confluence/display/SYNCOPE/Espressivo;Release notes/a /p @@ -69,12 +69,12 @@ under the License. tbody tr td -a href=http://www.apache.org/dyn/closer.cgi/syncope/1.0.6/syncope-root-1.0.6-source-release.zip;syncope-root-1.0.6-source-release.zip/a +a href=http://www.apache.org/dyn/closer.cgi/syncope/1.0.7/syncope-root-1.0.7-source-release.zip;syncope-root-1.0.7-source-release.zip/a /td td -a href=http://www.apache.org/dist/syncope/1.0.6/syncope-root-1.0.6-source-release.zip.asc;asc/a -a href=http://www.apache.org/dist/syncope/1.0.6/syncope-root-1.0.6-source-release.zip.md5;md5/a -a href=http://www.apache.org/dist/syncope/1.0.6/syncope-root-1.0.6-source-release.zip.sha1;sha1/a +a href=http://www.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.asc;asc/a +a href=http://www.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.md5;md5/a +a href=http://www.apache.org/dist/syncope/1.0.7/syncope-root-1.0.7-source-release.zip.sha1;sha1/a /td /tr /tbody @@ -83,8 +83,8 @@ under the License. /section section name=Older Releases - subsection name=1.0.5 Espressivo -pRelease date: Jan 23rd, 2013/p + subsection name=1.0.6 Espressivo +pRelease date: Feb 27th, 2013/p p a href=https://cwiki.apache.org/confluence/display/SYNCOPE/Espressivo;Release notes/a /p @@ -98,12 +98,12 @@ under the License. tbody tr td -a href=http://archive.apache.org/dist/syncope/1.0.5/syncope-root-1.0.5-source
svn commit: r1461007 - /syncope/tags/syncope-1.0.7/
Author: ilgrosso Date: Tue Mar 26 08:03:51 2013 New Revision: 1461007 URL: http://svn.apache.org/r1461007 Log: [maven-release-plugin] copy for tag syncope-1.0.7 Added: syncope/tags/syncope-1.0.7/ (props changed) - copied from r1461006, syncope/branches/1_0_X/ Propchange: syncope/tags/syncope-1.0.7/ -- --- svn:ignore (added) +++ svn:ignore Tue Mar 26 08:03:51 2013 @@ -0,0 +1,4 @@ +target +.subversion +.pom.xml.swp +.NOTICE.swp Propchange: syncope/tags/syncope-1.0.7/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Mar 26 08:03:51 2013 @@ -0,0 +1,9 @@ +/incubator/syncope/branches/0_1_X:1246484-1246581 +/incubator/syncope/branches/0_2_X:1246657-1246688 +/incubator/syncope/branches/0_5_X:1246875-1246986 +/incubator/syncope/branches/0_6_X:1247008-1247042 +/incubator/syncope/branches/0_7_EA:1247056-1247077 +/incubator/syncope/branches/0_7_X:1247257-1247396 +/incubator/syncope/tags/syncope-0.1:1246486-1246488 +/incubator/syncope/trunk:1247317-1247363 +/syncope/trunk:1439825,1439832,1440353,1444125
