Fixed resource

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@84669 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-10-30 14:33:41 +00:00
parent 544b42399d
commit 53b727427a
5 changed files with 54 additions and 57 deletions

75
pom.xml
View File

@ -15,15 +15,15 @@
<artifactId>tabular-data-portlet</artifactId> <artifactId>tabular-data-portlet</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>tabular-data-portlet</name> <name>tabular-data-portlet</name>
<description>tabular-data-portlet manages tabular data</description> <description>tabular-data-portlet manages tabular data</description>
<scm> <scm>
<url>https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet</url> <url>https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet</url>
</scm> </scm>
<developers> <developers>
<developer> <developer>
<name>Giancarlo Panichi</name> <name>Giancarlo Panichi</name>
@ -35,8 +35,8 @@
</roles> </roles>
</developer> </developer>
</developers> </developers>
<properties> <properties>
<distroDirectory>${project.basedir}/distro</distroDirectory> <distroDirectory>${project.basedir}/distro</distroDirectory>
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory> <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
@ -44,7 +44,7 @@
<templatesDirectory>templates</templatesDirectory> <templatesDirectory>templates</templatesDirectory>
<distroDirectory>distro</distroDirectory> <distroDirectory>distro</distroDirectory>
<configDirectory>config</configDirectory> <configDirectory>config</configDirectory>
<!-- Convenience property to set the GWT version --> <!-- Convenience property to set the GWT version -->
<gwtVersion>2.5.1</gwtVersion> <gwtVersion>2.5.1</gwtVersion>
@ -136,15 +136,15 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- TD Source --> <!-- TD Source -->
<dependency> <dependency>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-widget-td-source</artifactId> <artifactId>tabular-data-widget-td-source</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]</version> <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]</version>
</dependency> </dependency>
<!-- Apache Common Library --> <!-- Apache Common Library -->
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
@ -166,7 +166,7 @@
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>csv4j</artifactId> <artifactId>csv4j</artifactId>
<version>[1.2.0-SNAPSHOT, 2.0.0-common)</version> <version>[1.2.0-SNAPSHOT, 2.0.0-common)</version>
</dependency> </dependency>
<!-- tabular-data-csv-import-widget --> <!-- tabular-data-csv-import-widget -->
<dependency> <dependency>
@ -174,7 +174,7 @@
<artifactId>tabular-data-csv-import-widget</artifactId> <artifactId>tabular-data-csv-import-widget</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- tabular-data-sdmx-import-widget --> <!-- tabular-data-sdmx-import-widget -->
<dependency> <dependency>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
@ -182,13 +182,9 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- tabular-data-sdmx-export-widget <!-- tabular-data-sdmx-export-widget <dependency> <groupId>org.gcube.portlets.user</groupId>
<dependency> <artifactId>tabular-data-sdmx-export-widget</artifactId> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
<groupId>org.gcube.portlets.user</groupId> </dependency> -->
<artifactId>tabular-data-sdmx-export-widget</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
-->
<!-- tabular-data-open-widget --> <!-- tabular-data-open-widget -->
<dependency> <dependency>
@ -196,14 +192,14 @@
<artifactId>tabular-data-open-widget</artifactId> <artifactId>tabular-data-open-widget</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!--tabular-data-information-widget --> <!--tabular-data-information-widget -->
<dependency> <dependency>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-information-widget</artifactId> <artifactId>tabular-data-information-widget</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- tabular-data-gwt-service --> <!-- tabular-data-gwt-service -->
<dependency> <dependency>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
@ -211,19 +207,12 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- Home Library
<dependency> <!-- Home Library <dependency> <groupId>org.gcube.common</groupId> <artifactId>home-library-jcr</artifactId>
<groupId>org.gcube.common</groupId> </dependency> <dependency> <groupId>org.gcube.common</groupId> <artifactId>home-library</artifactId>
<artifactId>home-library-jcr</artifactId> </dependency> -->
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
</dependency>
-->
<!-- LOGGING --> <!-- LOGGING -->
<dependency> <dependency>
<groupId>com.allen-sauer.gwt.log</groupId> <groupId>com.allen-sauer.gwt.log</groupId>
@ -234,8 +223,8 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
<!-- JUnit TEST --> <!-- JUnit TEST -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -249,6 +238,14 @@
<build> <build>
<!-- Generate compiled stuff in the folder used for developing mode --> <!-- Generate compiled stuff in the folder used for developing mode -->
<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory> <outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.*</include>
</includes>
</resource>
</resources>
<plugins> <plugins>
<!-- GWT Maven Plugin --> <!-- GWT Maven Plugin -->
@ -267,7 +264,7 @@
<configuration> <configuration>
<runTarget>TabularDataPortlet.html</runTarget> <runTarget>TabularDataPortlet.html</runTarget>
<hostedWebapp>${webappDirectory}</hostedWebapp> <hostedWebapp>${webappDirectory}</hostedWebapp>
<module>org.gcube.portlets.user.td.TabularDataPortlet</module> <module>org.gcube.portlets.user.td.tabulardataportlet</module>
</configuration> </configuration>
</plugin> </plugin>
@ -302,8 +299,8 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<!-- Maven --> <!-- Maven -->
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
@ -391,8 +388,8 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module rename-to='TabularDataPortlet'> <module rename-to='tabulardataportlet'>
<inherits name='com.google.gwt.user.User' /> <inherits name='com.google.gwt.user.User' />
@ -27,7 +27,7 @@
<!-- Specify the app entry point class. --> <!-- Specify the app entry point class. -->
<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' /> <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_ConsoleLogger" value="ENABLED" />
<set-property name="log_FirebugLogger" value="ENABLED" /> <set-property name="log_FirebugLogger" value="ENABLED" />
<set-property name="log_GWTLogger" value="ENABLED" /> <set-property name="log_GWTLogger" value="ENABLED" />

