Implemented syslog event storage and manager UI

openremote · May 25, 2017 · 8bb4204 · 8bb4204
1 parent 967805e
commit 8bb4204
Show file tree

Hide file tree

Showing 60 changed files with 1,414 additions and 749 deletions.
diff --git a/agent/src/main/java/org/openremote/agent/protocol/timer/CronScheduler.java b/agent/src/main/java/org/openremote/agent/protocol/timer/CronScheduler.java
@@ -86,7 +86,7 @@ protected void addOrReplaceJob(String id, CronExpression expression, Runnable ex
             scheduler.scheduleJob(cronTrigger.key, cronTrigger.value);
 
             if (!scheduler.isStarted()) {
-                LOG.info("Starting the cron cronScheduler");
+                LOG.info("Starting the cron scheduler");
                 scheduler.start();
             }
 

diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -117,6 +117,7 @@ public void stop(Container container) throws Exception {
         }
     }
 
+
     public EntityManager createEntityManager() {
         EntityManager entityManager = getEntityManagerFactory().createEntityManager();
 
@@ -171,7 +172,7 @@ public <R> R doReturningTransaction(Function<EntityManager, R> entityManagerFunc
         }
     }
 
-    protected EntityManagerFactory getEntityManagerFactory() {
+    public EntityManagerFactory getEntityManagerFactory() {
         return entityManagerFactory;
     }
 

diff --git a/manager/client/src/main/java/org/openremote/manager/client/ManagerActivityMapper.java b/manager/client/src/main/java/org/openremote/manager/client/ManagerActivityMapper.java
@@ -22,8 +22,8 @@
 import com.google.gwt.place.shared.Place;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import org.openremote.manager.client.admin.overview.AdminOverviewActivity;
-import org.openremote.manager.client.admin.overview.AdminOverviewPlace;
+import org.openremote.manager.client.admin.syslog.AdminSyslogActivity;
+import org.openremote.manager.client.admin.syslog.AdminSyslogPlace;
 import org.openremote.manager.client.admin.tenant.AdminTenantActivity;
 import org.openremote.manager.client.admin.tenant.AdminTenantPlace;
 import org.openremote.manager.client.admin.tenant.AdminTenantsActivity;
@@ -43,7 +43,6 @@
 import org.openremote.manager.client.assets.tenant.AssetsTenantActivity;
 import org.openremote.manager.client.assets.tenant.AssetsTenantPlace;
 import org.openremote.manager.client.event.ShowFailureEvent;
-import org.openremote.model.event.bus.EventBus;
 import org.openremote.manager.client.i18n.ManagerMessages;
 import org.openremote.manager.client.map.MapActivity;
 import org.openremote.manager.client.map.MapPlace;
@@ -65,6 +64,7 @@
 import org.openremote.manager.client.service.SecurityService;
 import org.openremote.manager.client.user.UserAccountActivity;
 import org.openremote.manager.client.user.UserAccountPlace;
+import org.openremote.model.event.bus.EventBus;
 
 import java.util.logging.Logger;
 
@@ -87,7 +87,7 @@ public class ManagerActivityMapper implements AppActivityMapper {
     protected final Provider<AssetRulesListActivity> assetRulesListActivityProvider;
     protected final Provider<AssetRulesEditorActivity> assetRulesEditorActivityProvider;
     protected final Provider<AppsActivity> appsActivityProvider;
-    protected final Provider<AdminOverviewActivity> adminOverviewActivityProvider;
+    protected final Provider<AdminSyslogActivity> adminSyslogActivityProvider;
     protected final Provider<AdminTenantsActivity> adminTenantsActivityProvider;
     protected final Provider<AdminTenantActivity> adminTenantActivityProvider;
     protected final Provider<AdminUsersActivity> adminUsersActivityProvider;
@@ -110,7 +110,7 @@ public ManagerActivityMapper(SecurityService securityService,
                                  Provider<AssetRulesListActivity> assetRulesListActivityProvider,
                                  Provider<AssetRulesEditorActivity> assetRulesEditorActivityProvider,
                                  Provider<AppsActivity> appsActivityProvider,
-                                 Provider<AdminOverviewActivity> adminOverviewActivityProvider,
+                                 Provider<AdminSyslogActivity> adminSyslogActivityProvider,
                                  Provider<AdminTenantsActivity> adminTenantsActivityProvider,
                                  Provider<AdminTenantActivity> adminTenantActivityProvider,
                                  Provider<AdminUsersActivity> adminUsersActivityProvider,
@@ -131,7 +131,7 @@ public ManagerActivityMapper(SecurityService securityService,
         this.assetRulesListActivityProvider = assetRulesListActivityProvider;
         this.assetRulesEditorActivityProvider = assetRulesEditorActivityProvider;
         this.appsActivityProvider = appsActivityProvider;
-        this.adminOverviewActivityProvider = adminOverviewActivityProvider;
+        this.adminSyslogActivityProvider = adminSyslogActivityProvider;
         this.adminTenantsActivityProvider = adminTenantsActivityProvider;
         this.adminTenantActivityProvider = adminTenantActivityProvider;
         this.adminUsersActivityProvider = adminUsersActivityProvider;
@@ -177,8 +177,8 @@ public AppActivity getActivity(Place place) {
             if (place instanceof AppsPlace) {
                 return appsActivityProvider.get().init(securityService, (AppsPlace) place);
             }
-            if (place instanceof AdminOverviewPlace) {
-                return adminOverviewActivityProvider.get().init(securityService, (AdminOverviewPlace) place);
+            if (place instanceof AdminSyslogPlace) {
+                return adminSyslogActivityProvider.get().init(securityService, (AdminSyslogPlace) place);
             }
             if (place instanceof AdminTenantsPlace) {
                 return adminTenantsActivityProvider.get().init(securityService, (AdminTenantsPlace) place);

diff --git a/manager/client/src/main/java/org/openremote/manager/client/ManagerHistoryMapper.java b/manager/client/src/main/java/org/openremote/manager/client/ManagerHistoryMapper.java
@@ -21,7 +21,7 @@
 
 import com.google.gwt.place.shared.PlaceHistoryMapper;
 import com.google.gwt.place.shared.WithTokenizers;
-import org.openremote.manager.client.admin.overview.AdminOverviewPlace;
+import org.openremote.manager.client.admin.syslog.AdminSyslogPlace;
 import org.openremote.manager.client.admin.tenant.AdminTenantPlace;
 import org.openremote.manager.client.admin.tenant.AdminTenantsPlace;
 import org.openremote.manager.client.admin.users.AdminUserPlace;
@@ -56,7 +56,7 @@
         AssetRulesListPlace.Tokenizer.class,
         AssetRulesEditorPlace.Tokenizer.class,
         AppsPlace.Tokenizer.class,
-        AdminOverviewPlace.Tokenizer.class,
+        AdminSyslogPlace.Tokenizer.class,
         AdminTenantsPlace.Tokenizer.class,
         AdminTenantPlace.Tokenizer.class,
         AdminUsersPlace.Tokenizer.class,

diff --git a/manager/client/src/main/java/org/openremote/manager/client/admin/AdminModule.java b/manager/client/src/main/java/org/openremote/manager/client/admin/AdminModule.java
@@ -25,15 +25,11 @@
 import org.openremote.manager.client.admin.navigation.AdminNavigation;
 import org.openremote.manager.client.admin.navigation.AdminNavigationImpl;
 import org.openremote.manager.client.admin.navigation.AdminNavigationPresenter;
-import org.openremote.manager.client.admin.overview.AdminOverview;
-import org.openremote.manager.client.admin.overview.AdminOverviewActivity;
-import org.openremote.manager.client.admin.overview.AdminOverviewImpl;
-import org.openremote.manager.client.admin.syslog.QuickSyslog;
-import org.openremote.manager.client.admin.syslog.QuickSyslogImpl;
-import org.openremote.manager.client.admin.syslog.QuickSyslogPresenter;
+import org.openremote.manager.client.admin.syslog.*;
 import org.openremote.manager.client.admin.tenant.*;
 import org.openremote.manager.client.admin.users.*;
 import org.openremote.manager.shared.security.UserResource;
+import org.openremote.manager.shared.syslog.SyslogResource;
 
 public class AdminModule extends AbstractGinModule {
 
@@ -44,8 +40,8 @@ protected void configure() {
         bind(AdminNavigation.class).to(AdminNavigationImpl.class).in(Singleton.class);
         bind(AdminNavigation.Presenter.class).to(AdminNavigationPresenter.class);
 
-        bind(AdminOverview.class).to(AdminOverviewImpl.class).in(Singleton.class);
-        bind(AdminOverviewActivity.class);
+        bind(AdminSyslog.class).to(AdminSyslogImpl.class).in(Singleton.class);
+        bind(AdminSyslogActivity.class);
 
         bind(AdminTenants.class).to(AdminTenantsImpl.class).in(Singleton.class);
         bind(AdminTenantsActivity.class);
@@ -56,11 +52,14 @@ protected void configure() {
         bind(AdminUsersActivity.class);
         bind(AdminUser.class).to(AdminUserImpl.class).in(Singleton.class);
         bind(AdminUserActivity.class);
-
-        bind(QuickSyslog.class).to(QuickSyslogImpl.class).in(Singleton.class);
-        bind(QuickSyslog.Presenter.class).to(QuickSyslogPresenter.class).in(Singleton.class);
     }
 
+    @Provides
+    @Singleton
+    public native SyslogResource getSyslogResource()  /*-{
+        return $wnd.SyslogResource;
+    }-*/;
+
     @Provides
     @Singleton
     public native UserResource getUserResource()  /*-{

diff --git a/manager/client/src/main/java/org/openremote/manager/client/admin/AdminViewImpl.ui.xml b/manager/client/src/main/java/org/openremote/manager/client/admin/AdminViewImpl.ui.xml
@@ -6,12 +6,18 @@
     <ui:with field="managerMessages" type="org.openremote.manager.client.i18n.ManagerMessages"/>
     <ui:with field="widgetStyle" type="org.openremote.manager.client.style.WidgetStyle"/>
 
+    <ui:style>
+        .adminContentContainer {
+            overflow: hidden;
+        }
+    </ui:style>
+
     <g:HTMLPanel styleName="flex layout horizontal">
 
         <an:AdminNavigation ui:field="adminNavigation"/>
 
         <g:HTMLPanel ui:field="adminContentContainer"
-                     styleName="flex layout vertical">
+                     styleName="flex layout vertical {style.adminContentContainer}">
         </g:HTMLPanel>
     </g:HTMLPanel>
 

diff --git a/...ent/src/main/java/org/openremote/manager/client/admin/navigation/AdminNavigationImpl.java b/...ent/src/main/java/org/openremote/manager/client/admin/navigation/AdminNavigationImpl.java
@@ -41,7 +41,7 @@ interface UI extends UiBinder<HTMLPanel, AdminNavigationImpl> {
     Presenter presenter;
 
     @UiField
-    Hyperlink overviewLink;
+    Hyperlink syslogLink;
 
     @UiField
     Hyperlink tenantsLink;
@@ -59,14 +59,14 @@ public AdminNavigationImpl() {
     public void setPresenter(Presenter presenter) {
         this.presenter = presenter;
 
-        overviewLink.setTargetHistoryToken(presenter.getAdminOverviewPlaceToken());
+        syslogLink.setTargetHistoryToken(presenter.getAdminOverviewPlaceToken());
         tenantsLink.setTargetHistoryToken(presenter.getAdminTenantsPlaceToken());
         usersLink.setTargetHistoryToken(presenter.getAdminUsersPlaceToken());
     }
 
     @Override
     public void onPlaceChange(AdminPlace adminPlace) {
-        overviewLink.removeStyleName("active");
+        syslogLink.removeStyleName("active");
         tenantsLink.removeStyleName("active");
         usersLink.removeStyleName("active");
 
@@ -79,7 +79,7 @@ public void onPlaceChange(AdminPlace adminPlace) {
         } else if (adminPlace instanceof AdminUserPlace) {
             usersLink.addStyleName("active");
         } else {
-            overviewLink.addStyleName("active");
+            syslogLink.addStyleName("active");
         }
     }
 

diff --git a/...t/src/main/java/org/openremote/manager/client/admin/navigation/AdminNavigationImpl.ui.xml b/...t/src/main/java/org/openremote/manager/client/admin/navigation/AdminNavigationImpl.ui.xml
@@ -17,10 +17,10 @@
 
     <g:HTMLPanel styleName="layout vertical {widgetStyle.SecondaryNav} {style.nav}">
 
-        <w:Hyperlink ui:field="overviewLink"
+        <w:Hyperlink ui:field="syslogLink"
                      addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem}"
-                     icon="dashboard"
-                     text="{managerMessages.systemStatus}"/>
+                     icon="list-alt"
+                     text="{managerMessages.syslog}"/>
 
         <w:Hyperlink ui:field="tenantsLink"
                      addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem}"

diff --git a/...rc/main/java/org/openremote/manager/client/admin/navigation/AdminNavigationPresenter.java b/...rc/main/java/org/openremote/manager/client/admin/navigation/AdminNavigationPresenter.java
@@ -22,7 +22,7 @@
 import com.google.gwt.place.shared.PlaceHistoryMapper;
 import com.google.inject.Inject;
 import org.openremote.manager.client.admin.AdminPlace;
-import org.openremote.manager.client.admin.overview.AdminOverviewPlace;
+import org.openremote.manager.client.admin.syslog.AdminSyslogPlace;
 import org.openremote.manager.client.admin.tenant.AdminTenantsPlace;
 import org.openremote.manager.client.admin.users.AdminUsersPlace;
 
@@ -47,7 +47,7 @@ public AdminNavigation getView() {
 
     @Override
     public String getAdminOverviewPlaceToken() {
-        return historyMapper.getToken(new AdminOverviewPlace());
+        return historyMapper.getToken(new AdminSyslogPlace());
     }
 
     @Override

diff --git a/...ent/src/main/java/org/openremote/manager/client/admin/overview/AdminOverviewActivity.java b/...ent/src/main/java/org/openremote/manager/client/admin/overview/AdminOverviewActivity.java
diff --git a/.../client/src/main/java/org/openremote/manager/client/admin/overview/AdminOverviewImpl.java b/.../client/src/main/java/org/openremote/manager/client/admin/overview/AdminOverviewImpl.java
diff --git a/...lient/src/main/java/org/openremote/manager/client/admin/overview/AdminOverviewImpl.ui.xml b/...lient/src/main/java/org/openremote/manager/client/admin/overview/AdminOverviewImpl.ui.xml