Author: ilgrosso
Date: Thu Jan 31 10:40:46 2013
New Revision: 1440901
URL: http://svn.apache.org/viewvc?rev=1440901&view=rev
Log:
[SYNCOPE-302] Fix
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ResourceTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeErrorException.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java?rev=1440901&r1=1440900&r2=1440901&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConnObjectTO.java
Thu Jan 31 10:40:46 2013
@@ -23,12 +23,10 @@ import java.util.Collections;
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.apache.syncope.common.AbstractBaseBean;
import org.codehaus.jackson.annotate.JsonIgnore;
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ResourceTO.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ResourceTO.java?rev=1440901&r1=1440900&r2=1440901&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ResourceTO.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ResourceTO.java
Thu Jan 31 10:40:46 2013
@@ -20,10 +20,8 @@ package org.apache.syncope.common.to;
import java.util.HashSet;
import java.util.Set;
-
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-
import org.apache.syncope.common.AbstractBaseBean;
import org.apache.syncope.common.types.ConnConfProperty;
import org.apache.syncope.common.types.PropagationMode;
@@ -45,6 +43,11 @@ public class ResourceTO extends Abstract
*/
private Long connectorId;
+ /**
+ * Convenience information: display name for the connector id.
+ */
+ private String connectorDisplayName;
+
private MappingTO umapping;
private MappingTO rmapping;
@@ -116,6 +119,14 @@ public class ResourceTO extends Abstract
this.connectorId = connectorId;
}
+ public String getConnectorDisplayName() {
+ return connectorDisplayName;
+ }
+
+ public void setConnectorDisplayName(String connectorDisplayName) {
+ this.connectorDisplayName = connectorDisplayName;
+ }
+
public MappingTO getUmapping() {
return umapping;
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeErrorException.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeErrorException.java?rev=1440901&r1=1440900&r2=1440901&view=diff
==============================================================================
---
syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeErrorException.java
(original)
+++
syncope/trunk/common/src/main/java/org/apache/syncope/common/validation/SyncopeClientCompositeErrorException.java
Thu Jan 31 10:40:46 2013
@@ -21,9 +21,9 @@ package org.apache.syncope.common.valida
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import org.apache.syncope.common.types.SyncopeClientExceptionType;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpClientErrorException;
-import org.apache.syncope.common.types.SyncopeClientExceptionType;
public class SyncopeClientCompositeErrorException extends
HttpClientErrorException {
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1440901&r1=1440900&r2=1440901&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
Thu Jan 31 10:40:46 2013
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-
import org.apache.syncope.common.to.ConnInstanceTO;
import org.apache.syncope.common.to.ResourceTO;
import
org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
@@ -126,8 +125,6 @@ public class Resources extends BasePage
public void populateItem(final Item<ICellPopulator<ResourceTO>>
cellItem, final String componentId,
final IModel<ResourceTO> rowModel) {
- final ConnInstanceTO connectorTO =
connectorRestClient.read(rowModel.getObject().getConnectorId());
-
final IndicatingAjaxLink<String> editLink = new
IndicatingAjaxLink<String>("link") {
private static final long serialVersionUID =
-7978723352517770644L;
@@ -142,14 +139,14 @@ public class Resources extends BasePage
@Override
public Page createPage() {
return new
ConnectorModalPage(Resources.this.getPageReference(), editConnectorWin,
- connectorTO);
+
connectorRestClient.read(rowModel.getObject().getConnectorId()));
}
});
editConnectorWin.show(target);
}
};
- editLink.add(new Label("linkTitle",
connectorTO.getDisplayName()));
+ editLink.add(new Label("linkTitle",
rowModel.getObject().getConnectorDisplayName()));
LinkPanel editConnPanel = new LinkPanel(componentId);
editConnPanel.add(editLink);
@@ -502,7 +499,7 @@ public class Resources extends BasePage
}
}
- class ConnectorsProvider extends SortableDataProvider<ConnInstanceTO,
String> {
+ private class ConnectorsProvider extends
SortableDataProvider<ConnInstanceTO, String> {
private static final long serialVersionUID = 4445909568349448518L;
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=1440901&r1=1440900&r2=1440901&view=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
Thu Jan 31 10:40:46 2013
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.apache.syncope.common.services.ConnectorService;
import org.apache.syncope.common.services.ResourceService;
import org.apache.syncope.common.to.ConnBundleTO;
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java?rev=1440901&r1=1440900&r2=1440901&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
Thu Jan 31 10:40:46 2013
@@ -295,6 +295,7 @@ public class ResourceDataBinder {
ConnInstance connector = resource.getConnector();
resourceTO.setConnectorId(connector == null ? null :
connector.getId());
+ resourceTO.setConnectorDisplayName(connector == null ? null :
connector.getDisplayName());
// set the mappings
if (resource.getUmapping() != null) {
