gCubeSystem
/
data-miner-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated organization of packages 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@131345 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2016-09-14 12:27:54 +00:00
parent 9a0632b4cf
commit f59b316f8f
36 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java
View File

@ -2,7 +2,6 @@ package org.gcube.portlets.user.dataminermanager.client;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.events.CancelComputationExecutionRequestEvent;
import org.gcube.portlets.user.dataminermanager.client.events.CancelExecutionFromComputationsRequestEvent;
@ -35,6 +34,7 @@ import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationId;
import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ComputationReadyEvent.java
View File

@ -1,6 +1,6 @@
package org.gcube.portlets.user.dataminermanager.client.events;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.GwtEvent;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OperatorsClassificationEvent.java
View File

@ -1,7 +1,7 @@
package org.gcube.portlets.user.dataminermanager.client.events;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.client.type.OperatorsClassificationRequestType;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorsClassification;
import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.GwtEvent;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/events/StartComputationExecutionRequestEvent.java
View File

@ -1,6 +1,6 @@
package org.gcube.portlets.user.dataminermanager.client.events;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import com.google.gwt.event.shared.EventHandler;
import com.google.gwt.event.shared.GwtEvent;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java
View File

@ -4,11 +4,11 @@ import java.util.ArrayList;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.events.ResubmitComputationExecutionEvent;
import org.gcube.portlets.user.dataminermanager.client.events.StartComputationExecutionEvent;
import org.gcube.portlets.user.dataminermanager.client.events.StartComputationExecutionRequestEvent;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import com.allen_sauer.gwt.log.client.Log;
import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java
View File

@ -1,11 +1,11 @@
package org.gcube.portlets.user.dataminermanager.client.experiments;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.events.ComputationReadyEvent;
import org.gcube.portlets.user.dataminermanager.client.events.ComputationReadyEvent.ComputationReadyEventHandler;
import org.gcube.portlets.user.dataminermanager.client.events.ComputationReadyEvent.HasComputationReadyEventHandler;
import org.gcube.portlets.user.dataminermanager.client.experiments.ComputationParametersPanel.ComputationParametersPanelHandler;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.ui.HTML;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java
View File

@ -9,7 +9,6 @@ import java.util.List;
import java.util.Map;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.events.SessionExpiredEvent;
import org.gcube.portlets.user.dataminermanager.client.parametersfield.AbstractFld;
@ -25,6 +24,7 @@ import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnListPara
import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnParameter;
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.parameters.ParameterType;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java
View File

@ -3,8 +3,6 @@
*/
package org.gcube.portlets.user.dataminermanager.client.experiments;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus.Status;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.custom.progress.GreenProgressBar;
import org.gcube.portlets.user.dataminermanager.client.custom.progress.OrangeProgressBar;
@ -14,6 +12,8 @@ import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServi
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.portlets.user.dataminermanager.shared.Constants;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationId;
import org.gcube.portlets.user.dataminermanager.shared.process.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.shared.process.ComputationStatus.Status;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.dom.client.Style.Unit;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ExperimentPanel.java
View File

@ -1,6 +1,6 @@
package org.gcube.portlets.user.dataminermanager.client.experiments;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer;

4
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorCategoryPanel.java
View File

@ -6,8 +6,8 @@ package org.gcube.portlets.user.dataminermanager.client.experiments;
import java.util.ArrayList;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorCategory;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorCategory;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorPanel.java
View File

@ -1,6 +1,6 @@
package org.gcube.portlets.user.dataminermanager.client.experiments;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanel.java
View File

@ -9,14 +9,14 @@ import java.util.List;
import java.util.Map;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorCategory;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.events.OperatorsClassificationEvent;
import org.gcube.portlets.user.dataminermanager.client.events.OperatorsClassificationRequestEvent;
import org.gcube.portlets.user.dataminermanager.client.type.OperatorsClassificationRequestType;
import org.gcube.portlets.user.dataminermanager.shared.Constants;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorCategory;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorsClassification;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.event.dom.client.KeyUpEvent;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanelHandler.java
View File

@ -3,7 +3,7 @@
*/
package org.gcube.portlets.user.dataminermanager.client.experiments;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
/**
*

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/WorkflowPanel.java
View File

@ -4,10 +4,10 @@
package org.gcube.portlets.user.dataminermanager.client.experiments;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.events.ComputationReadyEvent;
import org.gcube.portlets.user.dataminermanager.client.events.ResubmitComputationExecutionEvent;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import com.allen_sauer.gwt.log.client.Log;
import com.sencha.gxt.widget.core.client.TabItemConfig;

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java
View File

@ -2,15 +2,15 @@ package org.gcube.portlets.user.dataminermanager.client.rpc;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationId;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.process.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;

6
src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
View File

@ -2,14 +2,14 @@ package org.gcube.portlets.user.dataminermanager.client.rpc;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationId;
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.process.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;

8
src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java
View File

@ -7,11 +7,8 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
import org.gcube.application.framework.core.session.ASLSession;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletService;
import org.gcube.portlets.user.dataminermanager.server.smservice.SClient;
import org.gcube.portlets.user.dataminermanager.server.dmservice.SClient;
import org.gcube.portlets.user.dataminermanager.server.storage.StorageUtil;
import org.gcube.portlets.user.dataminermanager.server.util.DataMinerWorkAreaManager;
import org.gcube.portlets.user.dataminermanager.server.util.TableReader;
@ -21,6 +18,9 @@ import org.gcube.portlets.user.dataminermanager.shared.data.computations.Computa
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationId;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.process.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.portlets.user.dataminermanager.shared.workspace.DataMinerWorkArea;
import org.gcube.portlets.user.dataminermanager.shared.workspace.ItemDescription;

4
src/main/java/org/gcube/portlets/user/dataminermanager/server/DescriptionRepository.java
View File

@ -3,8 +3,8 @@ package org.gcube.portlets.user.dataminermanager.server;
import java.util.ArrayList;
import java.util.List;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorCategory;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorCategory;
/**
*

8
src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java
View File

@ -16,10 +16,10 @@ import org.gcube.application.framework.core.session.ASLSession;
import org.gcube.application.framework.core.session.SessionManager;
import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
import org.gcube.portlets.user.dataminermanager.server.smservice.SClient;
import org.gcube.portlets.user.dataminermanager.server.smservice.SClient4WPSBuilder;
import org.gcube.portlets.user.dataminermanager.server.smservice.SClientBuilder;
import org.gcube.portlets.user.dataminermanager.server.smservice.SClientDirector;
import org.gcube.portlets.user.dataminermanager.server.dmservice.SClient;
import org.gcube.portlets.user.dataminermanager.server.dmservice.SClient4WPSBuilder;
import org.gcube.portlets.user.dataminermanager.server.dmservice.SClientBuilder;
import org.gcube.portlets.user.dataminermanager.server.dmservice.SClientDirector;
import org.gcube.portlets.user.dataminermanager.server.util.ServiceCredential;
import org.gcube.portlets.user.dataminermanager.shared.Constants;
import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException;

10
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient.java
View File

@ -1,20 +1,20 @@
package org.gcube.portlets.user.dataminermanager.server.smservice;
package org.gcube.portlets.user.dataminermanager.server.dmservice;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.data.OutputData;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationData;
import org.gcube.portlets.user.dataminermanager.shared.data.computations.ComputationId;
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.process.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorsClassification;
/**
*
* Client
* Client of service
*
* @author giancarlo email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>

50
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPS.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice;
package org.gcube.portlets.user.dataminermanager.server.dmservice;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@ -30,17 +30,12 @@ import net.opengis.wps.x100.SupportedComplexDataInputType;
import net.opengis.wps.x100.impl.ExecuteResponseDocumentImpl;
import org.apache.xmlbeans.XmlString;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.client.bean.ComputationStatus.Status;
import org.gcube.portlets.user.dataminermanager.client.bean.Operator;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorCategory;
import org.gcube.portlets.user.dataminermanager.client.bean.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.server.dmservice.wps.ProcessInformations;
import org.gcube.portlets.user.dataminermanager.server.dmservice.wps.ResponseWPS;
import org.gcube.portlets.user.dataminermanager.server.dmservice.wps.SClient4WPSSession;
import org.gcube.portlets.user.dataminermanager.server.dmservice.wps.WPS2DM;
import org.gcube.portlets.user.dataminermanager.server.dmservice.wps.computationsvalue.ComputationValueBuilder;
import org.gcube.portlets.user.dataminermanager.server.is.InformationSystemUtils;
import org.gcube.portlets.user.dataminermanager.server.smservice.wps.ProcessInformations;
import org.gcube.portlets.user.dataminermanager.server.smservice.wps.ResponseWPS;
import org.gcube.portlets.user.dataminermanager.server.smservice.wps.StatWPSClientSession;
import org.gcube.portlets.user.dataminermanager.server.smservice.wps.WPS2SM;
import org.gcube.portlets.user.dataminermanager.server.smservice.wps.computationsvalue.ComputationValueBuilder;
import org.gcube.portlets.user.dataminermanager.server.storage.StorageUtil;
import org.gcube.portlets.user.dataminermanager.server.util.ServiceCredential;
import org.gcube.portlets.user.dataminermanager.shared.Constants;
@ -58,6 +53,11 @@ import org.gcube.portlets.user.dataminermanager.shared.exception.DataMinerServic
import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter;
import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularListParameter;
import org.gcube.portlets.user.dataminermanager.shared.process.ComputationStatus;
import org.gcube.portlets.user.dataminermanager.shared.process.Operator;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorCategory;
import org.gcube.portlets.user.dataminermanager.shared.process.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.process.ComputationStatus.Status;
import org.n52.wps.client.ExecuteRequestBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -66,7 +66,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
* Client 4 WPS
* Client 4 WPS Service
*
*
* @author Giancarlo Panichi email: <a
@ -92,7 +92,7 @@ public class SClient4WPS extends SClient {
private HashMap<String, ProcessInformations> process;
private HashMap<ComputationId, ProcessInformations> runningProcess;
private StatWPSClientSession wpsClient;
private SClient4WPSSession wpsClient;
public SClient4WPS(ServiceCredential serviceCredential) throws Exception {
super();
@ -154,9 +154,9 @@ public class SClient4WPS extends SClient {
}
private StatWPSClientSession createWPSClientSession() {
private SClient4WPSSession createWPSClientSession() {
if (wpsClient == null) {
wpsClient = new StatWPSClientSession(wpsUser, wpsToken);
wpsClient = new SClient4WPSSession(wpsUser, wpsToken);
logger.debug("Created StatWPSClientSession");
return wpsClient;
} else {
@ -277,7 +277,7 @@ public class SClient4WPS extends SClient {
return process.get(processId);
}
StatWPSClientSession wpsClient = null;
SClient4WPSSession wpsClient = null;
try {
wpsClient = createWPSClientSession();
@ -337,7 +337,7 @@ public class SClient4WPS extends SClient {
}
private void requestCapability() throws Exception {
StatWPSClientSession wpsClient = null;
SClient4WPSSession wpsClient = null;
processesDescriptionType = null;
processesBriefs = null;
@ -370,7 +370,7 @@ public class SClient4WPS extends SClient {
private String executeProcessAsync(ExecuteRequestBuilder executeBuilder,
ProcessDescriptionType processDescription) throws Exception {
StatWPSClientSession wpsClient = null;
SClient4WPSSession wpsClient = null;
try {
try {
@ -449,7 +449,7 @@ public class SClient4WPS extends SClient {
private ProcessOutputs retrieveProcessResult(String processLocation)
throws Exception {
StatWPSClientSession wpsClient = null;
SClient4WPSSession wpsClient = null;
try {
logger.debug("RetrieveProcessResult: " + processLocation);
wpsClient = createWPSClientSession();
@ -668,7 +668,7 @@ public class SClient4WPS extends SClient {
Parameter inputParameter;
for (InputDescriptionType inputDesc : processInformations
.getInputs()) {
inputParameter = WPS2SM.convert2SMType(inputDesc);
inputParameter = WPS2DM.convert2DMType(inputDesc);
logger.debug("InputParameter: " + inputParameter);
parameters.add(inputParameter);
}
@ -699,7 +699,7 @@ public class SClient4WPS extends SClient {
Parameter inputParameter;
for (InputDescriptionType inputDesc : processInformations.getInputs()) {
inputParameter = WPS2SM.convert2SMType(inputDesc);
inputParameter = WPS2DM.convert2DMType(inputDesc);
logger.debug("InputParameter: " + inputParameter);
inputParameters.put(inputParameter.getName(), inputParameter);
}
@ -836,7 +836,7 @@ public class SClient4WPS extends SClient {
@Override
public ComputationStatus getComputationStatus(ComputationId computationId)
throws Exception {
StatWPSClientSession wpsClient = null;
SClient4WPSSession wpsClient = null;
try {
logger.debug("GetComputationStatus(): ComputationId="
+ computationId);
@ -1010,7 +1010,7 @@ public class SClient4WPS extends SClient {
&& processInformations.getOutputs() != null) {
for (OutputDescriptionType outputDesc : processInformations
.getOutputs()) {
outputParameter = WPS2SM.convert2SMType(outputDesc);
outputParameter = WPS2DM.convert2DMType(outputDesc);
logger.debug("OutputParameter: " + outputParameter);
outputParameters
.put(outputParameter.getName(), outputParameter);
@ -1184,7 +1184,7 @@ public class SClient4WPS extends SClient {
@Override
public String cancelComputation(ComputationId computationId)
throws Exception {
StatWPSClientSession wpsClient = null;
SClient4WPSSession wpsClient = null;
try {
wpsClient = createWPSClientSession();
@ -1225,7 +1225,7 @@ public class SClient4WPS extends SClient {
Parameter inputParameter;
for (InputDescriptionType inputDesc : processInformations.getInputs()) {
inputParameter = WPS2SM.convert2SMType(inputDesc);
inputParameter = WPS2DM.convert2DMType(inputDesc);
logger.debug("InputParameter: " + inputParameter);
inputParameters.put(inputParameter.getName(), inputParameter);
}

10
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPSBuilder.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPSBuilder.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice;
package org.gcube.portlets.user.dataminermanager.server.dmservice;
import org.gcube.portlets.user.dataminermanager.server.util.ServiceCredential;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
@ -6,7 +6,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Client 4 WPS
* Builder of Client 4 WPS Service
*
* @author "Giancarlo Panichi" email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
@ -25,11 +25,11 @@ public class SClient4WPSBuilder extends SClientBuilder {
@Override
public void buildSClient() throws ServiceException {
try {
logger.debug("Build SM4WPS");
logger.debug("Build SC4WPS");
logger.debug("ServiceCredential: " + serviceCredendial);
SClient smClient = new SClient4WPS(serviceCredendial);
SClient sClient = new SClient4WPS(serviceCredendial);
sClientSpec.setSClient(smClient);
sClientSpec.setSClient(sClient);
} catch (Throwable e) {
logger.error(e.getLocalizedMessage());
e.printStackTrace();

4
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientBuilder.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientBuilder.java
View File

@ -1,9 +1,9 @@
package org.gcube.portlets.user.dataminermanager.server.smservice;
package org.gcube.portlets.user.dataminermanager.server.dmservice;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
/**
* Abstract class for build Service
* Abstract class for build client of service
*
* @author "Giancarlo Panichi" email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>

2
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientDirector.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientDirector.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice;
package org.gcube.portlets.user.dataminermanager.server.dmservice;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;

2
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientSpec.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientSpec.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice;
package org.gcube.portlets.user.dataminermanager.server.dmservice;
/**
* Specification

6
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/StatClientDescribeProcessRequest.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/DClientDescribeProcessRequest.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice.wps;
package org.gcube.portlets.user.dataminermanager.server.dmservice.wps;
import org.n52.wps.client.AbstractClientGETRequest;
@ -8,12 +8,12 @@ import org.n52.wps.client.AbstractClientGETRequest;
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class StatClientDescribeProcessRequest extends AbstractClientGETRequest {
public class DClientDescribeProcessRequest extends AbstractClientGETRequest {
private static String IDENTIFIER_REQ_PARAM_NAME = "identifier";
private static String REQUEST_REQ_PARAM_VALUE = "DescribeProcess";
public StatClientDescribeProcessRequest() {
public DClientDescribeProcessRequest() {
super();
setRequestParamValue(REQUEST_REQ_PARAM_VALUE);
}

2
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/ProcessInformations.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/ProcessInformations.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice.wps;
package org.gcube.portlets.user.dataminermanager.server.dmservice.wps;
import java.io.Serializable;
import java.util.Arrays;

2
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/ResponseWPS.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/ResponseWPS.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice.wps;
package org.gcube.portlets.user.dataminermanager.server.dmservice.wps;
import java.io.Serializable;

12
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/StatWPSClientSession.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/SClient4WPSSession.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice.wps;
package org.gcube.portlets.user.dataminermanager.server.dmservice.wps;
import java.io.BufferedReader;
import java.io.IOException;
@ -47,11 +47,11 @@ import org.xml.sax.SAXException;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class StatWPSClientSession implements Serializable {
public class SClient4WPSSession implements Serializable {
private static final long serialVersionUID = -1387670579312851370L;
private static Logger logger = LoggerFactory
.getLogger(StatWPSClientSession.class);
.getLogger(SClient4WPSSession.class);
private static final String OGC_OWS_URI = "http://www.opengeospatial.net/ows";
private static String SUPPORTED_VERSION = "1.0.0";
@ -68,9 +68,9 @@ public class StatWPSClientSession implements Serializable {
* Initializes a WPS client session.
*
*/
public StatWPSClientSession(String user, String password) {
public SClient4WPSSession(String user, String password) {
super();
logger.debug("Create StatWPSClientSession: [user=" + user
logger.debug("Create SClient4WPSSession: [user=" + user
+ ", password=" + password + "]");
this.user = user;
this.password = password;
@ -423,7 +423,7 @@ public class StatWPSClientSession implements Serializable {
for (String processId : processIDs) {
String[] process = { processId };
StatClientDescribeProcessRequest req = new StatClientDescribeProcessRequest();
DClientDescribeProcessRequest req = new DClientDescribeProcessRequest();
req.setIdentifier(process);
String requestURL = req.getRequest(url);

26
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/WPS2SM.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/WPS2DM.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice.wps;
package org.gcube.portlets.user.dataminermanager.server.dmservice.wps;
import java.util.ArrayList;
import java.util.Arrays;
@ -34,10 +34,10 @@ import org.gcube.portlets.user.dataminermanager.shared.parameters.WKTParameter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class WPS2SM {
public class WPS2DM {
private final static String SEPARATOR = "|";
private static Logger logger = LoggerFactory.getLogger(WPS2SM.class);
private static Logger logger = LoggerFactory.getLogger(WPS2DM.class);
/**
*
@ -351,7 +351,7 @@ public class WPS2SM {
return converted;
}
public static Parameter convert2SMType(InputDescriptionType wpsType)
public static Parameter convert2DMType(InputDescriptionType wpsType)
throws ServiceException {
try {
@ -374,7 +374,7 @@ public class WPS2SM {
// Bounding Boxes
if (wpsType.isSetBoundingBoxData()) {
logger.debug("Conversion to SM Type->" + id
logger.debug("Conversion to DM Type->" + id
+ " is a Bounding Box Input");
converted = manageBoundingBoxInformation(title, minOcc, maxOcc,
rangeOccs, id, wpsType.getBoundingBoxData()
@ -382,7 +382,7 @@ public class WPS2SM {
}
// Literals
else if (wpsType.isSetLiteralData()) {
logger.debug("Conversion to SM Type->" + id
logger.debug("Conversion to DM Type->" + id
+ " is a Literal Input");
LiteralInputType literal = wpsType.getLiteralData();
String uoms = literal.getUOMs() == null ? "" : literal
@ -407,7 +407,7 @@ public class WPS2SM {
}
}
} else if (wpsType.isSetComplexData()) {
logger.debug("Conversion to SM Type->" + id
logger.debug("Conversion to DM Type->" + id
+ " is a Complex Input");
SupportedComplexDataInputType complex = wpsType
.getComplexData();
@ -421,9 +421,9 @@ public class WPS2SM {
}
logger.debug("Conversion to SM Type->Name=" + id);
logger.debug("Conversion to SM Type->Title=" + title);
logger.debug("Conversion to SM Type->Number of Inputs to Manage="
logger.debug("Conversion to DM Type->Name=" + id);
logger.debug("Conversion to DM Type->Title=" + title);
logger.debug("Conversion to DM Type->Number of Inputs to Manage="
+ rangeOccs);
return converted;
@ -435,7 +435,7 @@ public class WPS2SM {
}
}
public static Parameter convert2SMType(OutputDescriptionType wpsType) {
public static Parameter convert2DMType(OutputDescriptionType wpsType) {
String id = wpsType.getIdentifier().getStringValue();
String title = wpsType.getTitle() != null ? wpsType.getTitle()
@ -445,8 +445,8 @@ public class WPS2SM {
Parameter converted = new ObjectParameter(id, title,
String.class.getName(), " ");
logger.debug("Conversion to SM Type->Output id:" + id);
logger.debug("Conversion to SM Type->Title:" + title);
logger.debug("Conversion to DM Type->Output id:" + id);
logger.debug("Conversion to DM Type->Title:" + title);
// Bounding Boxes
if (wpsType.isSetBoundingBoxOutput()) {

2
src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java → src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/computationsvalue/ComputationValueBuilder.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.server.smservice.wps.computationsvalue;
package org.gcube.portlets.user.dataminermanager.server.dmservice.wps.computationsvalue;
import java.net.URL;
import java.net.URLConnection;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/ComputationStatus.java → src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/ComputationStatus.java
View File

@ -1,4 +1,4 @@
package org.gcube.portlets.user.dataminermanager.client.bean;
package org.gcube.portlets.user.dataminermanager.shared.process;
import java.io.Serializable;
import java.util.Date;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/Operator.java → src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/Operator.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.gcube.portlets.user.dataminermanager.client.bean;
package org.gcube.portlets.user.dataminermanager.shared.process;
import java.io.Serializable;
import java.util.ArrayList;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/OperatorCategory.java → src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/OperatorCategory.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.gcube.portlets.user.dataminermanager.client.bean;
package org.gcube.portlets.user.dataminermanager.shared.process;
import java.io.Serializable;
import java.util.ArrayList;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/OperatorsClassification.java → src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/OperatorsClassification.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.gcube.portlets.user.dataminermanager.client.bean;
package org.gcube.portlets.user.dataminermanager.shared.process;
import java.io.Serializable;
import java.util.ArrayList;

2
src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/TemplateDescriptor.java → src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/TemplateDescriptor.java
View File

@ -1,7 +1,7 @@
/**
*
*/
package org.gcube.portlets.user.dataminermanager.client.bean;
package org.gcube.portlets.user.dataminermanager.shared.process;
import java.util.HashMap;
import java.util.Map;