svn commit: r1458378 - /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java

2013-03-19 Thread ilgrosso 
Author: ilgrosso
Date: Tue Mar 19 16:15:35 2013
New Revision: 1458378

URL: http://svn.apache.org/r1458378
Log:
Sorting resources during selection (for users and roles)

Modified:

syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java?rev=1458378&r1=1458377&r2=1458378&view=diff
==
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java
 Tue Mar 19 16:15:35 2013
@@ -19,6 +19,7 @@
 package org.apache.syncope.console.pages.panels;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -69,6 +70,7 @@ public class ResourcesPanel extends Pane
 for (ResourceTO resourceTO : resourceRestClient.getAllResources()) {
 allResources.add(resourceTO.getName());
 }
+Collections.sort(allResources);
 }
 
 public ResourcesPanel(final String id, final UserTO userTO, final 
StatusPanel statusPanel) {
@@ -83,9 +85,11 @@ public class ResourcesPanel extends Pane
 public ResourcesPanel(final String id, final RoleTO roleTO) {
 this(id, (AbstractAttributableTO) roleTO);
 
+List selectedResources = new 
ArrayList(roleTO.getResources());
+Collections.sort(selectedResources);
+
 final AjaxPalettePanel resourcesPalette = new 
AjaxPalettePanel("resourcesPalette",
-new PropertyModel>(roleTO, "resources"),
-new ListModel(allResources));
+new ListModel(selectedResources), new 
ListModel(allResources));
 add(resourcesPalette);
 }

svn commit: r1458365 - /syncope/trunk/pom.xml

2013-03-19 Thread ilgrosso 
Author: ilgrosso
Date: Tue Mar 19 15:59:35 2013
New Revision: 1458365

URL: http://svn.apache.org/r1458365
Log:
Upgrade CSV connector to 0.7

Modified:
syncope/trunk/pom.xml

Modified: syncope/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1458365&r1=1458364&r2=1458365&view=diff
==
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Mar 19 15:59:35 2013
@@ -280,7 +280,7 @@ under the License.
 1.3.3
 1.2.6
 2.1.5
-0.7-SNAPSHOT
+0.7
 1.3.5
 
 2.1.1

svn commit: r1458362 - /syncope/branches/1_0_X/parent/pom.xml

2013-03-19 Thread ilgrosso 
Author: ilgrosso
Date: Tue Mar 19 15:57:52 2013
New Revision: 1458362

URL: http://svn.apache.org/r1458362
Log:
Upgrade CSV connector to 0.6.1

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=1458362&r1=1458361&r2=1458362&view=diff
==
--- syncope/branches/1_0_X/parent/pom.xml (original)
+++ syncope/branches/1_0_X/parent/pom.xml Tue Mar 19 15:57:52 2013
@@ -260,7 +260,7 @@ under the License.
 1.3.2
 1.2.3
 2.1.4
-0.6
+0.6.1
 1.3.3
 
 2.1.1

svn commit: r1458328 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java console/src/main/java/org/apache/syncope/console/wick

2013-03-19 Thread fmartelli 
Author: fmartelli
Date: Tue Mar 19 15:20:42 2013
New Revision: 1458328

URL: http://svn.apache.org/r1458328
Log:
SYNCOPE-339 fixed

Modified:
syncope/trunk/   (props changed)

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/AjaxTextFieldPanel.java

Propchange: syncope/trunk/
--
  Merged /syncope/branches/1_0_X:r1457726-1458327

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java?rev=1458328&r1=1458327&r2=1458328&view=diff
==
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
 Tue Mar 19 15:20:42 2013
@@ -42,7 +42,7 @@ public class AjaxDropDownChoicePanel(
 "dropDownChoiceField", model, Collections.emptyList(), new 
ChoiceRenderer());
-
+
 add(field.setLabel(new Model(name)).setOutputMarkupId(true));
 
 if (enableOnBlur) {
@@ -75,11 +75,9 @@ public class AjaxDropDownChoicePanel panel = (AjaxDropDownChoicePanel) 
super.clone();
-
-setChoiceRenderer(((DropDownChoice) field).getChoiceRenderer());
-setChoices(((DropDownChoice) field).getChoices());
-
+final AjaxDropDownChoicePanel panel = (AjaxDropDownChoicePanel) 
super.clone();
+panel.setChoiceRenderer(((DropDownChoice) field).getChoiceRenderer());
+panel.setChoices(((DropDownChoice) field).getChoices());
 return panel;
 }
 }

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java?rev=1458328&r1=1458327&r2=1458328&view=diff
==
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
 Tue Mar 19 15:20:42 2013
@@ -90,4 +90,11 @@ public class AjaxTextFieldPanel extends 
 this.choices = choices;
 }
 }
