gCubeSystem
/
species-discovery
Archived
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- project updated to support new version of wslt 

- pom version updated at 3.5.0


git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@83209 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2013-10-17 15:18:54 +00:00
parent 1d0a7117d6
commit bdbb654f92
7 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pom.xml
View File

@ -19,7 +19,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>species-discovery</artifactId> <artifactId>species-discovery</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>3.4.0-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<name>gCube Species Discovery</name> <name>gCube Species Discovery</name>
<description> <description>
gCube Species Discovery Portlet lets the users discovery species information from the Species Service. gCube Species Discovery Portlet lets the users discovery species information from the Species Service.
@ -134,17 +134,18 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- <dependency> --> <!-- <dependency> -->
<!-- <groupId>org.gcube.contentmanagement</groupId> --> <!-- <groupId>org.gcube.contentmanagement</groupId> -->
<!-- <artifactId>storage-resource-link-plugin</artifactId> --> <!-- <artifactId>storage-resource-link-plugin</artifactId> -->
<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> --> <!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
<!-- <scope>provided</scope> --> <!-- <scope>provided</scope> -->
<!-- </dependency> --> <!-- </dependency> -->
<!-- WSLT dependencies --> <!-- WSLT dependencies -->
<dependency> <dependency>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.widgets</groupId>
<artifactId>workspace-light-tree</artifactId> <artifactId>workspace-light-tree</artifactId>
<version>[2.13.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -184,6 +185,7 @@
<!-- <scope>provided</scope> --> <!-- <scope>provided</scope> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sencha.gxt</groupId> <groupId>com.sencha.gxt</groupId>
<artifactId>gxt</artifactId> <artifactId>gxt</artifactId>
@ -206,7 +208,6 @@
</dependency> </dependency>
<!-- END FWS --> <!-- END FWS -->
<dependency> <dependency>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>gcube-widgets</artifactId> <artifactId>gcube-widgets</artifactId>
@ -230,19 +231,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- <dependency> -->
<!-- <groupId>org.gcube.portlets.user</groupId> -->
<!-- <artifactId>home-library</artifactId> -->
<!-- <version>[4.3.0-SNAPSHOT, 5.0.0-SNAPSHOT)</version> -->
<!-- <scope>provided</scope> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.gcube.portlets.user</groupId> -->
<!-- <artifactId>home-library-jcr</artifactId> -->
<!-- <version>[1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
<!-- <scope>provided</scope> -->
<!-- </dependency> -->
<!-- HOME LIBRARY --> <!-- HOME LIBRARY -->
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>

1
src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java
View File

@ -12,7 +12,6 @@ public final class ConstantsSpeciesDiscovery {
public static final String RANK = "Rank"; public static final String RANK = "Rank";
// public static final String GROUPEDIDLIST = "GroupedIDList"; // public static final String GROUPEDIDLIST = "GroupedIDList";
//USED IN CLASSIFICATION FILTER //USED IN CLASSIFICATION FILTER
public static final String BIOTACLASSID = "BiotaID"; public static final String BIOTACLASSID = "BiotaID";
public static final String BIOTACLASS = "Biota"; public static final String BIOTACLASS = "Biota";

24
src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java
View File

@ -94,12 +94,12 @@ import org.gcube.portlets.user.speciesdiscovery.shared.SpeciesCapability;
import org.gcube.portlets.user.speciesdiscovery.shared.TaxonomyRow; import org.gcube.portlets.user.speciesdiscovery.shared.TaxonomyRow;
import org.gcube.portlets.user.speciesdiscovery.shared.filter.ResultFilter; import org.gcube.portlets.user.speciesdiscovery.shared.filter.ResultFilter;
import org.gcube.portlets.user.speciesdiscovery.shared.util.SearchTermValidator; import org.gcube.portlets.user.speciesdiscovery.shared.util.SearchTermValidator;
import org.gcube.portlets.user.workspace.lighttree.client.ItemType; import org.gcube.portlets.widgets.lighttree.client.ItemType;
import org.gcube.portlets.user.workspace.lighttree.client.event.DataLoadEvent; import org.gcube.portlets.widgets.lighttree.client.event.DataLoadEvent;
import org.gcube.portlets.user.workspace.lighttree.client.event.DataLoadHandler; import org.gcube.portlets.widgets.lighttree.client.event.DataLoadHandler;
import org.gcube.portlets.user.workspace.lighttree.client.event.PopupEvent; import org.gcube.portlets.widgets.lighttree.client.event.PopupEvent;
import org.gcube.portlets.user.workspace.lighttree.client.event.PopupHandler; import org.gcube.portlets.widgets.lighttree.client.event.PopupHandler;
import org.gcube.portlets.user.workspace.lighttree.client.save.WorkspaceLightTreeSavePopup; import org.gcube.portlets.widgets.lighttree.client.save.WorkspaceLightTreeSavePopup;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
import com.extjs.gxt.ui.client.data.BaseModelData; import com.extjs.gxt.ui.client.data.BaseModelData;
@ -936,7 +936,7 @@ public class SearchController {
public void onPopup(PopupEvent event) { public void onPopup(PopupEvent event) {
if (!event.isCanceled()){ if (!event.isCanceled()){
org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem(); org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName(); final String name = event.getName();
Info.display("Saving in progress", "..."); Info.display("Saving in progress", "...");
@ -1009,7 +1009,7 @@ public class SearchController {
public void onPopup(PopupEvent event) { public void onPopup(PopupEvent event) {
if (!event.isCanceled()){ if (!event.isCanceled()){
org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem(); org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName(); final String name = event.getName();
Info.display("Saving in progress", "..."); Info.display("Saving in progress", "...");
@ -1067,7 +1067,7 @@ public class SearchController {
public void onPopup(PopupEvent event) { public void onPopup(PopupEvent event) {
if (!event.isCanceled()){ if (!event.isCanceled()){
org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem(); org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName(); final String name = event.getName();
Info.display("Saving in progress", "..."); Info.display("Saving in progress", "...");
@ -1153,7 +1153,7 @@ public class SearchController {
public void onPopup(PopupEvent event) { public void onPopup(PopupEvent event) {
if (!event.isCanceled()){ if (!event.isCanceled()){
org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem(); org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName(); final String name = event.getName();
Info.display("Saving in progress", "..."); Info.display("Saving in progress", "...");
@ -1236,7 +1236,7 @@ public class SearchController {
public void onPopup(PopupEvent event) { public void onPopup(PopupEvent event) {
if (!event.isCanceled()){ if (!event.isCanceled()){
org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem(); org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName(); final String name = event.getName();
Info.display("Saving in progress", "..."); Info.display("Saving in progress", "...");
@ -1330,7 +1330,7 @@ public class SearchController {
public void onPopup(PopupEvent event) { public void onPopup(PopupEvent event) {
if (!event.isCanceled()){ if (!event.isCanceled()){
org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem(); org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
final String name = event.getName(); final String name = event.getName();
Info.display("Saving in progress", "..."); Info.display("Saving in progress", "...");

2
src/main/java/org/gcube/portlets/user/speciesdiscovery/client/cluster/TabItemForTaxonomyRow.java
View File

@ -139,7 +139,7 @@ public class TabItemForTaxonomyRow {
//FOR DEBUG //FOR DEBUG
// TaxonomyRow printParent = taxonomyItem; // TaxonomyRow printParent = taxonomyItem;
System.out.println("Load child of item name: " + parentName + " parent id: " + taxonomyItem.getServiceId()); // System.out.println("Load child of item name: " + parentName + " parent id: " + taxonomyItem.getServiceId());
// while(printParent!=null){ // while(printParent!=null){
// //
// System.out.println("Parent Name: " + printParent.getName() + " parent id: " +printParent.getServiceId()); // System.out.println("Parent Name: " + printParent.getName() + " parent id: " +printParent.getServiceId());

2
src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java
View File

@ -26,11 +26,9 @@ import net.sf.csv4j.CSVWriter;
import org.apache.log4j.Level; import org.apache.log4j.Level;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.ASLSession;
import org.gcube.common.homelibrary.home.HomeLibrary;
import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.homelibrary.home.workspace.Workspace;
import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder; import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
import org.gcube.common.homelibrary.util.WorkspaceUtil; import org.gcube.common.homelibrary.util.WorkspaceUtil;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.data.spd.model.products.OccurrencePoint; import org.gcube.data.spd.model.products.OccurrencePoint;
import org.gcube.data.spd.model.products.ResultElement; import org.gcube.data.spd.model.products.ResultElement;
import org.gcube.data.spd.model.products.TaxonomyItem; import org.gcube.data.spd.model.products.TaxonomyItem;

4
src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml
View File

@ -10,8 +10,8 @@
<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" /> <inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
<set-property name="log_DivLogger" value="DISABLED" /> <set-property name="log_DivLogger" value="DISABLED" />
<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
<!-- <inherits name='com.google.gwt.query.Query' /> --> <!-- <inherits name='com.google.gwt.query.Query' /> -->
<!-- Specify the app entry point class. --> <!-- Specify the app entry point class. -->
<entry-point <entry-point

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

@ -40,7 +40,7 @@
<!-- Workspace Light Tree servlet --> <!-- Workspace Light Tree servlet -->
<servlet> <servlet>
<servlet-name>WorkspaceLightService</servlet-name> <servlet-name>WorkspaceLightService</servlet-name>
<servlet-class>org.gcube.portlets.user.workspace.lighttree.server.WorkspaceServiceImpl</servlet-class> <servlet-class>org.gcube.portlets.widgets.lighttree.server.WorkspaceServiceImpl</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>