syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [2/2] syncope git commit: Some polishing and refinements, especially with console
Date Fri, 24 Jun 2016 07:56:07 GMT
Some polishing and refinements, especially with console


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/72fd2cfc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/72fd2cfc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/72fd2cfc

Branch: refs/heads/master
Commit: 72fd2cfc098b1e9c057d21e86e39af6175c0970b
Parents: 81d1b8e
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Thu Jun 23 17:50:57 2016 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Fri Jun 24 09:55:53 2016 +0200

----------------------------------------------------------------------
 .../cli/commands/task/TaskResultManager.java    |  2 +-
 .../console/status/ResourceStatusModal.java     | 28 +++++++-------------
 .../client/console/status/StatusModal.java      |  6 ++++-
 .../tasks/PropagationTaskDirectoryPanel.java    |  2 +-
 .../console/status/ResourceStatusModal.html     |  3 +--
 .../client/console/status/StatusModal.html      |  3 +--
 .../console/status/StatusModal.properties       |  1 -
 .../console/status/StatusModal_it.properties    |  1 -
 .../console/status/StatusModal_pt_BR.properties |  1 -
 .../console/status/StatusModal_ru.properties    |  1 -
 .../PropagationTaskDirectoryPanel.properties    |  4 +--
 .../PropagationTaskDirectoryPanel_it.properties |  4 +--
 ...opagationTaskDirectoryPanel_pt_BR.properties |  4 +--
 .../PropagationTaskDirectoryPanel_ru.properties |  2 +-
 .../topology/TopologyTogglePanel.properties     |  4 +--
 .../topology/TopologyTogglePanel_it.properties  |  4 +--
 .../TopologyTogglePanel_pt_BR.properties        |  4 +--
 .../topology/TopologyTogglePanel_ru.properties  |  4 +--
 .../common/lib/to/PropagationTaskTO.java        | 10 +++----
 .../provisioning/java/MappingManagerImpl.java   |  4 ++-
 .../java/data/TaskDataBinderImpl.java           |  1 +
 .../syncope/fit/console/TopologyITCase.java     |  6 ++---
 .../syncope/fit/core/MembershipITCase.java      |  2 +-
 .../apache/syncope/fit/core/PullTaskITCase.java |  2 +-
 24 files changed, 48 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