+
+@Override
+public FieldPanel clone() {
+final AjaxTextFieldPanel panel = (AjaxTextFieldPanel) super.clone();
+panel.setChoices(choices);
+return panel;
+}
 }

svn commit: r1458327 - in /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form: AjaxDropDownChoicePanel.java AjaxTextFieldPanel.java

2013-03-19 Thread fmartelli 
Author: fmartelli
Date: Tue Mar 19 15:18:52 2013
New Revision: 1458327

URL: http://svn.apache.org/r1458327
Log:
SYNCOPE-339 fixed on the 1.0.X branch

Modified:

syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java

syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java

Modified: 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java?rev=1458327&r1=1458326&r2=1458327&view=diff
==
--- 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
 (original)
+++ 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
 Tue Mar 19 15:18:52 2013
@@ -36,7 +36,9 @@ public class AjaxDropDownChoicePanel 
 
 super(id, name, model);
 
-field = new DropDownChoice("dropDownChoiceField", model, 
Collections.emptyList(), new ChoiceRenderer());
+field = new DropDownChoice(
+"dropDownChoiceField", model, Collections.emptyList(), new 
ChoiceRenderer());
+
 add(field.setLabel(new Model(name)).setOutputMarkupId(true));
 
 if (!isReadOnly()) {
@@ -69,10 +71,9 @@ public class AjaxDropDownChoicePanel 
 
 @Override
 public FieldPanel clone() {
-AjaxDropDownChoicePanel panel = (AjaxDropDownChoicePanel) 
super.clone();
-
-setChoiceRenderer(((DropDownChoice) field).getChoiceRenderer());
-setChoices(((DropDownChoice) field).getChoices());
+final AjaxDropDownChoicePanel panel = (AjaxDropDownChoicePanel) 
super.clone();
+panel.setChoiceRenderer(((DropDownChoice) field).getChoiceRenderer());
+panel.setChoices(((DropDownChoice) field).getChoices());
 
 return panel;
 }

Modified: 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java?rev=1458327&r1=1458326&r2=1458327&view=diff
==
--- 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
 (original)
+++ 
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
 Tue Mar 19 15:18:52 2013
@@ -91,4 +91,12 @@ public class AjaxTextFieldPanel extends 
 this.choices = choices;
 }
 }
+
+@Override
+public FieldPanel clone() {
+final AjaxTextFieldPanel panel = (AjaxTextFieldPanel) super.clone();
+panel.setChoices(choices);
+
+return panel;
+}
 }

svn commit: r1458326 - /syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/

2013-03-19 Thread ilgrosso 
Author: ilgrosso
Date: Tue Mar 19 15:06:51 2013
New Revision: 1458326

URL: http://svn.apache.org/r1458326
Log:
[SYNCOPE-338] Spring Security annotations moved to *Internal() Spring MVC 
conrtoller methods

Modified:

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/LoggerController.java

syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java

syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/PolicyController.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/rest/controller/UserController.java

Modified: 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java?rev=1458326&r1=1458325&r2=1458326&view=diff
==
--- 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
 (original)
+++ 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
 Tue Mar 19 15:06:51 2013
