From 461cd63ad6e34105034afd5648ba413ff55f3e10 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 25 Mar 2019 10:50:16 +0000 Subject: [PATCH] just minor fixed about gwt and web.xml git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@178679 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 2 + .project | 11 ++++ .../com.gwtplugins.gdt.eclipse.core.prefs | 4 ++ .settings/org.eclipse.jdt.core.prefs | 1 + .settings/org.eclipse.wst.common.component | 5 +- ....eclipse.wst.common.project.facet.core.xml | 1 + .../GCubeCkanDataCatalog.gwt.xml | 9 ++-- .../GCubeCkanDataCatalog.gwt.xml | 9 ++-- src/main/webapp/WEB-INF/web.xml | 16 +++--- .../client/GwtTestGCubeCkanDataCatalog.java | 52 +++++++++---------- 10 files changed, 65 insertions(+), 45 deletions(-) create mode 100644 .settings/com.gwtplugins.gdt.eclipse.core.prefs diff --git a/.classpath b/.classpath index 3fa75a2..18bf258 100644 --- a/.classpath +++ b/.classpath @@ -8,6 +8,7 @@ + @@ -26,6 +27,7 @@ + diff --git a/.project b/.project index d2ecc22..bde26e8 100644 --- a/.project +++ b/.project @@ -35,6 +35,16 @@ + + com.gwtplugins.gdt.eclipse.core.webAppProjectValidator + + + + + com.gwtplugins.gwt.eclipse.core.gwtProjectValidator + + + org.eclipse.m2e.core.maven2Builder @@ -50,5 +60,6 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature com.google.gwt.eclipse.core.gwtNature + com.gwtplugins.gwt.eclipse.core.gwtNature diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs new file mode 100644 index 0000000..0ed6330 --- /dev/null +++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +lastWarOutDir=/home/francesco-mangiacrapa/eclipse-workspace/gcube-ckan-datacatalog-TRUNK/target/gcube-ckan-datacatalog-1.6.0-SNAPSHOT +warSrcDir=src/main/webapp +warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index b257af7..a5c7673 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.7 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.release=disabled org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 5fe3680..daf01d3 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,9 +1,12 @@ - + + + uses + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 9df8272..ff36a27 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -5,4 +5,5 @@ + diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml index 17c7d19..627d610 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml @@ -13,11 +13,6 @@ - - - - @@ -26,6 +21,10 @@ + + + diff --git a/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml b/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml index 17c7d19..627d610 100644 --- a/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml +++ b/src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml @@ -13,11 +13,6 @@ - - - - @@ -26,6 +21,10 @@ + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index be8f1bf..24ff74a 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -34,10 +34,10 @@ - - checkServlet - org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl - + + + + ckanpublisherservices @@ -79,10 +79,10 @@ - - checkServlet - /gCubeCkanDataCatalog/checksession - + + + + diff --git a/src/test/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GwtTestGCubeCkanDataCatalog.java b/src/test/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GwtTestGCubeCkanDataCatalog.java index 17a830c..bb8f905 100644 --- a/src/test/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GwtTestGCubeCkanDataCatalog.java +++ b/src/test/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GwtTestGCubeCkanDataCatalog.java @@ -1,26 +1,26 @@ -package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client; - -import com.google.gwt.junit.client.GWTTestCase; - -/** - * GWT JUnit integration tests must extend GWTTestCase. - * Using "GwtTest*" naming pattern exclude them from running with - * surefire during the test phase. - * - * If you run the tests using the Maven command line, you will have to - * navigate with your browser to a specific url given by Maven. - * See https://gwt-maven-plugin.github.io/gwt-maven-plugin/user-guide/testing.html - * for details. - */ -public class GwtTestGCubeCkanDataCatalog extends GWTTestCase { - - /** - * Must refer to a valid module that sources this class. - */ - public String getModuleName() { - return "org.gcube.portlets.gcubeckan.gcubeckandatacatalog.GCubeCkanDataCatalogJUnit"; - } - - - -} +//package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client; +// +//import com.google.gwt.junit.client.GWTTestCase; +// +///** +// * GWT JUnit integration tests must extend GWTTestCase. +// * Using "GwtTest*" naming pattern exclude them from running with +// * surefire during the test phase. +// * +// * If you run the tests using the Maven command line, you will have to +// * navigate with your browser to a specific url given by Maven. +// * See https://gwt-maven-plugin.github.io/gwt-maven-plugin/user-guide/testing.html +// * for details. +// */ +//public class GwtTestGCubeCkanDataCatalog extends GWTTestCase { +// +// /** +// * Must refer to a valid module that sources this class. +// */ +// public String getModuleName() { +// return "org.gcube.portlets.gcubeckan.gcubeckandatacatalog.GCubeCkanDataCatalogJUnit"; +// } +// +// +// +//}