gCubeSystem
/
resource-management-portlet
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Massimiliano Assante 2013-09-13 13:31:50 +00:00
parent 3a26651d3d
commit 88a96961c1
5 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pom.xml
View File

@ -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> -->

22
src/main/java/org/gcube/portlets/admin/resourcemanagement/client/ResourceManagementPortlet.java
View File

@ -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");

9
src/main/resources/clientlog4j.properties Normal file
View File

@ -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

2
src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
View File

@ -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

16
src/main/webapp/WEB-INF/web.xml
View File

@ -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> -->