hostsharing/hs.hsadmin.jee
8
0
Fork 0
Code Pull Requests Activity

upgrade vaadin to releae 8 in compatibility mode

Browse Source
This commit is contained in:
Peter Hormanns 2019-12-31 16:04:33 +01:00
parent 955d1918ae
commit ade38796a5
23 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pom.xml
View File

@ -41,20 +41,20 @@
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId> <artifactId>vaadin-compatibility-server</artifactId>
<version>7.7.13</version> <version>8.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-themes</artifactId> <artifactId>vaadin-themes</artifactId>
<version>7.7.13</version> <version>8.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiled</artifactId> <artifactId>vaadin-compatibility-client-compiled</artifactId>
<version>7.7.13</version> <version>8.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
@ -72,7 +72,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version> <version>1.7.30</version>
</dependency> </dependency>
<dependency> <dependency>
@ -89,7 +89,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>

6
web/src/main/java/de/hsadmin/web/DomainOptionsEditor.java
View File

@ -6,10 +6,10 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.vaadin.data.Validator; import com.vaadin.v7.data.Validator;
import com.vaadin.ui.CheckBox; import com.vaadin.v7.ui.CheckBox;
import com.vaadin.ui.CustomComponent; import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.VerticalLayout;
import de.hsadmin.rpc.HSAdminSession; import de.hsadmin.rpc.HSAdminSession;
import de.hsadmin.rpc.PropertyInfo; import de.hsadmin.rpc.PropertyInfo;

16
web/src/main/java/de/hsadmin/web/EMailTargetEditor.java
View File

@ -7,19 +7,19 @@ import java.util.Map;
import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.XmlRpcException;
import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeEvent;
import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.v7.data.Property.ValueChangeListener;
import com.vaadin.data.Validator; import com.vaadin.v7.data.Validator;
import com.vaadin.data.Validator.InvalidValueException; import com.vaadin.v7.data.Validator.InvalidValueException;
import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.AbstractOrderedLayout;
import com.vaadin.ui.Alignment; import com.vaadin.ui.Alignment;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
import com.vaadin.ui.CustomComponent; import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.HorizontalLayout;
import com.vaadin.ui.NativeSelect; import com.vaadin.v7.ui.NativeSelect;
import com.vaadin.ui.TextField; import com.vaadin.v7.ui.TextField;
import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.VerticalLayout;
import de.hsadmin.model.IRemote; import de.hsadmin.model.IRemote;
import de.hsadmin.model.TicketService; import de.hsadmin.model.TicketService;

6
web/src/main/java/de/hsadmin/web/EntryPoint.java
View File

