You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/02/18 16:24:13 UTC
svn commit: r1447321 - 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/syncope/console/rest/
Author: ilgrosso
Date: Mon Feb 18 15:24:12 2013
New Revision: 1447321
URL: http://svn.apache.org/r1447321
Log:
[SYNCOPE-315] Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
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/ResourceMappingPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1447194-1447314
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=1447321&r1=1447320&r2=1447321&view=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 Mon Feb 18 15:24:12 2013
@@ -76,8 +76,8 @@ public class ResourceModalPage extends B
//--------------------------------
// Resource mapping panels
//--------------------------------
- form.add(new ResourceMappingPanel("umapping", resourceTO, AttributableType.USER, pageRef));
- form.add(new ResourceMappingPanel("rmapping", resourceTO, AttributableType.ROLE, pageRef));
+ form.add(new ResourceMappingPanel("umapping", resourceTO, AttributableType.USER));
+ form.add(new ResourceMappingPanel("rmapping", resourceTO, AttributableType.ROLE));
//--------------------------------
//--------------------------------
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1447321&r1=1447320&r2=1447321&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Mon Feb 18 15:24:12 2013
@@ -35,14 +35,12 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.pages.panels.ResourceConnConfPanel.ConnConfModEvent;
import org.apache.syncope.console.rest.ConnectorRestClient;
import org.apache.syncope.console.rest.SchemaRestClient;
-import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
import org.apache.wicket.Component;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -50,6 +48,7 @@ import org.apache.wicket.ajax.form.AjaxF
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -164,10 +163,8 @@ public class ResourceMappingPanel extend
* @param panelid panel id
* @param resourceTO external resource
* @param attrType USER / ROLE
- * @param pageRef caller page reference
*/
- public ResourceMappingPanel(final String panelid, final ResourceTO resourceTO, final AttributableType attrType,
- final PageReference pageRef) {
+ public ResourceMappingPanel(final String panelid, final ResourceTO resourceTO, final AttributableType attrType) {
super(panelid);
setOutputMarkupId(true);
@@ -428,12 +425,12 @@ public class ResourceMappingPanel extend
mappings.setReuseItems(true);
mappingContainer.add(mappings);
- addMappingBtn = new ClearIndicatingAjaxButton("addMappingBtn", new ResourceModel("add"), pageRef) {
+ addMappingBtn = new IndicatingAjaxButton("addMappingBtn", new ResourceModel("add")) {
private static final long serialVersionUID = -4804368561204623354L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
getMapping().getItems().add(new MappingItemTO());
target.add(ResourceMappingPanel.this);
}
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=1447321&r1=1447320&r2=1447321&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 Mon Feb 18 15:24:12 2013
@@ -153,7 +153,7 @@ public class ConnectorRestClient extends
ConnInstanceTO toBeChecked = new ConnInstanceTO();
BeanUtils.copyProperties(connectorTO, toBeChecked, new String[]{"configuration"});
toBeChecked.setConfiguration(filterProperties(connectorTO.getConfiguration()));
-
+
boolean check = false;
try {
check = getService(ConnectorService.class).check(toBeChecked);
@@ -189,12 +189,13 @@ public class ConnectorRestClient extends
for (SchemaTO schema : response) {
schemaNames.add(schema.getName());
}
- // re-order schema names list
- Collections.sort(schemaNames);
} catch (Exception e) {
LOG.error("While getting resource schema names", e);
- schemaNames = null;
+ } finally {
+ // re-order schema names list
+ Collections.sort(schemaNames);
}
+
return schemaNames;
}
}