From 88a96961c15441edb42c6da120cf42be9c7fca9b Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Fri, 13 Sep 2013 13:31:50 +0000
Subject: [PATCH] IS Health Monitor integrated

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@81418 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                       | 20 ++++++++---------
 .../client/ResourceManagementPortlet.java     | 22 +++++++++----------
 src/main/resources/clientlog4j.properties     |  9 ++++++++
 .../ResourceManagementPortlet.gwt.xml         |  2 +-
 src/main/webapp/WEB-INF/web.xml               | 16 +++++++-------
 5 files changed, 39 insertions(+), 30 deletions(-)
 create mode 100644 src/main/resources/clientlog4j.properties

diff --git a/pom.xml b/pom.xml
index d803826..8f667e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,11 @@
 			<version>2.2.5</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.admin</groupId>
+			<artifactId>rmp-common-library</artifactId>
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
@@ -127,17 +132,13 @@
 			<version>[1.5.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<!-- External Modules -->
 		<dependency>
 			<groupId>org.gcube.portlets.admin</groupId>
-			<artifactId>rmp-common-library</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+			<artifactId>ishealth-monitor-widget</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
-		<!-- External Modules -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.portlets.admin</groupId> -->
-		<!-- <artifactId>ishealth-monitor-widget</artifactId> -->
-		<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
-		<!-- </dependency> -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.gcube.portlets.admin</groupId> -->
 		<!-- <artifactId>resource-sweeper-widget</artifactId> -->
@@ -266,8 +267,7 @@
 				<!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
 					documentation at codehaus.org -->
 				<configuration>
-					<extraJvmArgs>-Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION}
-						-classpath $CLASSPATH:${GLOBUS_LOCATION}</extraJvmArgs>
+					<extraJvmArgs>-Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION}</extraJvmArgs>
 					<runTarget>ResourceManagementPortlet.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
 					<!-- <logLevel>DEBUG</logLevel> -->
diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java
index 92250e2..57c6b1c 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java
+++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java
@@ -20,7 +20,7 @@ package org.gcube.portlets.admin.resourcemanagement.client;
 //import org.gcube.portlets.admin.client.forms.ActivationRecordVMForm;
 //import org.gcube.portlets.admin.client.forms.GenericResourceCMForm;
 //import org.gcube.portlets.admin.client.forms.GenericResourceTreeManagerForm;
-//import org.gcube.portlets.admin.ishealthmonitor.client.dialog.ISMonitor;
+import org.gcube.portlets.admin.ishealthmonitor.client.dialog.ISMonitor;
 import org.gcube.portlets.admin.resourcemanagement.client.forms.genericresources.DeployVirtualCollection;
 import org.gcube.portlets.admin.resourcemanagement.client.remote.ProxyRegistry;
 import org.gcube.portlets.admin.resourcemanagement.client.utils.Commands;
@@ -439,16 +439,16 @@ public class ResourceManagementPortlet implements EntryPoint {
 
 		MenuItem testIS = new MenuItem("Check IS Health") {
 			protected void onClick(final ComponentEvent be) {
-//				super.onClick(be);
-//				GWT.runAsync(ISMonitor.class, new RunAsyncCallback() {
-//					@Override
-//					public void onSuccess() {
-//						ISMonitor.pingIS();
-//					}
-//					public void onFailure(Throwable reason) {
-//						Window.alert("There are networks problem, please check your connection.");              
-//					}
-//				});
+				super.onClick(be);
+				GWT.runAsync(ISMonitor.class, new RunAsyncCallback() {
+					@Override
+					public void onSuccess() {
+						ISMonitor.pingIS();
+					}
+					public void onFailure(Throwable reason) {
+						Window.alert("There are networks problem, please check your connection.");              
+					}
+				});
 			};
 		};
 		testIS.setIconStyle("is-icon");
diff --git a/src/main/resources/clientlog4j.properties b/src/main/resources/clientlog4j.properties
new file mode 100644
index 0000000..b98f952
--- /dev/null
+++ b/src/main/resources/clientlog4j.properties
@@ -0,0 +1,9 @@
+log4j.rootLogger=DEBUG, A1
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+
+# Print the date in ISO 8601 format
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+# Print only messages of level TRACE or above in the package org.gcube
+log4j.logger.org.gcube=TRACE
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
index 5bff73d..a3bf36a 100644
--- a/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
@@ -14,7 +14,7 @@
 
 <!-- 	<inherits name='org.gcube.portlets.admin.Activation_record_widgets' /> -->
 		<!-- inherits IS Health Monitor Widget -->
-<!-- 	<inherits name='org.gcube.portlets.admin.ishealthmonitor.Resource_ishealth_monitor' /> -->
+	<inherits name='org.gcube.portlets.admin.ishealthmonitor.Resource_ishealth_monitor' />
 	
 	<inherits name='org.gcube.resourcemanagement.support.Resource_support' />
 	<entry-point
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 5e6d9be..babdf2a 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -41,15 +41,15 @@
 <!-- 	</listener> -->
 
 	<!-- IS Health -->
-<!-- 	<servlet> -->
-<!-- 		<servlet-name>isHealthServlet</servlet-name> -->
-<!-- 		<servlet-class>org.gcube.portlets.admin.ishealthmonitor.server.ISMonitorServiceImpl</servlet-class> -->
-<!-- 	</servlet> -->
+	<servlet>
+		<servlet-name>isHealthServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.admin.ishealthmonitor.server.ISMonitorServiceImpl</servlet-class>
+	</servlet>
 
-<!-- 	<servlet-mapping> -->
-<!-- 		<servlet-name>isHealthServlet</servlet-name> -->
-<!-- 		<url-pattern>/resourcemanagementportlet/ishealth</url-pattern> -->
-<!-- 	</servlet-mapping> -->
+	<servlet-mapping>
+		<servlet-name>isHealthServlet</servlet-name>
+		<url-pattern>/resourcemanagementportlet/ishealth</url-pattern>
+	</servlet-mapping>
 
 	<!-- Activation Record Widgets -->
 <!-- 	<servlet> -->