Minor updated

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widgetx@86901 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-12-12 17:32:30 +00:00 committed by Giancarlo Panichi
parent c9a18a9210
commit 227e334756
15 changed files with 168 additions and 10 deletions

27
.classpath Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/tabular-data-widgetx-1.0.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-widgetx-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/tabular-data-widgetx-1.0.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

23
.project Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>tabular-data-widgetx</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

View File

@ -0,0 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8

View File

@ -0,0 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7

View File

@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

31
config/profile.xml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<Resource>
<ID></ID>
<Type>Service</Type>
<Profile>
<Description>Widget that allows visualization of tabular data coming from different kind of sources
with the extended functionality for displaying menus</Description>
<Class>PortletsUser</Class>
<Name>tabular-data-widgetx</Name>
<Version>1.0.0</Version>
<Packages>
<Software>
<Description>Widget that allows visualization of tabular data coming from different kind of sources
with the extended functionality for displaying menus</Description>
<Name>tabular-data-widgetx</Name>
<Version>1.0.0-SNAPSHOT</Version>
<MavenCoordinates>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-widgetx</artifactId>
<version>1.0.0-SNAPSHOT</version>
</MavenCoordinates>
<Type>library</Type>
<Files>
<File>tabular-data-widgetx-1.0.0-SNAPSHOT.jar</File>
</Files>
</Software>
</Packages>
</Profile>
</Resource>

0
distro/INSTALL Normal file
View File

6
distro/LICENSE Normal file
View File

@ -0,0 +1,6 @@
gCube System - License
------------------------------------------------------------
The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl).
The software and documentation is provided by its authors/distributors "as is" and no expressed or
implied warranty is given for its use, quality or fitness for a particular case.

1
distro/MAINTAINERS Normal file
View File

@ -0,0 +1 @@
Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"

42
distro/README Normal file
View File

@ -0,0 +1,42 @@
The gCube System - tabular-data-widgetx
------------------------------------------------------------
This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2)
Authors
-------
Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa,
Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
Version and Release Date
------------------------
v. 1.0.0-SNAPSHOT (2013-12-12)
Description
-----------
Widget that allows visualization of tabular data coming from different kind of sources
with the extended functionality for displaying menus
Download information
--------------------
Source code URL: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widgetx
Documentation
-------------
Widget that allows visualization of tabular data coming from different kind of sources
with the extended functionality for displaying menus
Licensing
---------
This software is licensed under the terms you may find in the file named "LICENSE" in this directory.

6
distro/changelog.xml Normal file
View File

@ -0,0 +1,6 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-user.tabular-data-widgetx.1-0-0"
date="2013-12-12">
<Change>First Release</Change>
</Changeset>
</ReleaseNotes>

1
distro/svnpath.txt Normal file
View File

@ -0,0 +1 @@
https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widgetx

View File

@ -255,7 +255,7 @@ public class TabularDataXGridPanel extends ContentPanel {
if (grid == null) {
reader = new DataRowPagingReader(tableDefinition);
String path = GWT.getModuleBaseURL() + "tdwdata";
String path = GWT.getModuleBaseURL() + "tdwxdata";
RequestBuilder builder = new RequestBuilder(RequestBuilder.GET,
path);
builder.setHeader(ServletParameters.TD_SESSION_ID,

View File

@ -30,7 +30,7 @@ public class SessionUtil {
private static final Logger log = LoggerFactory.getLogger(SessionUtil.class);
public static final String TD_SESSIONS_ATTRIBUTE_NAME = "TDW.SESSIONS";
public static final String TDWX_SESSIONS_ATTRIBUTE_NAME = "TDWX.SESSIONS";
protected static ASLSession getSession(HttpSession httpSession)
{
@ -74,11 +74,11 @@ public class SessionUtil {
protected static TDSession getSession(ASLSession session, int tdSessionId)
{
//workaround to TDSession object loaded from different class loader
Object tsSession = session.getAttribute(TD_SESSIONS_ATTRIBUTE_NAME);
Object tsSession = session.getAttribute(TDWX_SESSIONS_ATTRIBUTE_NAME);
TDSessionList sessions = (tsSession instanceof TDSessionList)?((TDSessionList) tsSession):null;
if (sessions == null) {
sessions = new TDSessionList();
session.setAttribute(TD_SESSIONS_ATTRIBUTE_NAME, sessions);
session.setAttribute(TDWX_SESSIONS_ATTRIBUTE_NAME, sessions);
}
if (sessions.get(tdSessionId)==null) {
sessions.set(tdSessionId, new TDSession(tdSessionId));

View File

@ -8,25 +8,25 @@
<!-- TDWidget -->
<servlet>
<servlet-name>tdwService</servlet-name>
<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServiceImpl</servlet-class>
<servlet-name>tdwxService</servlet-name>
<servlet-class>org.gcube.portlets.user.tdwx.server.TabularDataXServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>tdwServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServlet</servlet-class>
<servlet-name>tdwxServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.tdwx.server.TabularDataXServlet</servlet-class>
</servlet>
<!-- TDWidget -->
<servlet-mapping>
<servlet-name>tdwService</servlet-name>
<servlet-name>tdwxService</servlet-name>
<url-pattern>/tabulardataportlet/tdwx</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>tdwServlet</servlet-name>
<servlet-name>tdwxServlet</servlet-name>
<url-pattern>/tabulardataportlet/tdwxdata</url-pattern>
</servlet-mapping>