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/05/09 11:06:45 UTC
svn commit: r1480576 - in /syncope/trunk: ./
console/src/main/java/org/apache/syncope/console/pages/Login.java
console/src/main/java/org/apache/syncope/console/pages/Reports.java
Author: ilgrosso
Date: Thu May 9 09:06:44 2013
New Revision: 1480576
URL: http://svn.apache.org/r1480576
Log:
[SYNCOPE-369] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1479795-1480575
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1480576&r1=1480575&r2=1480576&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Thu May 9 09:06:44 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages;
+import java.security.AccessControlException;
import java.util.Locale;
import java.util.Set;
import org.apache.http.HttpResponse;
@@ -78,24 +79,24 @@ public class Login extends WebPage {
@SpringBean(name = "baseURL")
private String baseURL;
- private Form form;
+ private Form<Void> form;
- private TextField userIdField;
+ private TextField<String> userIdField;
- private TextField passwordField;
+ private TextField<String> passwordField;
private DropDownChoice<Locale> languageSelect;
public Login(final PageParameters parameters) {
super(parameters);
- form = new Form("login");
+ form = new Form<Void>("login");
- userIdField = new TextField("userId", new Model());
+ userIdField = new TextField<String>("userId", new Model<String>());
userIdField.setMarkupId("userId");
form.add(userIdField);
- passwordField = new PasswordTextField("password", new Model());
+ passwordField = new PasswordTextField("password", new Model<String>());
passwordField.setMarkupId("password");
form.add(passwordField);
@@ -117,7 +118,7 @@ public class Login extends WebPage {
SyncopeSession.get().setVersion(getSyncopeVersion());
setResponsePage(WelcomePage.class, parameters);
- } catch (HttpClientErrorException e) {
+ } catch (AccessControlException e) {
error(getString("login-error"));
PreemptiveAuthHttpRequestFactory requestFactory =
@@ -147,7 +148,7 @@ public class Login extends WebPage {
if (isSelfRegistrationAllowed()) {
selfRegFrag = new Fragment("selfRegistration", "selfRegAllowed", this);
- final AjaxLink selfRegLink = new ClearIndicatingAjaxLink("link", getPageReference()) {
+ final AjaxLink<Void> selfRegLink = new ClearIndicatingAjaxLink<Void>("link", getPageReference()) {
private static final long serialVersionUID = -7978723352517770644L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1480576&r1=1480575&r2=1480576&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Thu May 9 09:06:44 2013
@@ -117,6 +117,7 @@ public class Reports extends BasePage {
setupAudit();
}
+ @SuppressWarnings({"rawtypes","unchecked"})
private void setupReport() {
reportContainer = new WebMarkupContainer("reportContainer");
setWindowClosedCallback(window, reportContainer);