From 3f6b646e1021e6e21793a2ee35eaccdec1c5f0bc Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 6 Jul 2016 12:33:13 +0000
Subject: [PATCH] Upgraded to gwt 2.6.1 Integrated with Workspace Explorer
 Updated to Liferay 6.2

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@130009 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../org.eclipse.wst.common.project.facet.core.xml    |  2 +-
 distro/changelog.xml                                 |  2 ++
 pom.xml                                              | 12 ++++++------
 src/main/webapp/WEB-INF/liferay-display.xml          |  6 +++---
 src/main/webapp/WEB-INF/liferay-portlet.xml          |  5 +++--
 src/main/webapp/WEB-INF/portlet.xml                  |  4 ++--
 src/main/webapp/WEB-INF/web.xml                      |  8 ++++----
 7 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index cbdb4bc..22270b5 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,8 +2,8 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="jst.web" version="2.5"/>
   <installed facet="java" version="1.7"/>
   <installed facet="jpt.jpa" version="2.0"/>
   <installed facet="liferay.portlet" version="6.0"/>
+  <installed facet="jst.web" version="3.0"/>
 </faceted-project>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 0f58c38..7689800 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -5,6 +5,8 @@
 		</Change>
 		<Change>Integrated with Workspace Explorer
 		</Change>
+		<Change>Updated to Liferay 6.2
+		</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets-user.species-discovery.3-7-2"
 		date="15-05-2015">
diff --git a/pom.xml b/pom.xml
index c499d7e..0e07e98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,12 +135,12 @@
 		</dependency>
 
 		<!-- WSLT dependencies -->
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>workspace-light-tree</artifactId>
-			<version>[2.13.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.gcube.portlets.widgets</groupId> -->
+<!-- 			<artifactId>workspace-light-tree</artifactId> -->
+<!-- 			<version>[2.13.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> -->
+<!-- 			<scope>compile</scope> -->
+<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index d350a0a..e63f712 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 5.2.0//EN" "http://www.liferay.com/dtd/liferay-display_5_2_0.dtd">
-
+ <!DOCTYPE display PUBLIC "-//Liferay//DTD Display 6.2.0//EN" 
+  "http://www.liferay.com/dtd/liferay-display_6_2_0.dtd">
+  
 <display>
      <category name="gCube Applications">
         <portlet id="SpeciesDiscovery" />
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index 8e3168d..4381a58 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 5.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_5_2_0.dtd">
-
+<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" 
+  "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
+  
 <liferay-portlet-app>
 <portlet>
      <portlet-name>SpeciesDiscovery</portlet-name>
diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml
index 3e9d2ac..c8c3427 100644
--- a/src/main/webapp/WEB-INF/portlet.xml
+++ b/src/main/webapp/WEB-INF/portlet.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' version='2.0'>
+<?xml version='1.0' encoding='UTF-8' ?>
+<portlet-app>
 	<portlet>
 		<description>SpeciesDiscovery</description>
 		<portlet-name>SpeciesDiscovery</portlet-name>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ba0336d..3b125ec 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-              http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5" xmlns="http://java.sun.com/xml/ns/javaee">
-
+          http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+	version="3.0">
+	
 	<!-- Servlets -->
 	<servlet>
 		<servlet-name>taxonomyServlet</servlet-name>