View File

@ -7,7 +7,7 @@
<!-- --> <!-- -->
<!-- Consider inlining CSS to reduce the number of requested files --> <!-- 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"> <link type="text/css" rel="stylesheet" href="TabularDataPortlet.css">
<!-- --> <!-- -->
@ -20,7 +20,7 @@
<!-- If you add any GWT meta tags, they must --> <!-- If you add any GWT meta tags, they must -->
<!-- be added before this line. --> <!-- 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" /> --> <!-- <link rel="stylesheet" type="text/css" href="gxt/css/gxt-all.css" /> -->
</head> </head>

View File

@ -4,10 +4,10 @@
<!-- --> <!-- -->
<!-- The module reference below is the link --> <!-- The module reference below is the link -->
<!-- between html and your Web Toolkit module --> <!-- 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" type="text/css" href="<%=request.getContextPath()%>/gxt/css/gxt-all.css" />
<link rel="stylesheet" href="<%= request.getContextPath()%>/TabularDataPortlet.css" type="text/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 id="tdp" style="width: 100%; height: 100%">
</div> </div>

View File

@ -80,72 +80,72 @@
<!-- Servlets Mapping--> <!-- Servlets Mapping-->
<servlet-mapping> <servlet-mapping>
<servlet-name>tdservlet</servlet-name> <servlet-name>tdservlet</servlet-name>
<url-pattern>/TabularDataPortlet/tds</url-pattern> <url-pattern>/tabulardataportlet/tds</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- TDWidget --> <!-- TDWidget -->
<servlet-mapping> <servlet-mapping>
<servlet-name>tdwService</servlet-name> <servlet-name>tdwService</servlet-name>
<url-pattern>/TabularDataPortlet/tdw</url-pattern> <url-pattern>/tabulardataportlet/tdw</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>tdwServlet</servlet-name> <servlet-name>tdwServlet</servlet-name>
<url-pattern>/TabularDataPortlet/tdwdata</url-pattern> <url-pattern>/tabulardataportlet/tdwdata</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- TD GXTService --> <!-- TD GXTService -->
<servlet-mapping> <servlet-mapping>
<servlet-name>TDGWTService</servlet-name> <servlet-name>TDGWTService</servlet-name>
<url-pattern>/TabularDataPortlet/TDGWTService</url-pattern> <url-pattern>/tabulardataportlet/TDGWTService</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- CSV IMPORT WIZARD --> <!-- CSV IMPORT WIZARD -->
<servlet-mapping> <servlet-mapping>
<servlet-name>CSVImportFileServlet</servlet-name> <servlet-name>CSVImportFileServlet</servlet-name>
<url-pattern>/TabularDataPortlet/CSVImportFileServlet</url-pattern> <url-pattern>/tabulardataportlet/CSVImportFileServlet</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>LocalUploadServlet</servlet-name> <servlet-name>LocalUploadServlet</servlet-name>
<url-pattern>/TabularDataPortlet/LocalUploadServlet</url-pattern> <url-pattern>/tabulardataportlet/LocalUploadServlet</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>imageServlet</servlet-name> <servlet-name>imageServlet</servlet-name>
<url-pattern>/TabularDataPortlet/ImageService</url-pattern> <url-pattern>/tabulardataportlet/ImageService</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- Workspace Light Tree --> <!-- Workspace Light Tree -->
<servlet-mapping> <servlet-mapping>
<servlet-name>WorkspaceLightService</servlet-name> <servlet-name>WorkspaceLightService</servlet-name>
<url-pattern>/TabularDataPortlet/WorkspaceLightService</url-pattern> <url-pattern>/tabulardataportlet/WorkspaceLightService</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- CSV Import Wizard Workspace --> <!-- CSV Import Wizard Workspace -->
<servlet-mapping> <servlet-mapping>
<servlet-name>CSVImportServiceWorkspace</servlet-name> <servlet-name>CSVImportServiceWorkspace</servlet-name>
<url-pattern>/TabularDataPortlet/CSVImportServiceWorkspace</url-pattern> <url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>downloadServlet</servlet-name> <servlet-name>downloadServlet</servlet-name>
<url-pattern>/TabularDataPortlet/DownloadService</url-pattern> <url-pattern>/tabulardataportlet/DownloadService</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>gWTWorkspaceServiceImpl</servlet-name> <servlet-name>gWTWorkspaceServiceImpl</servlet-name>
<url-pattern>/TabularDataPortlet/WorkspaceService</url-pattern> <url-pattern>/tabulardataportlet/WorkspaceService</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>uploadServlet</servlet-name> <servlet-name>uploadServlet</servlet-name>
<url-pattern>/TabularDataPortlet/UploadService</url-pattern> <url-pattern>/tabulardataportlet/UploadService</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- Default page to serve --> <!-- Default page to serve -->