mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-08 21:30:57 +00:00
Merge branch 'master' into bug2563_2
This commit is contained in:
Axel Uhl committed
commit
bc631b275c
9 files changed
+28
-7
No files matched your search
@@ -32,7 +32,6 @@
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.sap.sse.gwt/src" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.sap.sse.common/src" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="com.sap.sailing.dashboards.gwt"/> </runtimeClasspathEntry> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.google.gwt.osgi/lib/gwt-servlet.jar" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.sap.sailing.domain.common/src" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.moxieapps.gwt.highcharts/src" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.sap.sse.gwt.adminconsole/src" path="3" type="2"/> "/>
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.sap.sse.gwt/src" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.sap.sse.common/src" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="com.sap.sailing.dashboards.gwt"/> </runtimeClasspathEntry> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.google.gwt.osgi/lib/gwt-servlet.jar" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.sap.sailing.domain.common/src" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.moxieapps.gwt.highcharts/src" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/com.sap.sse.gwt.adminconsole/src" path="3" type="2"/> "/>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<listEntry value="1"/>
|
||||
</listAttribute>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.sap.sailing.declination.impl.DeclinationStore"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="2016 2016 1"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="2017 2017 1"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.declination"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Dhttps.proxyHost=proxy.wdf.sap.corp -Dhttps.proxyPort=8080"/>
|
||||
</launchConfiguration>
|
||||
+1
-1
@@ -70,7 +70,7 @@ public class PasswordResetActivity extends AbstractActivity implements PasswordR
|
||||
}
|
||||
|
||||
private class ResetPasswordFormValues {
|
||||
private final NewAccountValidator validator = new NewAccountValidator(i18n_sec);
|
||||
private final NewAccountValidator validator = new ResetPasswordAccountValidator(i18n_sec);
|
||||
private final String username, resetSecret;
|
||||
private String password, passwordConfirmation;
|
||||
|
||||
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.sap.sailing.gwt.home.shared.places.user.passwordreset;
|
||||
|
||||
import com.sap.sse.security.ui.client.component.NewAccountValidator;
|
||||
import com.sap.sse.security.ui.client.i18n.StringMessages;
|
||||
|
||||
public class ResetPasswordAccountValidator extends NewAccountValidator {
|
||||
|
||||
public ResetPasswordAccountValidator(StringMessages stringMessages) {
|
||||
super(stringMessages);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String validateUsername(String username) {
|
||||
// the userName is invalid, if any ErrorMessage is returned
|
||||
boolean invalidUserName = super.validateUsername(username) != null;
|
||||
// however since the username is extracted from the reseturl, this means the reseturl is corrupt
|
||||
return invalidUserName ? stringMessages.cannotResetInvalidURL() : null;
|
||||
}
|
||||
|
||||
}
|
||||
+2
-2
@@ -13,7 +13,7 @@ public class NewAccountValidator {
|
||||
private static final int MINIMUM_USERNAME_LENGTH = 3;
|
||||
private static final int MINIMUM_PASSWORD_LENGTH = 5;
|
||||
|
||||
private final StringMessages stringMessages;
|
||||
protected final StringMessages stringMessages;
|
||||
|
||||
public NewAccountValidator(com.sap.sse.security.ui.client.i18n.StringMessages stringMessages) {
|
||||
this.stringMessages = stringMessages;
|
||||
@@ -43,7 +43,7 @@ public class NewAccountValidator {
|
||||
return result;
|
||||
}
|
||||
|
||||
private String validateUsername(String username) {
|
||||
protected String validateUsername(String username) {
|
||||
final String result;
|
||||
if (username == null || username.length() < MINIMUM_USERNAME_LENGTH) {
|
||||
result = stringMessages.usernameMustHaveAtLeastNCharacters(MINIMUM_USERNAME_LENGTH);
|
||||
|
||||
+1
@@ -99,4 +99,5 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages {
|
||||
String error();
|
||||
String refresh();
|
||||
String preferredLanguage();
|
||||
String cannotResetInvalidURL();
|
||||
}
|
||||
+1
@@ -95,3 +95,4 @@ accountConfirmation=Account confirmation
|
||||
error=Unknown error
|
||||
refresh=Refresh
|
||||
preferredLanguage=Preferred language
|
||||
cannotResetInvalidURL=Invalid reset URL...
|
||||
+1
@@ -95,3 +95,4 @@ accountConfirmation=Kontobestätigung
|
||||
error=Es ist ein Fehler aufgetreten
|
||||
refresh=Aktualisieren
|
||||
preferredLanguage=Bevorzugte Sprache
|
||||
cannotResetInvalidURL="Fehlerhafte Reseturl ..."
|
||||
Reference in new issue
Block a user