From f0d07bcc2d905c2da5359fb4d374f628b868e695 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 13 Sep 2013 12:52:28 +0000 Subject: [PATCH] moved to FWS git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/ishealth-monitor-widget@81414 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 8 +++++++- .project | 4 ++-- .settings/com.google.gwt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.validation.prefs | 2 ++ pom.xml | 20 ++++--------------- .../client/Resource_ishealth_monitor.java | 3 ++- .../server/ISMonitorServiceImpl.java | 11 +++++----- 7 files changed, 23 insertions(+), 27 deletions(-) create mode 100644 .settings/org.eclipse.wst.validation.prefs diff --git a/.classpath b/.classpath index 89f880e..a9685cf 100644 --- a/.classpath +++ b/.classpath @@ -17,5 +17,11 @@ - + + + + + + + diff --git a/.project b/.project index 351e2d6..ae364c9 100644 --- a/.project +++ b/.project @@ -26,12 +26,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.wst.validation.validationbuilder - org.eclipse.wst.validation.validationbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/.settings/com.google.gwt.eclipse.core.prefs b/.settings/com.google.gwt.eclipse.core.prefs index 3881e5d..eb16e09 100644 --- a/.settings/com.google.gwt.eclipse.core.prefs +++ b/.settings/com.google.gwt.eclipse.core.prefs @@ -1,4 +1,4 @@ -#Sun Dec 30 01:00:27 CET 2012 eclipse.preferences.version=1 +entryPointModules= filesCopiedToWebInfLib= gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBW11dPjwvZXh0cmEtYXJncz48dm0tYXJncz48IVtDREFUQVstWG14NTEybV1dPjwvdm0tYXJncz48ZW50cnktcG9pbnQtbW9kdWxlPm9yZy5nY3ViZS5wb3J0bGV0cy5hZG1pbi5pc2hlYWx0aG1vbml0b3IuUmVzb3VyY2VfaXNoZWFsdGhfbW9uaXRvcjwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+ diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..04cad8c --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/pom.xml b/pom.xml index 82e140a..04cb0bd 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.portlets.admin ishealth-monitor-widget - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT gCube IS Health Monitor Widget gCube IS Health Monitor Widget. @@ -22,7 +22,7 @@ - 2.4.0 + 2.5.1 distro 1.6 @@ -59,22 +59,10 @@ highcharts-gxt 1.2.1 - - org.gcube.core - gcf - [1.4.0-SNAPSHOT,2.0.0-SNAPSHOT) - provided - - - org.gcube.distribution - ghn-client-runtime - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - provided - org.gcube.portlets.admin rmp-common-library - [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided @@ -174,7 +162,7 @@ gwt-maven-plugin - 2.4.0 + ${gwtVersion} diff --git a/src/main/java/org/gcube/portlets/admin/ishealthmonitor/client/Resource_ishealth_monitor.java b/src/main/java/org/gcube/portlets/admin/ishealthmonitor/client/Resource_ishealth_monitor.java index e06e32c..74756b1 100644 --- a/src/main/java/org/gcube/portlets/admin/ishealthmonitor/client/Resource_ishealth_monitor.java +++ b/src/main/java/org/gcube/portlets/admin/ishealthmonitor/client/Resource_ishealth_monitor.java @@ -8,8 +8,9 @@ import org.gcube.portlets.admin.ishealthmonitor.client.highchartsjs.HighchartsBu import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; + /** - * Entry point classes define onModuleLoad(). + * It will not show if RMP is NOT in STANDALONE MODE */ public class Resource_ishealth_monitor implements EntryPoint { public void onModuleLoad() { diff --git a/src/main/java/org/gcube/portlets/admin/ishealthmonitor/server/ISMonitorServiceImpl.java b/src/main/java/org/gcube/portlets/admin/ishealthmonitor/server/ISMonitorServiceImpl.java index 4969c2b..0ad4986 100644 --- a/src/main/java/org/gcube/portlets/admin/ishealthmonitor/server/ISMonitorServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/ishealthmonitor/server/ISMonitorServiceImpl.java @@ -3,12 +3,13 @@ package org.gcube.portlets.admin.ishealthmonitor.server; import java.util.ArrayList; import java.util.HashMap; -import org.gcube.common.core.scope.GCUBEScope; -import org.gcube.common.core.utils.logging.GCUBEClientLog; +import org.gcube.common.scope.impl.ScopeBean; import org.gcube.portlets.admin.ishealthmonitor.client.async.ISMonitorService; import org.gcube.resourcemanagement.support.server.gcube.CacheManager; import org.gcube.resourcemanagement.support.server.gcube.ISClientRequester; import org.gcube.resourcemanagement.support.server.managers.scope.ScopeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -18,7 +19,7 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; @SuppressWarnings("serial") public class ISMonitorServiceImpl extends RemoteServiceServlet implements ISMonitorService { - static GCUBEClientLog _log = new GCUBEClientLog(ISMonitorServiceImpl.class); + private static final Logger _log = LoggerFactory.getLogger(ISMonitorServiceImpl.class); @Override @@ -26,9 +27,7 @@ public class ISMonitorServiceImpl extends RemoteServiceServlet implements ISMoni CacheManager cm = new CacheManager(); cm.setUseCache(false); try { - GCUBEScope gscope = ScopeManager.getScope(scope); - - //GCUBEScope gscope = GCUBEScope.getScope(scope); + ScopeBean gscope = ScopeManager.getScope(scope); HashMap> results = ISClientRequester.getResourcesTree(cm, gscope); return results; } catch (Exception e) {