Fixed logger
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@132818 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
cf9c05b670
commit
9a2649b3c4
|
@ -49,7 +49,7 @@ import org.gcube.portlets.user.dataminermanager.shared.data.output.ImageResource
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.data.output.MapResource;
|
import org.gcube.portlets.user.dataminermanager.shared.data.output.MapResource;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.data.output.ObjectResource;
|
import org.gcube.portlets.user.dataminermanager.shared.data.output.ObjectResource;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.data.output.Resource;
|
import org.gcube.portlets.user.dataminermanager.shared.data.output.Resource;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.exception.DataMinerServiceException;
|
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.parameters.ObjectParameter;
|
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.Parameter;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularListParameter;
|
import org.gcube.portlets.user.dataminermanager.shared.parameters.TabularListParameter;
|
||||||
|
@ -880,7 +880,7 @@ public class SClient4WPS extends SClient {
|
||||||
if ((failure != null && !failure.isEmpty())) {
|
if ((failure != null && !failure.isEmpty())) {
|
||||||
logger.debug("WPS FAILURE: " + failure);
|
logger.debug("WPS FAILURE: " + failure);
|
||||||
computationStatus = new ComputationStatus(
|
computationStatus = new ComputationStatus(
|
||||||
new DataMinerServiceException(
|
new ServiceException(
|
||||||
failure));
|
failure));
|
||||||
} else {
|
} else {
|
||||||
String paused = statusType
|
String paused = statusType
|
||||||
|
@ -890,7 +890,7 @@ public class SClient4WPS extends SClient {
|
||||||
if (paused != null && !paused.isEmpty()) {
|
if (paused != null && !paused.isEmpty()) {
|
||||||
logger.debug("WPS PAUSED: " + paused);
|
logger.debug("WPS PAUSED: " + paused);
|
||||||
computationStatus = new ComputationStatus(
|
computationStatus = new ComputationStatus(
|
||||||
new DataMinerServiceException(
|
new ServiceException(
|
||||||
paused));
|
paused));
|
||||||
} else {
|
} else {
|
||||||
String success = statusType
|
String success = statusType
|
||||||
|
@ -1390,7 +1390,7 @@ public class SClient4WPS extends SClient {
|
||||||
logger.debug("ComputationData: " + computationData);
|
logger.debug("ComputationData: " + computationData);
|
||||||
return computationData;
|
return computationData;
|
||||||
|
|
||||||
} catch (DataMinerServiceException e) {
|
} catch (ServiceException e) {
|
||||||
logger.error("Error in getComutationDataByComputationProperties: "
|
logger.error("Error in getComutationDataByComputationProperties: "
|
||||||
+ e.getLocalizedMessage());
|
+ e.getLocalizedMessage());
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
|
@ -7,7 +7,6 @@ import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.apache.log4j.Logger;
|
|
||||||
import org.gcube.common.homelibrary.home.HomeLibrary;
|
import org.gcube.common.homelibrary.home.HomeLibrary;
|
||||||
import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
|
import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
|
||||||
import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
|
import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
|
||||||
|
@ -25,6 +24,8 @@ import org.gcube.contentmanager.storageclient.wrapper.AccessType;
|
||||||
import org.gcube.contentmanager.storageclient.wrapper.MemoryType;
|
import org.gcube.contentmanager.storageclient.wrapper.MemoryType;
|
||||||
import org.gcube.contentmanager.storageclient.wrapper.StorageClient;
|
import org.gcube.contentmanager.storageclient.wrapper.StorageClient;
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
|
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -34,7 +35,7 @@ import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceExceptio
|
||||||
*/
|
*/
|
||||||
public class StorageUtil {
|
public class StorageUtil {
|
||||||
|
|
||||||
private static Logger logger = Logger.getLogger(StorageUtil.class);
|
private static Logger logger = LoggerFactory.getLogger(StorageUtil.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
package org.gcube.portlets.user.dataminermanager.shared.exception;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DataMiner Service Exception
|
|
||||||
*
|
|
||||||
* @author "Giancarlo Panichi"
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class DataMinerServiceException extends
|
|
||||||
ServiceException {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = -4831171355042165166L;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public DataMinerServiceException() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param message
|
|
||||||
*/
|
|
||||||
public DataMinerServiceException(String message) {
|
|
||||||
super(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param message
|
|
||||||
* @param t
|
|
||||||
*/
|
|
||||||
public DataMinerServiceException(String message, Throwable t) {
|
|
||||||
super(message, t);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -3,7 +3,7 @@ package org.gcube.portlets.user.dataminermanager.shared.process;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import org.gcube.portlets.user.dataminermanager.shared.exception.DataMinerServiceException;
|
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -23,7 +23,7 @@ public class ComputationStatus implements Serializable {
|
||||||
private Status status;
|
private Status status;
|
||||||
private Date endDate;
|
private Date endDate;
|
||||||
private String message;
|
private String message;
|
||||||
private DataMinerServiceException error;
|
private ServiceException error;
|
||||||
|
|
||||||
public ComputationStatus() {
|
public ComputationStatus() {
|
||||||
this.status = Status.ACCEPTED;
|
this.status = Status.ACCEPTED;
|
||||||
|
@ -41,7 +41,7 @@ public class ComputationStatus implements Serializable {
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ComputationStatus(DataMinerServiceException error) {
|
public ComputationStatus(ServiceException error) {
|
||||||
super();
|
super();
|
||||||
this.percentage = 100f;
|
this.percentage = 100f;
|
||||||
this.status = Status.FAILED;
|
this.status = Status.FAILED;
|
||||||
|
@ -110,11 +110,11 @@ public class ComputationStatus implements Serializable {
|
||||||
this.message = message;
|
this.message = message;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DataMinerServiceException getError() {
|
public ServiceException getError() {
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setError(DataMinerServiceException error) {
|
public void setError(ServiceException error) {
|
||||||
this.error = error;
|
this.error = error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue