From 53b727427aa6a254f34c5424b5623daee95f7c60 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 30 Oct 2013 14:33:41 +0000
Subject: [PATCH] Fixed resource

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@84669 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                       | 75 +++++++++----------
 ...let.gwt.xml => tabulardataportlet.gwt.xml} |  4 +-
 src/main/webapp/TabularDataPortlet.html       |  4 +-
 .../WEB-INF/jsp/TabularDataPortlet_view.jsp   |  4 +-
 src/main/webapp/WEB-INF/web.xml               | 24 +++---
 5 files changed, 54 insertions(+), 57 deletions(-)
 rename src/main/resources/org/gcube/portlets/user/td/{TabularDataPortlet.gwt.xml => tabulardataportlet.gwt.xml} (94%)

diff --git a/pom.xml b/pom.xml
index d3815de..dc4e1ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,15 +15,15 @@
 	<artifactId>tabular-data-portlet</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>war</packaging>
-	
+
 	<name>tabular-data-portlet</name>
 	<description>tabular-data-portlet manages tabular data</description>
 
 	<scm>
 		<url>https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet</url>
 	</scm>
-	
-	
+
+
 	<developers>
 		<developer>
 			<name>Giancarlo Panichi</name>
@@ -35,8 +35,8 @@
 			</roles>
 		</developer>
 	</developers>
-	
-	
+
+
 	<properties>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
@@ -44,7 +44,7 @@
 		<templatesDirectory>templates</templatesDirectory>
 		<distroDirectory>distro</distroDirectory>
 		<configDirectory>config</configDirectory>
-		
+
 		<!-- Convenience property to set the GWT version -->
 		<gwtVersion>2.5.1</gwtVersion>
 
@@ -136,15 +136,15 @@
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
-		<!-- TD Source --> 
+		<!-- TD Source -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-widget-td-source</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]</version>
 		</dependency>
 
-		
-		
+
+
 		<!-- Apache Common Library -->
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -166,7 +166,7 @@
 			<groupId>org.gcube.common</groupId>
 			<artifactId>csv4j</artifactId>
 			<version>[1.2.0-SNAPSHOT, 2.0.0-common)</version>
-		</dependency>		
+		</dependency>
 
 		<!-- tabular-data-csv-import-widget -->
 		<dependency>
@@ -174,7 +174,7 @@
 			<artifactId>tabular-data-csv-import-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<!-- tabular-data-sdmx-import-widget -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@@ -182,13 +182,9 @@
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
-		<!-- tabular-data-sdmx-export-widget
-		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>tabular-data-sdmx-export-widget</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-		</dependency>
-		-->
+		<!-- tabular-data-sdmx-export-widget <dependency> <groupId>org.gcube.portlets.user</groupId> 
+			<artifactId>tabular-data-sdmx-export-widget</artifactId> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> 
+			</dependency> -->
 
 		<!-- tabular-data-open-widget -->
 		<dependency>
@@ -196,14 +192,14 @@
 			<artifactId>tabular-data-open-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-	
+
 		<!--tabular-data-information-widget -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-information-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<!-- tabular-data-gwt-service -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@@ -211,19 +207,12 @@
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
-	
 
-		<!-- Home Library 
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-jcr</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library</artifactId>
-		</dependency>
-		-->
-		
+
+		<!-- Home Library <dependency> <groupId>org.gcube.common</groupId> <artifactId>home-library-jcr</artifactId> 
+			</dependency> <dependency> <groupId>org.gcube.common</groupId> <artifactId>home-library</artifactId> 
+			</dependency> -->
+
 		<!-- LOGGING -->
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
@@ -234,8 +223,8 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-		
-		
+
+
 		<!-- JUnit TEST -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -249,6 +238,14 @@
 	<build>
 		<!-- Generate compiled stuff in the folder used for developing mode -->
 		<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*.*</include>
+				</includes>
+			</resource>
+		</resources>
 		<plugins>
 
 			<!-- GWT Maven Plugin -->
@@ -267,7 +264,7 @@
 				<configuration>
 					<runTarget>TabularDataPortlet.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
-					<module>org.gcube.portlets.user.td.TabularDataPortlet</module>
+					<module>org.gcube.portlets.user.td.tabulardataportlet</module>
 				</configuration>
 			</plugin>
 
@@ -302,8 +299,8 @@
 					</dependency>
 				</dependencies>
 			</plugin>
-			
-			
+
+
 			<!-- Maven -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -391,8 +388,8 @@
 					</execution>
 				</executions>
 			</plugin>
-			
-			
+
+
 		</plugins>
 	</build>
 
diff --git a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
similarity index 94%
rename from src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
rename to src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index 3333b24..6cd3a46 100644
--- a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module rename-to='TabularDataPortlet'>
+<module rename-to='tabulardataportlet'>
 
 	<inherits name='com.google.gwt.user.User' />
 
@@ -27,7 +27,7 @@
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
 
-	<set-property name="log_DivLogger" value="ENABLED" />
+	<set-property name="log_DivLogger" value="DISABLED" />
 	<set-property name="log_ConsoleLogger" value="ENABLED" />
 	<set-property name="log_FirebugLogger" value="ENABLED" />
 	<set-property name="log_GWTLogger" value="ENABLED" />
diff --git a/src/main/webapp/TabularDataPortlet.html b/src/main/webapp/TabularDataPortlet.html
index cacb0e7..8f649fd 100644
--- a/src/main/webapp/TabularDataPortlet.html
+++ b/src/main/webapp/TabularDataPortlet.html
@@ -7,7 +7,7 @@
     <!--                                                               -->
     <!-- Consider inlining CSS to reduce the number of requested files -->
     <!--                                                               -->
-    <link rel="stylesheet" type="text/css" href="TabularDataPortlet/reset.css" />
+    <link rel="stylesheet" type="text/css" href="tabulardataportlet/reset.css" />
     <link type="text/css" rel="stylesheet" href="TabularDataPortlet.css">
 
     <!--                                           -->
@@ -20,7 +20,7 @@
     <!-- If you add any GWT meta tags, they must   -->
     <!-- be added before this line.                -->
     <!--                                           -->
-    <script type="text/javascript" language="javascript" src="TabularDataPortlet/TabularDataPortlet.nocache.js"></script>
+    <script type="text/javascript" language="javascript" src="tabulardataportlet/tabulardataportlet.nocache.js"></script>
     <!-- <link rel="stylesheet" type="text/css" href="gxt/css/gxt-all.css" /> -->
 
   </head>
diff --git a/src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp b/src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp
index a87b38b..e6b047e 100644
--- a/src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp
+++ b/src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp
@@ -4,10 +4,10 @@
 <!--                                           -->
 <!-- The module reference below is the link    -->
 <!-- between html and your Web Toolkit module  -->		                                      
-<link rel="stylesheet" href="<%= request.getContextPath()%>/TabularDataPortlet/reset.css" type="text/css"/>
+<link rel="stylesheet" href="<%= request.getContextPath()%>/tabulardataportlet/reset.css" type="text/css"/>
 <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/gxt/css/gxt-all.css" />
 <link rel="stylesheet" href="<%= request.getContextPath()%>/TabularDataPortlet.css" type="text/css">
-<script src='<%=request.getContextPath()%>/TabularDataPortlet/TabularDataPortlet.nocache.js'></script>
+<script src='<%=request.getContextPath()%>/tabulardataportlet/tabulardataportlet.nocache.js'></script>
 
 <div id="tdp" style="width: 100%; height: 100%">
 </div>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 8247abc..9e9df21 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -80,72 +80,72 @@
 	<!-- Servlets  Mapping-->
 	<servlet-mapping>
 		<servlet-name>tdservlet</servlet-name>
-		<url-pattern>/TabularDataPortlet/tds</url-pattern>
+		<url-pattern>/tabulardataportlet/tds</url-pattern>
 	</servlet-mapping>
 
 	<!-- TDWidget -->
 
 	<servlet-mapping>
 		<servlet-name>tdwService</servlet-name>
-		<url-pattern>/TabularDataPortlet/tdw</url-pattern>
+		<url-pattern>/tabulardataportlet/tdw</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>tdwServlet</servlet-name>
-		<url-pattern>/TabularDataPortlet/tdwdata</url-pattern>
+		<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
 	</servlet-mapping>
 
 	<!-- TD GXTService -->	
 	<servlet-mapping>
 		<servlet-name>TDGWTService</servlet-name>
-		<url-pattern>/TabularDataPortlet/TDGWTService</url-pattern>
+		<url-pattern>/tabulardataportlet/TDGWTService</url-pattern>
 	</servlet-mapping>
 	
 
 	<!-- CSV IMPORT WIZARD -->
 		<servlet-mapping>
 		<servlet-name>CSVImportFileServlet</servlet-name>
-		<url-pattern>/TabularDataPortlet/CSVImportFileServlet</url-pattern>
+		<url-pattern>/tabulardataportlet/CSVImportFileServlet</url-pattern>
 	</servlet-mapping>
 	
 	<servlet-mapping>
 		<servlet-name>LocalUploadServlet</servlet-name>
-		<url-pattern>/TabularDataPortlet/LocalUploadServlet</url-pattern>
+		<url-pattern>/tabulardataportlet/LocalUploadServlet</url-pattern>
 	</servlet-mapping>
 	
 	
 	<servlet-mapping>
 		<servlet-name>imageServlet</servlet-name>
-		<url-pattern>/TabularDataPortlet/ImageService</url-pattern>
+		<url-pattern>/tabulardataportlet/ImageService</url-pattern>
 	</servlet-mapping>
 
 
 	<!-- Workspace Light Tree -->
 	<servlet-mapping>
 		<servlet-name>WorkspaceLightService</servlet-name>
-		<url-pattern>/TabularDataPortlet/WorkspaceLightService</url-pattern>
+		<url-pattern>/tabulardataportlet/WorkspaceLightService</url-pattern>
 	</servlet-mapping>
 
 	<!-- CSV Import Wizard Workspace -->
 	<servlet-mapping>
 		<servlet-name>CSVImportServiceWorkspace</servlet-name>
-		<url-pattern>/TabularDataPortlet/CSVImportServiceWorkspace</url-pattern>
+		<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>downloadServlet</servlet-name>
-		<url-pattern>/TabularDataPortlet/DownloadService</url-pattern>
+		<url-pattern>/tabulardataportlet/DownloadService</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>gWTWorkspaceServiceImpl</servlet-name>
-		<url-pattern>/TabularDataPortlet/WorkspaceService</url-pattern>
+		<url-pattern>/tabulardataportlet/WorkspaceService</url-pattern>
 	</servlet-mapping>
 
 
 	<servlet-mapping>
 		<servlet-name>uploadServlet</servlet-name>
-		<url-pattern>/TabularDataPortlet/UploadService</url-pattern>
+		<url-pattern>/tabulardataportlet/UploadService</url-pattern>
 	</servlet-mapping>
 	
 	<!-- Default page to serve -->