Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NMS-7797: Migrate to Vaadin v8.5.2 #2224

Merged
merged 49 commits into from
Nov 27, 2018
Merged

NMS-7797: Migrate to Vaadin v8.5.2 #2224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
78fa2ed
NMS-7797: Update vaadin version to 7.7.15 and make it compile and start
Oct 25, 2018
fa026f9
NMS-7797: Add custom stylings to default topology theme
Oct 25, 2018
684c9bf
NMS-7797: Update Vaadin to 8.0.7
Oct 30, 2018
a390ec3
NMS-7797: Refactor vaadin-jmxconfiggenerator to fix UI.getCurrent() b…
Oct 30, 2018
7f4246c
NMS-7797: Use official vaadin-context-menu addon to get vaadin 7 back…
Oct 31, 2018
93485da
NMS-7797: Rework widgetset compilation and wiring
Oct 31, 2018
d171a39
NMS-7797: Use default gwt version 2.8.2 instead of old 2.6.x
Nov 5, 2018
64b4240
NMS-7797: Revert scss changes as they don't work with our current layout
Nov 5, 2018
e879f84
NMS-7797: Enable vaadin-opennms-pluginmanager
Nov 6, 2018
676ea54
NMS-7797: Add auto-detection for custom widgetsets
Nov 6, 2018
c7f654d
Remove RemotePollerMap
Oct 24, 2018
c3da200
NMS-7797: Fix plugin manager integration with Vaadin 7
Nov 6, 2018
c50843f
NMS-7797: Fix Property name
Nov 6, 2018
7cf174e
NMS-7797: Update to Vaadin v8.5.2
Nov 6, 2018
a1518d0
Merge remote-tracking branch 'origin/develop' into jira/NMS-7797-2018
Nov 6, 2018
bdd8196
Merge remote-tracking branch 'origin/develop' into jira/NMS-7797-2018
Nov 7, 2018
43192bd
NMS-7797: Use getText() instead of getDescription()
Nov 7, 2018
fb5282d
NMS-7797: Only hover over sub-menu elements instead of clicking them
Nov 7, 2018
8bb6a97
NMS-7797: Prevent sub-menus to cause NPEs when beeing clicked
Nov 7, 2018
86a658b
NMS-7797: Do not re-use Notification object as they are not re-usable…
Nov 7, 2018
887a429
NMS-7797: Use getUI().getSession() instead of VaadinSession.getCurren…
Nov 7, 2018
54982fc
NMS-7797: Remove TODO
Nov 7, 2018
62662f9
NMS-7797: Remove unused import
Nov 7, 2018
ae8c7d8
NMS-7797: Use getUI().getPage() instead of Page.getCurrent() to preve…
Nov 7, 2018
3e2defd
NMS-7797: Make UserTimeZoneExtractor use instance of UI instead of Va…
Nov 7, 2018
010388f
Merge remote-tracking branch 'origin/develop' into jira/NMS-7797-2018
Nov 8, 2018
2f49192
NMS-7797: Fixed Vaadin Surveillance Views
christianpape Nov 8, 2018
e8abb49
NMS-7797: Fixed Vaadin Ops Board
christianpape Nov 8, 2018
aca448a
NMS-7797: Fixed Vaadin Alarm Dashlet
christianpape Nov 8, 2018
7a90cdd
NMS-7797: Fixed Vaadin BSM Dashlet
christianpape Nov 8, 2018
a226f9a
NMS-7797: Fixed Vaadin Image Dashlet
christianpape Nov 8, 2018
7e450bc
NMS-7797: Fixed Vaadin KSC Dashlet
christianpape Nov 8, 2018
054a2f3
NMS-7797: Fixed Vaadin RTC Dashlet
christianpape Nov 8, 2018
17a1cab
NMS-7797: Fixed Vaadin Charts Dashlet
christianpape Nov 8, 2018
368b7a1
NMS-7797: Fixed Vaadin URL Dashlet
christianpape Nov 8, 2018
bda2570
NMS-7797: Fixed Vaadin Map Dashlet
christianpape Nov 8, 2018
0b01347
NMS-7797: Fixed Vaadin RRD Dashlet
christianpape Nov 8, 2018
2009a06
NMS-7797: Fixed Vaadin Surveillance Dashlet
christianpape Nov 8, 2018
ed6bfb7
NMS-7797: Fixed Vaadin Topology Dashlet
christianpape Nov 8, 2018
6b4db18
NMS-7797: Fixed Vaadin Grafana Dashlet
christianpape Nov 8, 2018
89767db
Merge branch 'jira/NMS-7797-2018' of github.com:OpenNMS/opennms into …
christianpape Nov 8, 2018
a846616
NMS-7797: Fixed OpsBoardAdminPageIT
christianpape Nov 9, 2018
60f61c7
NMS-7797: Fixed margin in Ops Board
christianpape Nov 15, 2018
edff7e7
NMS-7797: Fixed missing progress indicator in Ops Board
christianpape Nov 15, 2018
dd6f05d
NMS-7797: Fix tooltips
Nov 15, 2018
a75fca0
NMS-7797: Migrate vaadin-snmp-events-and-metrics to properly use isRe…
Nov 19, 2018
2b0a40e
NMS-7797: Make table scale dynaimcally with available pixels vs fixed…
Nov 21, 2018
fd95d58
Merge remote-tracking branch 'origin/develop' into jira/NMS-7797-2018
Nov 25, 2018
25aed35
NMS-7797: Use release version instead of snapshot
Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions features/bsm/vaadin-adminpage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
<Vaadin-Package-Version>1</Vaadin-Package-Version>
<Vaadin-Widgetsets>org.opennms.vaadin.DefaultWidgetset</Vaadin-Widgetsets>
</instructions>
</configuration>
</plugin>
Expand Down Expand Up @@ -54,6 +55,11 @@
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opennms.features.vaadin-components</groupId>
<artifactId>widgetset</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opennms.features.topology</groupId>
<artifactId>org.opennms.features.topology.link</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...npage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.opennms.netmgt.bsm.service.model.graph.GraphVertex;

