gCubeSystem
/
gcube-ckan-datacatalog
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Francesco Mangiacrapa 2019-03-25 10:50:16 +00:00
parent ff0591d494
commit 461cd63ad6
10 changed files with 65 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -8,6 +8,7 @@
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes> <attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -26,6 +27,7 @@
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes> <attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>

11
.project
View File

@ -35,6 +35,16 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>com.gwtplugins.gdt.eclipse.core.webAppProjectValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.gwtplugins.gwt.eclipse.core.gwtProjectValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>
@ -50,5 +60,6 @@
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature> <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>com.google.gwt.eclipse.core.gwtNature</nature> <nature>com.google.gwt.eclipse.core.gwtNature</nature>
<nature>com.gwtplugins.gwt.eclipse.core.gwtNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

4
.settings/com.gwtplugins.gdt.eclipse.core.prefs Normal file
View File

@ -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

1
.settings/org.eclipse.jdt.core.prefs
View File

@ -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.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.7

5
.settings/org.eclipse.wst.common.component
View File

@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="gcube-ckan-datacatalog-portlet"> <wb-module deploy-name="gcube-ckan-datacatalog-1.6.0-SNAPSHOT">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <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="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="grsf-manage-widget-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-manage-widget-TRUNK/grsf-manage-widget-TRUNK">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="gcube-ckan-datacatalog"/> <property name="context-root" value="gcube-ckan-datacatalog"/>
<property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/> <property name="java-output-path" value="/gcube-ckan-datacatalog/target/gcube-ckan-datacatalog-1.0.0-SNAPSHOT/WEB-INF/classes"/>
</wb-module> </wb-module>

1
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -5,4 +5,5 @@
<installed facet="wst.jsdt.web" version="1.0"/> <installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="liferay.portlet" version="6.0"/> <installed facet="liferay.portlet" version="6.0"/>
<installed facet="java" version="1.7"/> <installed facet="java" version="1.7"/>
<installed facet="com.gwtplugins.gwt.facet" version="1.0"/>
</faceted-project> </faceted-project>

9
src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
View File

@ -13,11 +13,6 @@
<!-- Other module inherits --> <!-- Other module inherits -->
<inherits name="com.google.gwt.json.JSON" /> <inherits name="com.google.gwt.json.JSON" />
<!-- Specify the app entry point class. -->
<entry-point
class='org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.GCubeCkanDataCatalog' />
<!-- Inherits widget --> <!-- Inherits widget -->
<inherits <inherits
name='org.gcube.portlets_widgets.catalogue_sharing_widget.ShareCatalogue' /> name='org.gcube.portlets_widgets.catalogue_sharing_widget.ShareCatalogue' />
@ -26,6 +21,10 @@
<inherits name='org.gcube.datacatalogue.grsf_manage_widget.GRSFManageWidget' /> <inherits name='org.gcube.datacatalogue.grsf_manage_widget.GRSFManageWidget' />
<inherits name='org.gcube.datacatalogue.ckanutillibrary.CkanUtilLibrary' /> <inherits name='org.gcube.datacatalogue.ckanutillibrary.CkanUtilLibrary' />
<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' /> <inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
<!-- Specify the app entry point class. -->
<entry-point
class='org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.GCubeCkanDataCatalog' />
<!-- Specify the paths for translatable code --> <!-- Specify the paths for translatable code -->
<source path='client' /> <source path='client' />

9
src/main/resources/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/GCubeCkanDataCatalog.gwt.xml
View File

