svn commit: r1417319 [1/3] - in /syncope/branches/cxf: console/ console/src/main/java/org/apache/syncope/console/pages/panels/ core/ core/src/main/java/org/apache/syncope/core/rest/ core/src/main/java

2012-12-05 Thread jbernhardt 
Author: jbernhardt
Date: Wed Dec  5 09:04:17 2012
New Revision: 1417319

URL: http://svn.apache.org/viewvc?rev=1417319view=rev
Log:
Fixes from previous merging

Removed:

syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleControllerImpl.java

syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UnauthorizedRoleException.java

syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserControllerImpl.java

syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/NotFoundException.java

syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTests.java

syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java

syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Modified:
syncope/branches/cxf/console/   (props changed)

syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
syncope/branches/cxf/core/   (props changed)
syncope/branches/cxf/core/pom.xml

syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/QueryResourceInfoComperator.java

syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
syncope/branches/cxf/core/src/main/resources/   (props changed)

syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java

Propchange: syncope/branches/cxf/console/
--
--- svn:ignore (original)
+++ svn:ignore Wed Dec  5 09:04:17 2012
@@ -4,3 +4,6 @@ nb-configuration.xml
 .pom.xml.swp
 .classpath
 .project
+.externalToolBuilders
+.settings
+maven-eclipse.xml

Modified: 
syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java?rev=1417319r1=1417318r2=1417319view=diff
==
--- 
syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
 (original)
+++ 
syncope/branches/cxf/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java
 Wed Dec  5 09:04:17 2012
@@ -88,7 +88,7 @@ public class RolePanel extends Panel {
 this.add(new ResourcesPanel(resources, roleTO));
 //
 
-ListModelString selectedEntitlements = new 
ListModelString(roleTO.getEntitlements());
+ListModelString selectedEntitlements = new 
ListModelString(roleTO.getEntitlementList());
 
 ListModelString availableEntitlements = new 
ListModelString(entitlementRestClient.getAllEntitlements());
 

Propchange: syncope/branches/cxf/core/
--
--- svn:ignore (original)
+++ svn:ignore Wed Dec  5 09:04:17 2012
@@ -1,6 +1,10 @@
-target
 nb-configuration.xml
 nbactions.xml
 .pom.xml.swp
+target
 .classpath
+.externalToolBuilders
+.settings
 .project
+maven-eclipse.xml
+maven.log

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

2012-12-05 Thread ilgrosso 
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)
+++