@@ -126,7 +126,6 @@ public class ConfigurationController ext
 @PreAuthorize("hasRole('CONFIGURATION_READ')")
 @RequestMapping(method = RequestMethod.GET, value = "/read/{key}")
 public ConfigurationTO read(final HttpServletResponse response, 
@PathVariable("key") final String key) {
-
 ConfigurationTO result;
 try {
 SyncopeConf conf = confDAO.find(key);
@@ -202,9 +201,7 @@ public class ConfigurationController ext
 return new ModelAndView().addObject(htmlTemplates);
 }
 
-@PreAuthorize("hasRole('CONFIGURATION_READ')")
 @RequestMapping(method = RequestMethod.GET, value = "/dbexport")
-@Transactional(readOnly = true)
 public void dbExport(final HttpServletResponse response) {
 response.setContentType(MediaType.TEXT_XML);
 response.setHeader(SyncopeConstants.CONTENT_DISPOSITION_HEADER,
@@ -216,6 +213,7 @@ public class ConfigurationController ext
 }
 }
 
+@PreAuthorize("hasRole('CONFIGURATION_READ')")
 @Transactional(readOnly = true)
 public void dbExportInternal(final OutputStream os) {
 try {

Modified: 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java?rev=1458326&r1=1458325&r2=1458326&view=diff
==
--- 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
 (original)
+++ 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
 Tue Mar 19 15:06:51 2013
@@ -170,7 +170,7 @@ public class LoggerController extends Ab
 } else if (expectedType != syncopeLogger.getType()) {
 throwInvalidLogger(expectedType);
 }
-
+
 LoggerTO loggerToDelete = new LoggerTO();
 BeanUtils.copyProperties(syncopeLogger, loggerToDelete);
 
@@ -184,7 +184,7 @@ public class LoggerController extends Ab
 
 auditManager.audit(Category.logger, LoggerSubCategory.setLevel, 
Result.success, String.format(
 "Successfully deleted logger %s (%s)", name, expectedType));
-
+
 return loggerToDelete;
 }
 
@@ -197,7 +197,6 @@ public class LoggerController extends Ab
 @PreAuthorize("hasRole('AUDIT_DISABLE')")
 @RequestMapping(method = RequestMethod.PUT, value = "/audit/disable")
 public void disableAudit(@RequestBody final AuditLoggerName 
auditLoggerName) {
-
 try {
 delete(auditLoggerName.toLoggerName(), SyncopeLoggerType.AUDIT);
 } catch (NotFoundException e) {

Modified: 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java?rev=1458326&r1=1458325&r2=1458326&view=diff
==
--- 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
 (original)
+++ 
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/NotificationController.java
 Tue Mar 19 15:06:51 2013
@@ -82,7 +82,6 @@ public class NotificationController exte
 return notificationTO

svn commit: r1458215 - /syncope/trunk/pom.xml

2013-03-19 Thread ilgrosso 
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=1458215&r1=1458214&r2=1458215&view=diff
==
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Mar 19 10:42:15 2013
@@ -277,11 +277,11 @@ under the License.
 2.2
 1.2
 
-1.3.3-SNAPSHOT
-1.2.6-SNAPSHOT
-2.1.5-SNAPSHOT
+1.3.3
+1.2.6
+2.1.5
 0.7-SNAPSHOT
-1.3.5-SNAPSHOT
+1.3.5
 
 2.1.1
 2.6

svn commit: r1458209 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/java/org/apache/syncope/markup/ console/src/main/java/org/apache/syncope/markup/he

2013-03-19 Thread fmartelli 
Author: fmartelli
Date: Tue Mar 19 10:21:06 2013
New Revision: 1458209

URL: http://svn.apache.org/r1458209
Log:
SYNCOPE-326 fixed

Added:
syncope/trunk/console/src/main/java/org/apache/syncope/markup/
syncope/trunk/console/src/main/java/org/apache/syncope/markup/head/

syncope/trunk/console/src/main/java/org/apache/syncope/markup/head/MetaHeaderItem.java
   (with props)
Modified:
syncope/trunk/   (props changed)

syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java

syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java

syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java

syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html

syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html

syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login.html

syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage.html

syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles.html

syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel.html

syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
syncope/trunk/console/src/main/webapp/css/fieldstyle.css

syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java

Propchange: syncope/trunk/
--
  Merged /syncope/branches/1_0_X:r1455499-1457725

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java?rev=1458209&r1=1458208&r2=1458209&view=diff
==
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BaseModalPage.java
 Tue Mar 19 10:21:06 2013
@@ -19,6 +19,10 @@
 package org.apache.syncope.console.pages;
 
 import org.apache.syncope.console.commons.CloseOnESCBehavior;
+import org.apache.syncope.markup.head.MetaHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.PriorityHeaderItem;
 
 /**
  * Syncope Modal Window.
@@ -27,9 +31,17 @@ public abstract class BaseModalPage exte
 
 private static final long serialVersionUID = -1443079028368471943L;
 
+private final HeaderItem meta = new MetaHeaderItem("X-UA-Compatible", 
"IE=edge");
+
 public BaseModalPage() {
 super();
 
 add(new CloseOnESCBehavior("keyup"));
 }
+
+@Override
+public void renderHead(IHeaderResponse response) {
+super.renderHead(response);
+response.render(new PriorityHeaderItem(meta));
+}
 }

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java?rev=1458209&r1=1458208&r2=1458209&view=diff
==
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
 Tue Mar 19 10:21:06 2013
@@ -22,6 +22,7 @@ import org.apache.syncope.common.to.User
 import org.apache.syncope.console.SyncopeApplication;
 import org.apache.syncope.console.SyncopeSession;
 import org.apache.syncope.console.rest.UserRestClient;
+import org.apache.syncope.markup.head.MetaHeaderItem;
 import org.apache.wicket.Component;
 import org.apache.wicket.Page;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -30,6 +31,9 @@ import org.apache.wicket.ajax.markup.htm
 import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.PriorityHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -47,6 +51,8 @@ public class BasePage extends AbstractBa
 
 private final static int EDIT_PROFILE_WIN_WIDTH = 800;
 
+private final HeaderItem meta = new MetaHeaderItem("X-UA-Compatible", 
"IE=edge");
+
 @SpringBean
 private UserRestClient userRestClient;
 
@@ -164,4 +170,10 @@ public class BasePage extends AbstractBa