@ -13,11 +13,6 @@
<!-- Other module inherits --> <!-- Other module inherits -->
<inherits name="com.google.gwt.json.JSON" /> <inherits name="com.google.gwt.json.JSON" />
<!-- Specify the app entry point class. -->
<entry-point
class='org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.GCubeCkanDataCatalog' />
<!-- Inherits widget --> <!-- Inherits widget -->
<inherits <inherits
name='org.gcube.portlets_widgets.catalogue_sharing_widget.ShareCatalogue' /> name='org.gcube.portlets_widgets.catalogue_sharing_widget.ShareCatalogue' />
@ -26,6 +21,10 @@
<inherits name='org.gcube.datacatalogue.grsf_manage_widget.GRSFManageWidget' /> <inherits name='org.gcube.datacatalogue.grsf_manage_widget.GRSFManageWidget' />
<inherits name='org.gcube.datacatalogue.ckanutillibrary.CkanUtilLibrary' /> <inherits name='org.gcube.datacatalogue.ckanutillibrary.CkanUtilLibrary' />
<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' /> <inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
<!-- Specify the app entry point class. -->
<entry-point
class='org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client.GCubeCkanDataCatalog' />
<!-- Specify the paths for translatable code --> <!-- Specify the paths for translatable code -->
<source path='client' /> <source path='client' />

16
src/main/webapp/WEB-INF/web.xml
View File

@ -34,10 +34,10 @@
<!-- <servlet-class>org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server.CkanLogout</servlet-class> --> <!-- <servlet-class>org.gcube.portlets.gcubeckan.gcubeckandatacatalog.server.CkanLogout</servlet-class> -->
<!-- </servlet> --> <!-- </servlet> -->
<servlet> <!-- <servlet> -->
<servlet-name>checkServlet</servlet-name> <!-- <servlet-name>checkServlet</servlet-name> -->
<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class> <!-- <servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class> -->
</servlet> <!-- </servlet> -->
<servlet> <servlet>
<servlet-name>ckanpublisherservices</servlet-name> <servlet-name>ckanpublisherservices</servlet-name>
@ -79,10 +79,10 @@
<!-- <url-pattern>/gCubeCkanDataCatalog/gcubeckanlogout</url-pattern> --> <!-- <url-pattern>/gCubeCkanDataCatalog/gcubeckanlogout</url-pattern> -->
<!-- </servlet-mapping> --> <!-- </servlet-mapping> -->
<servlet-mapping> <!-- <servlet-mapping> -->
<servlet-name>checkServlet</servlet-name> <!-- <servlet-name>checkServlet</servlet-name> -->
<url-pattern>/gCubeCkanDataCatalog/checksession</url-pattern> <!-- <url-pattern>/gCubeCkanDataCatalog/checksession</url-pattern> -->
</servlet-mapping> <!-- </servlet-mapping> -->
<!-- Default page to serve --> <!-- Default page to serve -->
<welcome-file-list> <welcome-file-list>

52
src/test/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GwtTestGCubeCkanDataCatalog.java
View File

@ -1,26 +1,26 @@
package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client; //package org.gcube.portlets.gcubeckan.gcubeckandatacatalog.client;
//
import com.google.gwt.junit.client.GWTTestCase; //import com.google.gwt.junit.client.GWTTestCase;
//
/** ///**
* GWT JUnit <b>integration</b> tests must extend GWTTestCase. // * GWT JUnit <b>integration</b> tests must extend GWTTestCase.
* Using <code>"GwtTest*"</code> naming pattern exclude them from running with // * Using <code>"GwtTest*"</code> naming pattern exclude them from running with
* surefire during the test phase. // * surefire during the test phase.
* // *
* If you run the tests using the Maven command line, you will have to // * 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. // * 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 // * See https://gwt-maven-plugin.github.io/gwt-maven-plugin/user-guide/testing.html
* for details. // * for details.
*/ // */
public class GwtTestGCubeCkanDataCatalog extends GWTTestCase { //public class GwtTestGCubeCkanDataCatalog extends GWTTestCase {
//
/** // /**
* Must refer to a valid module that sources this class. // * Must refer to a valid module that sources this class.
*/ // */
public String getModuleName() { // public String getModuleName() {
return "org.gcube.portlets.gcubeckan.gcubeckandatacatalog.GCubeCkanDataCatalogJUnit"; // return "org.gcube.portlets.gcubeckan.gcubeckandatacatalog.GCubeCkanDataCatalogJUnit";
} // }
//
//
//
} //}