From 9837dcb120341e37766b851835031bd454457a2d Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Thu, 26 Jan 2017 10:50:28 +0000
Subject: [PATCH] ref:6548: TDM - Migrate TabMan to new PortalContext
 https://support.d4science.org/issues/6548

Updated to PortalContext

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@141808 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath           |  6 +++---
 distro/changelog.xml |  7 ++++++-
 pom.xml              | 10 +---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.classpath b/.classpath
index ec4d518..1897979 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-column-widget-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-column-widget-1.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/tabular-data-column-widget-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-column-widget-1.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -44,5 +44,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/tabular-data-column-widget-1.9.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-column-widget-1.10.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 3f59a93..a8518b1 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,11 +1,16 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-10-0"
+		date="2017-02-15">
+		<Change>Updated to new PortalContext [ticket #6548]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-9-0"
 		date="2015-10-15">
 		<Change>Fixed apply button on ChangeColumnTypePanel</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-8-0"
 		date="2015-07-03">
-		<Change>Allow the creation and use of expressions on multi column in TDM portlet[issue #81]</Change>
+		<Change>Allow the creation and use of expressions on multi column in
+			TDM portlet[issue #81]</Change>
 		<Change>Fixed dependencies</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.tabular-data-column-widget.1-7-0"
diff --git a/pom.xml b/pom.xml
index f6f0840..2ef7620 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-column-widget</artifactId>
-	<version>1.9.0-SNAPSHOT</version>
+	<version>1.10.0-SNAPSHOT</version>
 
 
 	<name>tabular-data-column-widget</name>
@@ -207,13 +207,6 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>gwt-maven-plugin</artifactId>
 				<version>${gwtVersion}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>resources</goal>
-						</goals>
-					</execution>
-				</executions>
 				<configuration>
 					<runTarget>ColumnWidget.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
@@ -224,7 +217,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2</version>
 				<configuration>
 					<descriptors>
 						<descriptor>${distroDirectory}/descriptor.xml</descriptor>