diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java index 8237927..2d69595 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ComputationReadyEvent.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ComputationReadyEvent.java index c48b151..2c08cbb 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ComputationReadyEvent.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/ComputationReadyEvent.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OperatorsClassificationEvent.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OperatorsClassificationEvent.java index 0335fe5..07e800c 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OperatorsClassificationEvent.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/OperatorsClassificationEvent.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/StartComputationExecutionRequestEvent.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/StartComputationExecutionRequestEvent.java index e77c39c..849a386 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/StartComputationExecutionRequestEvent.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/StartComputationExecutionRequestEvent.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java index 60fde1f..bcc1c3f 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationExecutionPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java index 7bf740a..fab771c 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java index 80e0e04..db98c83 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java index 7f7dfa3..5fc45d6 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationStatusPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ExperimentPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ExperimentPanel.java index fa8f217..7579a30 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ExperimentPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ExperimentPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorCategoryPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorCategoryPanel.java index 0a4aace..c4ee9f5 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorCategoryPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorCategoryPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorPanel.java index 9b146f5..72a7f11 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanel.java index f6fa5ef..65f02bc 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanelHandler.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanelHandler.java index de5f07b..4294978 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanelHandler.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/OperatorsPanelHandler.java @@ -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; /** * diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/WorkflowPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/WorkflowPanel.java index 3b22d9f..e026f70 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/WorkflowPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/WorkflowPanel.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java index cd90b38..b4be978 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java index 13b4ace..2ab3dae 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java index 3c2a4b1..71b9a72 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DescriptionRepository.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DescriptionRepository.java index 3d0bc6c..aada83f 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DescriptionRepository.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DescriptionRepository.java @@ -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; /** * diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java index df71c39..ab34597 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/SessionUtil.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient.java similarity index 83% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient.java index 7994857..c49ac24 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient.java @@ -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: g.panichi@isti.cnr.it diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPS.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPS.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java index bf8041b..ccf98b7 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPS.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPS.java @@ -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: process; private HashMap 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); } diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPSBuilder.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPSBuilder.java similarity index 80% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPSBuilder.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPSBuilder.java index fe0eab6..ea2a833 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClient4WPSBuilder.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClient4WPSBuilder.java @@ -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: g.panichi@isti.cnr.it @@ -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(); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientBuilder.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientBuilder.java similarity index 81% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientBuilder.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientBuilder.java index 33bbf6f..97c7bb0 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientBuilder.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientBuilder.java @@ -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: g.panichi@isti.cnr.it diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientDirector.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientDirector.java similarity index 90% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientDirector.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientDirector.java index 51798f6..9702291 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientDirector.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientDirector.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientSpec.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientSpec.java similarity index 83% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientSpec.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientSpec.java index cc51e05..4a56d7c 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/SClientSpec.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/SClientSpec.java @@ -1,4 +1,4 @@ -package org.gcube.portlets.user.dataminermanager.server.smservice; +package org.gcube.portlets.user.dataminermanager.server.dmservice; /** * Specification diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/StatClientDescribeProcessRequest.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/DClientDescribeProcessRequest.java similarity index 78% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/StatClientDescribeProcessRequest.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/DClientDescribeProcessRequest.java index 348549f..1709ecd 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/StatClientDescribeProcessRequest.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/DClientDescribeProcessRequest.java @@ -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: g.panichi@isti.cnr.it * */ -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); } diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/ProcessInformations.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/ProcessInformations.java similarity index 96% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/ProcessInformations.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/ProcessInformations.java index 16eeb30..268fa89 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/ProcessInformations.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/ProcessInformations.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/ResponseWPS.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/ResponseWPS.java similarity index 94% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/ResponseWPS.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/ResponseWPS.java index eeb3f8a..938c4fa 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/ResponseWPS.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/ResponseWPS.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/StatWPSClientSession.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/SClient4WPSSession.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/StatWPSClientSession.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/SClient4WPSSession.java index b5fe4e4..75a8364 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/StatWPSClientSession.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/SClient4WPSSession.java @@ -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 * */ -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); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/WPS2SM.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/WPS2DM.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/WPS2SM.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/WPS2DM.java index d5d6474..2ef29ac 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/WPS2SM.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/WPS2DM.java @@ -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()) { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/computationsvalue/ComputationValueBuilder.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/computationsvalue/ComputationValueBuilder.java index 2770f61..b3f6bf2 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/dmservice/wps/computationsvalue/ComputationValueBuilder.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/ComputationStatus.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/ComputationStatus.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/ComputationStatus.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/ComputationStatus.java index 177ef99..91bb84f 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/ComputationStatus.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/ComputationStatus.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/Operator.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/Operator.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/Operator.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/Operator.java index 50e72ef..7a1ee18 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/Operator.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/Operator.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/OperatorCategory.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/OperatorCategory.java similarity index 98% rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/OperatorCategory.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/OperatorCategory.java index bcb1896..12a6719 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/OperatorCategory.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/OperatorCategory.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/OperatorsClassification.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/OperatorsClassification.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/OperatorsClassification.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/OperatorsClassification.java index 901727f..eccab71 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/OperatorsClassification.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/OperatorsClassification.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/TemplateDescriptor.java b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/TemplateDescriptor.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/TemplateDescriptor.java rename to src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/TemplateDescriptor.java index fab07de..3abcbe0 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/bean/TemplateDescriptor.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/shared/process/TemplateDescriptor.java @@ -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;