From 43a7619eaebeec1964ee436592063a281e7de419 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 2 Dec 2014 18:35:49 +0000
Subject: [PATCH] added host to the grid columns for service endpoint resources
 in support library

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@101848 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                  | 4 ++--
 .settings/com.google.gdt.eclipse.core.prefs | 2 +-
 .settings/org.eclipse.wst.common.component  | 3 ---
 pom.xml                                     | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.classpath b/.classpath
index d3ac06f..219141f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-5.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-5.2.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -36,5 +36,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/resource-management-5.2.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/resource-management-5.2.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 7387db6..01bcb5f 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.2.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.2.1-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index fc9c798..b769cb7 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,9 +3,6 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module archiveName="rmp-common-library-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="resource-management"/>
   </wb-module>
diff --git a/pom.xml b/pom.xml
index 3951a3d..b84ccfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>resource-management</artifactId>
-	<version>5.2.0-SNAPSHOT</version>
+	<version>5.2.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>
@@ -278,7 +278,7 @@
 				<!-- Plugin configuration. There are many available options, see gwt-maven-plugin 
 					documentation at codehaus.org -->
 				<configuration>
-					<extraJvmArgs>-Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION}</extraJvmArgs>
+					<extraJvmArgs>-Xmx512M -DGLOBUS_LOCATION=${GLOBUS_LOCATION} -Dlog4j.configuration=clientlog4j.properties</extraJvmArgs>
 					<runTarget>ResourceManagementPortlet.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
 					<!-- <logLevel>DEBUG</logLevel> -->