@ -3,9 +3,9 @@ package de.hsadmin.web;
import java.util.List; import java.util.List;
import com.vaadin.ui.CustomComponent; import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Table; import com.vaadin.v7.ui.Table;
import com.vaadin.ui.Table.ColumnHeaderMode; import com.vaadin.v7.ui.Table.ColumnHeaderMode;
import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.VerticalLayout;
public class EntryPoint extends CustomComponent { public class EntryPoint extends CustomComponent {

6
web/src/main/java/de/hsadmin/web/EntryPointsSelector.java
View File

@ -1,14 +1,14 @@
package de.hsadmin.web; package de.hsadmin.web;
import com.vaadin.event.ItemClickEvent; import com.vaadin.v7.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
import com.vaadin.ui.Accordion; import com.vaadin.ui.Accordion;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
import com.vaadin.ui.CustomComponent; import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Panel; import com.vaadin.ui.Panel;
import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
import com.vaadin.ui.Table; import com.vaadin.v7.ui.Table;
import de.hsadmin.rpc.RpcException; import de.hsadmin.rpc.RpcException;

2
web/src/main/java/de/hsadmin/web/GenericEditorFactory.java
View File

@ -8,7 +8,7 @@ import java.util.Map;
import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.XmlRpcException;
import com.vaadin.data.Validator; import com.vaadin.v7.data.Validator;
import de.hsadmin.model.IRemote; import de.hsadmin.model.IRemote;
import de.hsadmin.model.TicketService; import de.hsadmin.model.TicketService;

4
web/src/main/java/de/hsadmin/web/HSAdminUI.java
View File

@ -7,11 +7,12 @@ import javax.servlet.annotation.WebServlet;
import com.vaadin.annotations.Theme; import com.vaadin.annotations.Theme;
import com.vaadin.annotations.Title; import com.vaadin.annotations.Title;
import com.vaadin.annotations.VaadinServletConfiguration; import com.vaadin.annotations.VaadinServletConfiguration;
import com.vaadin.annotations.Widgetset;
import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinServlet; import com.vaadin.server.VaadinServlet;
import com.vaadin.ui.UI; import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.themes.ValoTheme;
import com.vaadin.v7.ui.VerticalLayout;
import de.hsadmin.common.error.TechnicalException; import de.hsadmin.common.error.TechnicalException;
import de.hsadmin.model.TicketService; import de.hsadmin.model.TicketService;
@ -19,6 +20,7 @@ import de.hsadmin.model.TicketServiceFactory;
@Title("HSAdmin Web") @Title("HSAdmin Web")
@Theme(ValoTheme.THEME_NAME) @Theme(ValoTheme.THEME_NAME)
@Widgetset("com.vaadin.v7.Vaadin7WidgetSet")
public class HSAdminUI extends UI { public class HSAdminUI extends UI {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

3
web/src/main/java/de/hsadmin/web/HSConfirmBox.java
View File

@ -5,10 +5,11 @@ import org.apache.xmlrpc.XmlRpcException;
import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.KeyCode;
import com.vaadin.server.ErrorMessage; import com.vaadin.server.ErrorMessage;
import com.vaadin.shared.ui.ErrorLevel;
import com.vaadin.ui.Button; import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.HorizontalLayout;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;
import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.themes.ValoTheme;

4
web/src/main/java/de/hsadmin/web/HSDateSelect.java
View File

@ -2,8 +2,8 @@ package de.hsadmin.web;
import java.util.Map; import java.util.Map;
import com.vaadin.data.util.converter.StringToDateConverter; import com.vaadin.v7.data.util.converter.StringToDateConverter;
import com.vaadin.ui.DateField; import com.vaadin.v7.ui.DateField;
import de.hsadmin.rpc.PropertyInfo; import de.hsadmin.rpc.PropertyInfo;

2
web/src/main/java/de/hsadmin/web/HSPasswordField.java
View File

@ -2,7 +2,7 @@ package de.hsadmin.web;
import java.util.Map; import java.util.Map;
import com.vaadin.ui.PasswordField; import com.vaadin.v7.ui.PasswordField;
public class HSPasswordField extends PasswordField implements IHSEditor { public class HSPasswordField extends PasswordField implements IHSEditor {

2
web/src/main/java/de/hsadmin/web/HSSelect.java
View File

@ -3,7 +3,7 @@ package de.hsadmin.web;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.vaadin.ui.NativeSelect; import com.vaadin.v7.ui.NativeSelect;
import de.hsadmin.rpc.PropertyInfo; import de.hsadmin.rpc.PropertyInfo;

4
web/src/main/java/de/hsadmin/web/HSTab.java
View File

@ -10,8 +10,8 @@ import org.apache.xmlrpc.XmlRpcException;
import com.vaadin.ui.Alignment; import com.vaadin.ui.Alignment;
import com.vaadin.ui.CustomComponent; import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Table; import com.vaadin.v7.ui.Table;
import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.VerticalLayout;
import de.hsadmin.model.TicketService; import de.hsadmin.model.TicketService;
import de.hsadmin.rpc.HSAdminSession; import de.hsadmin.rpc.HSAdminSession;

2
web/src/main/java/de/hsadmin/web/HSTextField.java
View File

@ -2,7 +2,7 @@ package de.hsadmin.web;
import java.util.Map; import java.util.Map;
import com.vaadin.ui.TextField; import com.vaadin.v7.ui.TextField;
import de.hsadmin.rpc.PropertyInfo; import de.hsadmin.rpc.PropertyInfo;

2
web/src/main/java/de/hsadmin/web/HelpWindow.java
View File

@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.VerticalLayout;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;
public class HelpWindow extends Window { public class HelpWindow extends Window {

2
web/src/main/java/de/hsadmin/web/IHSEditor.java
View File

@ -2,7 +2,7 @@ package de.hsadmin.web;
import java.util.Map; import java.util.Map;
import com.vaadin.data.Validator; import com.vaadin.v7.data.Validator;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
public interface IHSEditor extends Component { public interface IHSEditor extends Component {

4
web/src/main/java/de/hsadmin/web/InfoWindow.java
View File

@ -5,8 +5,8 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.themes.ValoTheme;
import com.vaadin.ui.Label; import com.vaadin.v7.ui.Label;
import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.VerticalLayout;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;
public class InfoWindow extends Window { public class InfoWindow extends Window {

8
web/src/main/java/de/hsadmin/web/LoginWindow.java
View File

@ -4,16 +4,16 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.KeyCode;
import com.vaadin.ui.AbstractTextField; import com.vaadin.v7.ui.AbstractTextField;
import com.vaadin.ui.Button; import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
import com.vaadin.ui.FormLayout; import com.vaadin.ui.FormLayout;
import com.vaadin.ui.HasComponents; import com.vaadin.ui.HasComponents;
import com.vaadin.ui.Label; import com.vaadin.v7.ui.Label;
import com.vaadin.ui.PasswordField; import com.vaadin.v7.ui.PasswordField;
import com.vaadin.ui.TextField; import com.vaadin.v7.ui.TextField;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;
import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.themes.ValoTheme;

2
web/src/main/java/de/hsadmin/web/MainToolbar.java
View File

@ -10,7 +10,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component; import com.vaadin.ui.Component;
import com.vaadin.ui.CustomComponent; import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.HorizontalLayout;
import com.vaadin.ui.Panel; import com.vaadin.ui.Panel;
import com.vaadin.ui.UI; import com.vaadin.ui.UI;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;

2
web/src/main/java/de/hsadmin/web/MainWindow.java
View File

@ -13,7 +13,7 @@ import com.vaadin.ui.AbstractSplitPanel;
import com.vaadin.ui.CustomComponent; import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Panel; import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.VerticalLayout;
import de.hsadmin.common.config.Config; import de.hsadmin.common.config.Config;
import de.hsadmin.common.error.TechnicalException; import de.hsadmin.common.error.TechnicalException;

4
web/src/main/java/de/hsadmin/web/NullEditor.java
View File

@ -2,8 +2,8 @@ package de.hsadmin.web;
import java.util.Map; import java.util.Map;
import com.vaadin.data.Validator; import com.vaadin.v7.data.Validator;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.HorizontalLayout;
public class NullEditor extends HorizontalLayout implements IHSEditor { public class NullEditor extends HorizontalLayout implements IHSEditor {

2
web/src/main/java/de/hsadmin/web/PacNamePrefixValidator.java
View File

@ -1,6 +1,6 @@
package de.hsadmin.web; package de.hsadmin.web;
import com.vaadin.data.Validator; import com.vaadin.v7.data.Validator;
public class PacNamePrefixValidator implements Validator { public class PacNamePrefixValidator implements Validator {

2
web/src/main/java/de/hsadmin/web/PanelToolbar.java
View File

@ -10,7 +10,7 @@ import com.vaadin.server.ThemeResource;
import com.vaadin.ui.Button; import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.HorizontalLayout;
import com.vaadin.ui.UI; import com.vaadin.ui.UI;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;

2
web/src/main/java/de/hsadmin/web/PasswordValidator.java
View File

@ -1,6 +1,6 @@
package de.hsadmin.web; package de.hsadmin.web;
import com.vaadin.data.Validator; import com.vaadin.v7.data.Validator;
public class PasswordValidator implements Validator { public class PasswordValidator implements Validator {