import com.google.common.collect.Maps;
import com.vaadin.data.util.BeanContainer;
import com.vaadin.v7.data.util.BeanContainer;

/**
* Container which holds {@link BusinessServiceRow} objects.
Expand Down
14 changes: 7 additions & 7 deletions .../src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceEdgeEditWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
import com.vaadin.data.Validator;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.v7.data.Validator;
import com.vaadin.v7.shared.ui.combobox.FilteringMode;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.ComboBox;
import com.vaadin.v7.ui.ComboBox;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.v7.ui.HorizontalLayout;
import com.vaadin.v7.ui.NativeSelect;
import com.vaadin.v7.ui.TextField;
import com.vaadin.v7.ui.VerticalLayout;
import com.vaadin.ui.Window;

/**
Expand Down
18 changes: 9 additions & 9 deletions ...page/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceEditWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
import com.vaadin.data.Property;
import com.vaadin.data.Validator;
import com.vaadin.data.validator.AbstractStringValidator;
import com.vaadin.v7.data.Property;
import com.vaadin.v7.data.Validator;
import com.vaadin.v7.data.validator.AbstractStringValidator;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Field;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.ListSelect;
import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.v7.ui.Field;
import com.vaadin.v7.ui.HorizontalLayout;
import com.vaadin.v7.ui.ListSelect;
import com.vaadin.v7.ui.NativeSelect;
import com.vaadin.v7.ui.TextField;
import com.vaadin.v7.ui.VerticalLayout;
import com.vaadin.ui.Window;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...dminpage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

import java.util.Map;

import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.data.Property;
import com.vaadin.v7.data.Container;
import com.vaadin.v7.data.Item;
import com.vaadin.v7.data.Property;

public class BusinessServiceFilter implements Container.Filter {
public static final String NAME_PROPERTY = "name";
Expand Down
10 changes: 5 additions & 5 deletions ...page/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceMainLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
import org.opennms.netmgt.bsm.service.model.BusinessService;
import org.opennms.netmgt.vaadin.core.UIHelper;

import com.vaadin.event.FieldEvents;
import com.vaadin.v7.event.FieldEvents;
import com.vaadin.server.FontAwesome;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.v7.ui.HorizontalLayout;
import com.vaadin.v7.ui.Label;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.v7.ui.TextField;
import com.vaadin.v7.ui.VerticalLayout;

/**
* This class represents the main Vaadin component for editing Business Service definitions.
Expand Down
16 changes: 8 additions & 8 deletions ...npage/src/main/java/org/opennms/netmgt/bsm/vaadin/adminpage/BusinessServiceTreeTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@

import com.google.common.base.Strings;
import com.google.common.collect.HashBasedTable;
import com.vaadin.data.Item;
import com.vaadin.data.Property;
import com.vaadin.data.util.BeanItem;
import com.vaadin.data.util.ContainerHierarchicalWrapper;
import com.vaadin.v7.data.Item;
import com.vaadin.v7.data.Property;
import com.vaadin.v7.data.util.BeanItem;
import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
import com.vaadin.server.ExternalResource;
import com.vaadin.server.FontAwesome;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.v7.ui.HorizontalLayout;
import com.vaadin.v7.ui.Label;
import com.vaadin.ui.Link;
import com.vaadin.ui.Table;
import com.vaadin.ui.TreeTable;
import com.vaadin.v7.ui.Table;
import com.vaadin.v7.ui.TreeTable;

/**
* {@link TreeTable} for {@link BusinessServiceRow} objects.
Expand Down
1 change: 1 addition & 0 deletions features/bsm/vaadin-adminpage/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<service interface="org.opennms.vaadin.extender.ApplicationFactory" ref="bsmAdminPageApplicationFactory">
<service-properties>
<entry key="alias" value="/admin/bsm-admin-page" />
<entry key="init.widgetset" value="org.opennms.vaadin.DefaultWidgetset" />
</service-properties>
</service>
<service interface="org.opennms.web.navigate.PageNavEntry" ref="bsmAdminPageUi">
Expand Down
5 changes: 5 additions & 0 deletions features/geolocation/feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
<plugin>
<groupId>org.opennms.maven.plugins</groupId>
<artifactId>features-maven-plugin</artifactId>
<configuration>
<features>
<feature>opennms-core-web</feature>
</features>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
5 changes: 5 additions & 0 deletions ...s/jest/client/src/main/java/org/opennms/plugins/elasticsearch/rest/RestClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@
package org.opennms.plugins.elasticsearch.rest;

import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand All @@ -44,7 +47,9 @@
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.protocol.HttpContext;
import org.opennms.plugins.elasticsearch.rest.credentials.CredentialsParser;
import org.opennms.plugins.elasticsearch.rest.credentials.CredentialsProvider;
import org.opennms.plugins.elasticsearch.rest.executors.LimitedRetriesRequestExecutor;
Expand Down
2 changes: 1 addition & 1 deletion features/opennms-osgi-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId>
<artifactId>vaadin-compatibility-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down