From 2bddf45b4491260a30fdf1a196a5ebc78d065317 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 10 Jul 2015 10:41:35 +0000
Subject: [PATCH] Upgraded to GWT 2.6.1 Integrated with Workspace Explorer

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@117155 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                            |  4 ++--
 .settings/org.eclipse.wst.common.component            |  2 +-
 .../user/speciesdiscovery/SpeciesDiscovery.gwt.xml    | 11 +++++++----
 src/main/webapp/WEB-INF/jsp/SpeciesDiscovery_view.jsp |  4 +++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.classpath b/.classpath
index 3139190..450f33e 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="lib" path="/home/francesco-mangiacrapa/libraries/asm-5.0.3/lib/asm-5.0.3.jar"/>
-	<classpathentry kind="src" output="target/species-discovery-3.7.3-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/species-discovery-3.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/species-discovery-3.7.3-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/species-discovery-3.8.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 33ed388..c67934f 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,7 @@
         <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="workspace-light-tree-2.14.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-light-tree-TRUNK/workspace-light-tree-TRUNK">
+        <dependent-module archiveName="gis-viewer-3.7.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gis-viewer-TRUNK/gis-viewer-TRUNK">
             <dependency-type>uses</dependency-type>
         </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
diff --git a/src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml b/src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml
index e6037ba..cd8dcb2 100644
--- a/src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml
@@ -2,8 +2,9 @@
 <module rename-to='speciesdiscovery'>
 
 	<inherits name='com.google.gwt.user.User' />
-	<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
 	
+	<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
+
 	<!-- Other module inherits -->
 	<inherits name="com.extjs.gxt.ui.GXT" />
 	<inherits name="org.gcube.portlets.user.gcubegisviewer.GCubeGisViewer" />
@@ -11,11 +12,13 @@
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
 	<set-property name="log_DivLogger" value="DISABLED" />
 
-<!-- 	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' /> -->
-<!-- 	<inherits name='com.google.gwt.query.Query'/> -->
+	<!-- <inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' 
+		/> -->
+	<!-- <inherits name='com.google.gwt.query.Query'/> -->
 
 	<!-- Specify the app entry point class. -->
-	<entry-point class='org.gcube.portlets.user.speciesdiscovery.client.SpeciesDiscovery' />
+	<entry-point
+		class='org.gcube.portlets.user.speciesdiscovery.client.SpeciesDiscovery' />
 
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />
diff --git a/src/main/webapp/WEB-INF/jsp/SpeciesDiscovery_view.jsp b/src/main/webapp/WEB-INF/jsp/SpeciesDiscovery_view.jsp
index 0e55e47..fb5aad8 100644
--- a/src/main/webapp/WEB-INF/jsp/SpeciesDiscovery_view.jsp
+++ b/src/main/webapp/WEB-INF/jsp/SpeciesDiscovery_view.jsp
@@ -4,7 +4,9 @@
 <!--                                           -->
 <!-- The module reference below is the link    -->
 <!-- between html and your Web Toolkit module  -->		
-                                           
+                         
+<script src='<%=request.getContextPath()%>/speciesdiscovery/js/jquery-1.10.1.min.js'></script>
+<script src='<%=request.getContextPath()%>/speciesdiscovery/js/bootstrap.min.js'></script>                                       
 <script src='<%=request.getContextPath()%>/speciesdiscovery/speciesdiscovery.nocache.js'></script>
     
 <link rel="stylesheet" href="<%= request.getContextPath()%>/SpeciesDiscovery.css" type="text/css">