index 9a17197..05ef17e 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java
@@ -104,7 +104,7 @@ public class TaskResultManager extends CommonsResultManager {
     private void printPropagationTask(final PropagationTaskTO propagationTaskTO) {
         System.out.println(" - Propagation task key: " + propagationTaskTO.getKey());
         System.out.println("     resource: " + propagationTaskTO.getResource());
-        System.out.println("     any key: " + propagationTaskTO.getAnyKey());
+        System.out.println("     any key: " + propagationTaskTO.getEntityKey());
         System.out.println("     any type kind: " + propagationTaskTO.getAnyTypeKind());
         System.out.println("     connector object key: " + propagationTaskTO.getConnObjectKey());
         System.out.println("     old connector object key: " + propagationTaskTO.getOldConnObjectKey());

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java
b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java
index 842a054..5180f2e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java
@@ -19,10 +19,8 @@
 package org.apache.syncope.client.console.status;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.Transformer;
 import org.apache.syncope.client.console.commons.Constants;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
 import org.apache.syncope.client.console.commons.status.StatusBean;
@@ -32,7 +30,7 @@ import org.apache.syncope.client.console.rest.AbstractAnyRestClient;
 import org.apache.syncope.client.console.rest.AnyTypeRestClient;
 import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
 import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
-import org.apache.syncope.common.lib.to.AnyTypeTO;
+import org.apache.syncope.common.lib.EntityTOUtils;
 import org.apache.syncope.common.lib.to.ResourceTO;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -51,6 +49,7 @@ public class ResourceStatusModal extends StatusModal<ResourceTO> {
             final PageReference pageReference,
             final ResourceTO resourceTO,
             final boolean statusOnly) {
+
         super(baseModal, pageReference, resourceTO, statusOnly);
 
         final LoadableDetachableModel<List<String>> types = new LoadableDetachableModel<List<String>>()
{
@@ -59,25 +58,17 @@ public class ResourceStatusModal extends StatusModal<ResourceTO>
{
 
             @Override
             protected List<String> load() {
-                List<String> res = CollectionUtils.collect(
-                        new AnyTypeRestClient().list(),
-                        new Transformer<AnyTypeTO, String>() {
-
-                    @Override
-                    public String transform(final AnyTypeTO input) {
-                        return input.getKey();
-                    }
-                }, new ArrayList<String>());
-                Collections.sort(res);
-                return res;
+                return CollectionUtils.collect(
+                        new AnyTypeRestClient().list(), EntityTOUtils.keyTransformer(), new
ArrayList<String>());
             }
         };
 
-        final AjaxDropDownChoicePanel<String> type = new AjaxDropDownChoicePanel<>("type",
"type", typeModel);
-        type.setChoices(types);
-        add(type);
+        AjaxDropDownChoicePanel<String> anyTypes = new AjaxDropDownChoicePanel<>("anyTypes",
"anyTypes", typeModel);
+        anyTypes.setChoices(types);
+        anyTypes.hideLabel();
+        add(anyTypes);
 
-        type.getField().add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
+        anyTypes.getField().add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE)
{
 
             private static final long serialVersionUID = -1107858522700306810L;
 
@@ -97,6 +88,7 @@ public class ResourceStatusModal extends StatusModal<ResourceTO> {
             final PageReference pageReference,
             final ResourceTO entity,
             final boolean statusOnly) {
+
         return new ResourceStatusDirectoryPanel(baseModal, mlp, pageReference, null, entity);
     }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/java/org/apache/syncope/client/console/status/StatusModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/StatusModal.java
b/client/console/src/main/java/org/apache/syncope/client/console/status/StatusModal.java
index e016d61..6854420 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/StatusModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/StatusModal.java
@@ -36,7 +36,11 @@ public abstract class StatusModal<T extends Serializable> extends
Panel implemen
     protected final DirectoryPanel<StatusBean, StatusBean, ?, ?> directoryPanel;
 
     public StatusModal(
-            final BaseModal<?> baseModal, final PageReference pageReference, final
T entity, final boolean statusOnly) {
+            final BaseModal<?> baseModal,
+            final PageReference pageReference,
+            final T entity,
+            final boolean statusOnly) {
+
         super(BaseModal.CONTENT_ID);
 
         final MultilevelPanel mlp = new MultilevelPanel("status");

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
index 5ef0dba..0bb8e90 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
@@ -84,7 +84,7 @@ public abstract class PropagationTaskDirectoryPanel
                 new StringResourceModel("anyTypeKind", this, null), "anyTypeKind", "anyTypeKind"));
 
         columns.add(new PropertyColumn<PropagationTaskTO, String>(
-                new StringResourceModel("anyKey", this, null), "anyKey", "anyKey"));
+                new StringResourceModel("entityKey", this, null), "entityKey", "entityKey"));
 
         columns.add(new PropertyColumn<PropagationTaskTO, String>(
                 new StringResourceModel("connObjectKey", this, null), "connObjectKey", "connObjectKey"));

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/status/ResourceStatusModal.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/ResourceStatusModal.html
b/client/console/src/main/resources/org/apache/syncope/client/console/status/ResourceStatusModal.html
index 75a2e3a..ba7eca9 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/status/ResourceStatusModal.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/ResourceStatusModal.html
@@ -17,8 +17,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-  <head><title></title></head>
   <wicket:extend>
-    <span wicket:id="type"/>
+    <span wicket:id="anyTypes"/>
   </wicket:extend>
 </html>

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.html
b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.html
index e942a9e..b21c4e9 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.html
@@ -17,9 +17,8 @@ specific language governing permissions and limitations
 under the License.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
-  <head><title></title></head>
   <wicket:panel>
-    <div class="box">
+    <div class="panel-group box-group">
       <wicket:child/>
     </div>
     <span wicket:id="status">[Status]</span>

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties
index 0d74a9d..da7d533 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties
@@ -18,4 +18,3 @@ resourceName=Resource
 connObjectLink=Remote ID
 anyKey=Local ID
 status=Status
-type=Object type to be searched for

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties
index 98b0787..c04df69 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties
@@ -18,4 +18,3 @@ resourceName=Risorsa
 connObjectLink=ID Remoto
 status=Stato
 anyKey=ID Locale
-type=Tipo di oggetto per il quale cercare

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties
index 8be848c..3648301 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties
@@ -18,4 +18,3 @@ resourceName=Resource
 connObjectLink=Remote ID
 status=Status
 anyKey=Local ID
-type=Object type to be searched for

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties
index cb92e1c..fad01a7 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties
@@ -22,4 +22,3 @@ connObjectLink=\u0423\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u04
 # status=\u00d0\u00a1\u00d1\u0082\u00d0\u00b0\u00d1\u0082\u00d1\u0083\u00d1\u0081
 status=\u0421\u0442\u0430\u0442\u0443\u0441
 anyKey=Local ID
-type=Object type to be searched for

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
index a3a9981..83b7a7d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
@@ -16,6 +16,6 @@
 # under the License.
 operation=Operation
 anyTypeKind=Object Type
-anyKey=Local Key
-connObjectKey=Remote Key
+entityKey=Local ID
+connObjectKey=Remote ID
 task.view=${right.operation} task about ${right.anyTypeKind}

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
index 28dc870..7d5d932 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
@@ -16,6 +16,6 @@
 # under the License.
 operation=Operazione
 anyTypeKind=Tipo Oggetto
-anyKey=Key Locale
-connObjectKey=Key Remota
+entityKey=ID Locale
+connObjectKey=ID Remoto
 task.view=${right.operation} task per ${right.anyTypeKind}

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
index a3a9981..83b7a7d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
@@ -16,6 +16,6 @@
 # under the License.
 operation=Operation
 anyTypeKind=Object Type
-anyKey=Local Key
-connObjectKey=Remote Key
+entityKey=Local ID
+connObjectKey=Remote ID
 task.view=${right.operation} task about ${right.anyTypeKind}

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
index 87af326..b9ef41e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
@@ -20,7 +20,7 @@ operation=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
 # anyTypeKind=\u00d0\u009e\u00d0\u00b1\u00d1\u008a\u00d0\u00b5\u00d0\u00ba\u00d1\u0082
 anyTypeKind=\u041e\u0431\u044a\u0435\u043a\u0442
 # anyKey=\u00d0\u009b\u00d0\u00be\u00d0\u00ba\u00d0\u00b0\u00d0\u00bb\u00d1\u008c\u00d0\u00bd\u00d1\u008b\u00d0\u00b9
\u00d0\u00b8\u00d0\u00b4\u00d0\u00b5\u00d0\u00bd\u00d1\u0082\u00d0\u00b8\u00d1\u0084\u00d0\u00b8\u00d0\u00ba\u00d0\u00b0\u00d1\u0082\u00d0\u00be\u00d1\u0080
-anyKey=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440
+entityKey=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440
 # connObjectKey=\u00d0\u0098\u00d0\u00b4\u00d0\u00b5\u00d0\u00bd\u00d1\u0082\u00d0\u00b8\u00d1\u0084\u00d0\u00b8\u00d0\u00ba\u00d0\u00b0\u00d1\u0082\u00d0\u00be\u00d1\u0080
\u00d0\u00b2 \u00d1\u0080\u00d0\u00b5\u00d1\u0081\u00d1\u0083\u00d1\u0080\u00d1\u0081\u00d0\u00b5
 connObjectKey=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440
\u0432 \u0440\u0435\u0441\u0443\u0440\u0441\u0435
 task.view=${right.operation} task about ${right.anyTypeKind}

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties
index 97d77f9..c82fc37 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel.properties
@@ -34,5 +34,5 @@ task.pull.list=Pull tasks
 task.push.list=Push tasks
 resource.explore.list=Explore ${key}
 connectors.reload=Reload all connectors
-resource.provisioning.status=Resource Provisioning Status
-resource.menu.provisioning.status=Resource provisioning status
+resource.provisioning.status=Provisioning Status
+resource.menu.provisioning.status=Provisioning status

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties
index a6cbff2..4156f8b 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_it.properties
@@ -34,5 +34,5 @@ task.pull.list=Pull task
 task.push.list=Push task
 resource.explore.list=Esplora ${key}
 connectors.reload=Ricarica tutti i connettori
-resource.provisioning.status=Stato di provisioning sulla risorsa
-resource.menu.provisioning.status=Stato provisioning sulla risorsa
+resource.provisioning.status=Stato provisioning
+resource.menu.provisioning.status=Stato provisioning

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties
index 305e1f5..b2748c6 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_pt_BR.properties
@@ -34,5 +34,5 @@ task.pull.list=Pull tasks
 task.push.list=Push tasks
 resource.explore.list=Explorar ${key}
 connectors.reload=Reload all connectors
-resource.provisioning.status=Resource Provisioning Status
-resource.menu.provisioning.status=Resource provisioning status
+resource.provisioning.status=Provisioning status
+resource.menu.provisioning.status=Provisioning status

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties
index 6cbb70c..b57dc93 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/TopologyTogglePanel_ru.properties
@@ -53,5 +53,5 @@ task.push.list=\u0417\u0430\u0434\u0430\u0447\u0438 \u043f\u0435\u0440\u0435\u04
 # resource.explore.list=\u00d0\u009f\u00d1\u0080\u00d0\u00be\u00d1\u0081\u00d0\u00bc\u00d0\u00be\u00d1\u0082\u00d1\u0080
${key}
 resource.explore.list=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 ${key}
 connectors.reload=Reload all connectors
-resource.provisioning.status=Resource Provisioning Status
-resource.menu.provisioning.status=Resource provisioning status
+resource.provisioning.status=Provisioning Status
+resource.menu.provisioning.status=Provisioning status

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
index d176bb2..ab6c066 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
@@ -43,7 +43,7 @@ public class PropagationTaskTO extends AbstractTaskTO {
 
     private AnyTypeKind anyTypeKind;
 
-    private Long anyKey;
+    private String entityKey;
 
     public String getConnObjectKey() {
         return connObjectKey;
@@ -101,11 +101,11 @@ public class PropagationTaskTO extends AbstractTaskTO {
         this.anyTypeKind = anyTypeKind;
     }
 
-    public Long getAnyKey() {
-        return anyKey;
+    public String getEntityKey() {
+        return entityKey;
     }
 
-    public void setAnyKey(final Long anyKey) {
-        this.anyKey = anyKey;
+    public void setEntityKey(final String entityKey) {
+        this.entityKey = entityKey;
     }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
index 7d38624..652cb90 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
@@ -160,7 +160,9 @@ public class MappingManagerImpl implements MappingManager {
                     if (preparedAttr.getValue() != null) {
                         Attribute alreadyAdded = AttributeUtil.find(preparedAttr.getValue().getName(),
attributes);
 
-                        if (alreadyAdded == null) {
+                        if (alreadyAdded == null
+                                || alreadyAdded.getValue() == null || alreadyAdded.getValue().isEmpty())
{
+
                             attributes.add(preparedAttr.getValue());
                         } else {
                             attributes.remove(alreadyAdded);

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
index d005ac7..fae1ef9 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
@@ -320,6 +320,7 @@ public class TaskDataBinderImpl implements TaskDataBinder {
 
         switch (taskUtils.getType()) {
             case PROPAGATION:
+                ((PropagationTaskTO) taskTO).setEntityKey(((PropagationTask) task).getEntityKey());
                 ((PropagationTaskTO) taskTO).setResource(((PropagationTask) task).getResource().getKey());
                 ((PropagationTaskTO) taskTO).setAttributes(((PropagationTask) task).getSerializedAttributes());
                 break;

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
index 0060793..45a7a6e 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
@@ -90,11 +90,11 @@ public class TopologyITCase extends AbstractConsoleITCase {
         TESTER.assertComponent("body:toggle:outerObjectsRepeater:1:outer", Modal.class);
 
         FormTester formTester = TESTER.newFormTester("body:toggle:outerObjectsRepeater:1:outer:form");
-        formTester.setValue("content:type:dropDownChoiceField", "2");
+        formTester.setValue("content:anyTypes:dropDownChoiceField", "0");
         TESTER.executeAjaxEvent(
-                "body:toggle:outerObjectsRepeater:1:outer:form:content:type:dropDownChoiceField",
+                "body:toggle:outerObjectsRepeater:1:outer:form:content:anyTypes:dropDownChoiceField",
                 Constants.ON_CHANGE);
-        formTester.setValue("content:type:dropDownChoiceField", "2");
+        formTester.setValue("content:anyTypes:dropDownChoiceField", "0");
 
         component = findComponentByProp("anyKey", "body:toggle:outerObjectsRepeater:1:outer:form:content:status:"
                 + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:"

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java
index 6a5f0d6..946b918 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java
@@ -221,7 +221,7 @@ public class MembershipITCase extends AbstractITCase {
     }
 
     @Test
-    public void syncWithMembershipAttr() {
+    public void pull() {
         // 0. create ad-hoc resource, with adequate mapping
         ResourceTO newResource = resourceService.read(RESOURCE_NAME_DBPULL);
         newResource.setKey(getUUIDString());

http://git-wip-us.apache.org/repos/asf/syncope/blob/72fd2cfc/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index 66e2d76..5b62151 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -209,7 +209,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
             ExecTO exec = execProvisioningTask(taskService, PULL_TASK_KEY, 50, false);
             assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(exec.getStatus()));
             
-            LOG.info("Execution of task {}:\n{}", PULL_TASK_KEY, exec);
+            LOG.debug("Execution of task {}:\n{}", PULL_TASK_KEY, exec);
 
             // check for pull results
             int usersPost = userService.search(new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).


Mime
View raw message