Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[3866] xnjs/trunk/xnjs-module-core/src
|
From: <bsc...@us...> - 2008-12-16 20:20:02
|
Revision: 3866
http://unicore.svn.sourceforge.net/unicore/?rev=3866&view=rev
Author: bschuller
Date: 2008-12-16 20:19:55 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
add explicit sub.action type; JSDL actions will now "sleep" until state-in/out is finished; more admin-friendly logger names
Modified Paths:
--------------
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/Configuration.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/XNJS.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/XNJSConstants.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/AAAException.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/AuthToken.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/Client.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/Role.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ActionStatus.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ExecutionContext.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/IExecutionContextManager.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/IProcessorFactory.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/InternalAction.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/InternalManager.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/JobRunner.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/Manager.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ProcessingException.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/ActionLogger.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DefaultProcessor.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DefaultProcessorFactory.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DummyProcessor.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/LogProcessingTimeProcessor.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/WriteLogTrace.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/FileTransferProcessor.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/XnjsFileImpl.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/ChunkManager.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/ChunkedHTTPFileDownload.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/Client.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/CommonsConnectionFactory.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/HttpTransferCreator.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/IConnectionFactory.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/Reader.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPDownload.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPTransferBase.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPTransferCreator.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPUpload.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FileCopy.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/GSIFTPDownload.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/GSIFTPUpload.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/HTTPFileDownload.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/SimpleFileTransferEngine.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/jsdl/AbstractGrounder.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/jsdl/JSDLProcessor.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/Execution.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/LegacyTSI.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/Reservation.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIConnection.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIConnectionFactory.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIUtils.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/management/JMX.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/AbstractActionStore.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/BasicActionStore.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/BasicActionStoreFactory.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/JDBCActionStoreFactory.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/StorageException.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/reception/Reception.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/simple/BasicAuthenticator.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/simple/BasicExecution.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/simple/BasicManager.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/simple/BasicTSIFactory.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/simple/LocalECManager.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/simple/LocalExecution.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/simple/LocalTS.java
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/simple/SimpleDataStagingProcessor.java
xnjs/trunk/xnjs-module-core/src/test/java/de/fzj/unicore/xnjs/ems/LoadTestSubaction.java
xnjs/trunk/xnjs-module-core/src/test/java/de/fzj/unicore/xnjs/functional/TestTSI.java
xnjs/trunk/xnjs-module-core/src/test/resources/ems/example2.jsdl
Added Paths:
-----------
xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/event/SubActionDoneEvent.java
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/Configuration.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/Configuration.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/Configuration.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -102,7 +102,7 @@
*/
public class Configuration {
- protected static final Logger logger=Logger.getLogger(Configuration.class);
+ protected static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS);
//some static property keys
public static final String CONFIG_AUTOSUBMIT_WHEN_READY="XNJS.autosubmit";
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/XNJS.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/XNJS.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/XNJS.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -49,7 +49,7 @@
*/
public class XNJS {
- private static Logger logger=Logger.getLogger(XNJS.class);
+ private static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS);
public static final String VERSION="1.2.0-SNAPSHOT";
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/XNJSConstants.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/XNJSConstants.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/XNJSConstants.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -44,6 +44,24 @@
public static final String jsdlStageInActionType="JSDL_STAGEIN";
public static final String jsdlStageOutActionType="JSDL_STAGEOUT";
+ /**
+ * logger name: job processing
+ */
+ public static final String LOGGER_XNJS_JOBS="unicore.xnjs.JOBS";
+
+ /**
+ * logger name: i/o
+ */
+ public static final String LOGGER_XNJS_IO="unicore.xnjs.XNJS-IO";
+
+ /**
+ * logger name: general XNJS logger
+ */
+ public static final String LOGGER_XNJS="unicore.xnjs.XNJS";
+ /**
+ * logger name: TSI related logging
+ */
+ public static final String LOGGER_XNJS_TSI="unicore.xnjs.TSI";
}
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/AAAException.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/AAAException.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/AAAException.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -36,11 +36,11 @@
/**
* Generic exception thrown by the AAA subsystem
* @author schuller
- * @version $Id: AAAException.java,v 1.3 2006/08/01 07:16:03 schuller Exp $
*/
public class AAAException extends RuntimeException{
private static final long serialVersionUID=1L;
public AAAException(String msg) {super(msg);}
public AAAException(Throwable t){super(t);}
+ public AAAException(String msg,Throwable t){super(msg,t);}
}
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/AuthToken.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/AuthToken.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/AuthToken.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -39,7 +39,6 @@
* A token by which a client identifies itself
*
* @author schuller
- * @version $Id: AuthToken.java,v 1.3 2006/08/01 07:16:03 schuller Exp $
*/
public class AuthToken implements Serializable {
private static final long serialVersionUID=812374987234L;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/Client.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/Client.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/Client.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -75,7 +75,7 @@
//attributes may contain things relevant on the target system
//such as xlogin, licence keys, ...
- private Map<String,Serializable> attributes;
+ private final Map<String,Serializable> attributes;
/**
* constructs an anonymous Client
@@ -131,10 +131,6 @@
public Map<String, Serializable> getAttributes() {
return attributes;
}
-
- public void setAttributes(Map<String, Serializable> attributes) {
- this.attributes = attributes;
- }
/**
* convenience method for getting the user's xlogin
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/Role.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/Role.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/aaa/Role.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -37,8 +37,8 @@
/**
* A Role defines the rights a client has
+ *
* @author schuller
- * @version $Id: Role.java,v 1.4 2006/11/04 21:11:19 schuller Exp $
*/
public class Role implements Serializable {
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ActionStatus.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ActionStatus.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ActionStatus.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -39,7 +39,6 @@
* the state chart and state transitions
*
* @author schuller
- * @version $Id: ActionStatus.java,v 1.3 2006/08/01 07:16:03 schuller Exp $
*/
public class ActionStatus {
//don't want instances of this
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ExecutionContext.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ExecutionContext.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ExecutionContext.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -44,7 +44,6 @@
* The execution context defines a job's execution environment<br>
*
* @author schuller
- * @version $Id: ExecutionContext.java,v 1.4 2006/08/28 10:55:42 schuller Exp $
*/
public class ExecutionContext implements Serializable{
private static final long serialVersionUID=11231235534268678L;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/IExecutionContextManager.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/IExecutionContextManager.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/IExecutionContextManager.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -39,7 +39,6 @@
* This interface allows to associate a context with an action
*
* @author schuller
- * @version $Id: IExecutionContextManager.java,v 1.3 2006/08/01 07:16:03 schuller Exp $
*/
public interface IExecutionContextManager extends XnjsComponent {
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/IProcessorFactory.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/IProcessorFactory.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/IProcessorFactory.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -37,8 +37,8 @@
/**
* A factory for creating processors
+ *
* @author schuller
- * @version $Id: IProcessorFactory.java,v 1.3 2006/08/01 07:16:03 schuller Exp $
*/
public interface IProcessorFactory extends XnjsComponent{
/**
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/InternalAction.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/InternalAction.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/InternalAction.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -1,5 +1,5 @@
/*********************************************************************************
- * Copyright (c) 2006 Forschungszentrum Juelich GmbH
+ * Copyright (c) 2006-2008 Forschungszentrum Juelich GmbH
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,9 +38,9 @@
* and should not be exposed and managed through the front controller
*
* @author schuller
- * @version $Id: InternalAction.java,v 1.3 2006/08/01 07:16:03 schuller Exp $
*/
public class InternalAction extends Action {
+
private static final long serialVersionUID=65323803495L;
-
+
}
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/InternalManager.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/InternalManager.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/InternalManager.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -43,7 +43,6 @@
* this interface is used within the EMS to manage running actions
*
* @author schuller
- * @version $Id: InternalManager.java,v 1.4 2006/08/01 07:16:03 schuller Exp $
*/
public interface InternalManager extends ActionStateChangeListener, XnjsComponent, EventHandler {
@@ -94,13 +93,14 @@
public Action getAction(String id)throws ExecutionException;
/**
- * add a sub action
+ * construct a sub action and start processing it
*
- * @param jobDescription
- * @param parentAction
+ * @param jobDescription - the job description for the subaction
+ * @param parentAction - the parent action
+ * @param notifyDone - whether to notify the parent when the subaction is done
* @return the unique id of the new action
*/
- public String addSubAction(Serializable jobDescription, String type, Action parentAction)throws ExecutionException;
+ public String addSubAction(Serializable jobDescription, String type, Action parentAction, boolean notifyDone)throws ExecutionException;
/**
* add an internal action
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/JobRunner.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/JobRunner.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/JobRunner.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -37,6 +37,7 @@
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.XnjsComponent;
+import de.fzj.unicore.xnjs.ems.event.ContinueProcessingEvent;
/**
* The main worker class that takes jobs from a queue
@@ -120,6 +121,20 @@
logger.warn("Internal error during state change notification.",ex2);
}
}
+ if(newStatus==ActionStatus.DONE){
+ if(a instanceof SubAction){
+ SubAction s=(SubAction)a;
+ if(s.isNotifyDone()){
+ try{
+ String parent=s.getParentID();
+ mgr.handleEvent(new ContinueProcessingEvent(parent));
+ }
+ catch(Exception ex){
+ logger.error("Error sending notification",ex);
+ }
+ }
+ }
+ }
}catch(ProcessingException pe){
logger.error("Error during processing.",pe);
mgr.errorProcessing(a, pe);
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/Manager.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/Manager.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/Manager.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -43,7 +43,6 @@
* that can add, pause, etc actions<br>
*
* @author schuller
- * @version $Id: Manager.java,v 1.4 2006/08/01 07:16:03 schuller Exp $
*/
public interface Manager extends Startable, XnjsComponent{
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ProcessingException.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ProcessingException.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/ProcessingException.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -36,7 +36,6 @@
/**
* Exception thrown during request processing
* @author schuller
- * @version $Id: ProcessingException.java,v 1.3 2006/08/01 07:16:03 schuller Exp $
*/
public class ProcessingException extends Exception{
protected static final long serialVersionUID=234723L;
@@ -47,4 +46,8 @@
public ProcessingException(Throwable t){
super(t);
}
+ public ProcessingException(String msg,Throwable t){
+ super(msg,t);
+ }
+
}
Added: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/event/SubActionDoneEvent.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/event/SubActionDoneEvent.java (rev 0)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/event/SubActionDoneEvent.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -0,0 +1,20 @@
+package de.fzj.unicore.xnjs.ems.event;
+
+/**
+ * an action was waiting for an event, and can now continue processing
+ *
+ * @author schuller
+ */
+public class SubActionDoneEvent implements XnjsEvent {
+
+ private final String actionID;
+
+ public SubActionDoneEvent(String actionID){
+ this.actionID=actionID;
+ }
+
+ public String getActionID() {
+ return actionID;
+ }
+
+}
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/ActionLogger.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/ActionLogger.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/ActionLogger.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -4,8 +4,6 @@
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.ems.ActionStatus;
import de.fzj.unicore.xnjs.ems.ProcessingException;
@@ -14,8 +12,6 @@
public static final String ACTIONS_LOGGER_FILE="XNJS.logactions_file";
- protected static final Logger logger=Logger.getLogger(ActionLogger.class);
-
private static final String isLoggedKey=
LogProcessingTimeProcessor.class.getName()+"_isLogged";
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DefaultProcessor.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DefaultProcessor.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DefaultProcessor.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -33,7 +33,10 @@
package de.fzj.unicore.xnjs.ems.processors;
+import org.apache.log4j.Logger;
+
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.ems.ActionResult;
import de.fzj.unicore.xnjs.ems.ActionStatus;
import de.fzj.unicore.xnjs.ems.ProcessingException;
@@ -48,6 +51,8 @@
*/
public class DefaultProcessor extends Processor {
+ protected static final Logger logger = Logger.getLogger(XNJSConstants.LOGGER_XNJS_JOBS);
+
public DefaultProcessor(Configuration configuration){
super(configuration);
}
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DefaultProcessorFactory.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DefaultProcessorFactory.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DefaultProcessorFactory.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -38,6 +38,7 @@
import org.apache.log4j.Logger;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.ems.IProcessorFactory;
import de.fzj.unicore.xnjs.ems.Processor;
@@ -51,7 +52,7 @@
*/
public class DefaultProcessorFactory extends XnjsComponentImpl implements IProcessorFactory {
- protected static final Logger logger = Logger.getLogger(DefaultProcessorFactory.class);
+ protected static final Logger logger = Logger.getLogger(XNJSConstants.LOGGER_XNJS_JOBS);
public DefaultProcessorFactory() {
}
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DummyProcessor.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DummyProcessor.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/DummyProcessor.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -33,8 +33,6 @@
package de.fzj.unicore.xnjs.ems.processors;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.ems.ActionStatus;
import de.fzj.unicore.xnjs.ems.ProcessingException;
@@ -45,7 +43,6 @@
* @version $Id: DummyProcessor.java,v 1.3 2006/08/01 07:16:03 schuller Exp $
*/
public class DummyProcessor extends DefaultProcessor {
- protected static final Logger logger=Logger.getLogger(DummyProcessor.class);
public DummyProcessor(Configuration config){
super(config);
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/LogProcessingTimeProcessor.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/LogProcessingTimeProcessor.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/LogProcessingTimeProcessor.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -33,8 +33,6 @@
package de.fzj.unicore.xnjs.ems.processors;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.ems.ActionStatus;
import de.fzj.unicore.xnjs.ems.ProcessingException;
@@ -51,8 +49,6 @@
private static final String startTimeKey=
LogProcessingTimeProcessor.class.getName()+"_starttime";
- protected static final Logger logger=Logger.getLogger(LogProcessingTimeProcessor.class);
-
public LogProcessingTimeProcessor(Configuration config){
super(config);
}
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/WriteLogTrace.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/WriteLogTrace.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/ems/processors/WriteLogTrace.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -36,8 +36,6 @@
import java.io.FileOutputStream;
import java.io.PrintWriter;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.ems.ActionStatus;
@@ -49,8 +47,6 @@
*/
public class WriteLogTrace extends DefaultProcessor {
- protected static final Logger logger = Logger.getLogger(WriteLogTrace.class);
-
public static final String CONFIG_LOG_DONE_ACTIONS_FILE="LOGTRACE";
public WriteLogTrace(Configuration configuration) {
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/FileTransferProcessor.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/FileTransferProcessor.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/FileTransferProcessor.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -35,7 +35,6 @@
import java.net.URI;
-import org.apache.log4j.Logger;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.CreationFlagEnumeration;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.DataStagingType;
@@ -55,7 +54,6 @@
* @author schuller
*/
public class FileTransferProcessor extends DefaultProcessor {
- protected static final Logger logger=Logger.getLogger(FileTransferProcessor.class);
private final static String fileTransferKey="FILETRANSFER";
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/XnjsFileImpl.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/XnjsFileImpl.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/XnjsFileImpl.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -35,6 +35,11 @@
import java.util.Calendar;
+/**
+ * Standard implementation of {@link XnjsFile}
+ *
+ * @author schuller
+ */
public class XnjsFileImpl implements XnjsFile {
private String path;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/ChunkManager.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/ChunkManager.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/ChunkManager.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -63,7 +63,6 @@
* TODO extract interfaces :)
*
* @author schuller
- * @version $Id: ChunkManager.java,v 1.1 2006/08/22 11:13:19 schuller Exp $
*/
public class ChunkManager extends Observable implements IChunkManager, IFileTransfer{
public static final long serialVersionUID=93422348L;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/ChunkedHTTPFileDownload.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/ChunkedHTTPFileDownload.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/ChunkedHTTPFileDownload.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -42,6 +42,7 @@
import org.apache.log4j.Logger;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.io.IFileTransfer;
@@ -54,7 +55,7 @@
*/
public class ChunkedHTTPFileDownload extends XnjsComponentImpl implements IFileTransfer, Observer{
protected static final long serialVersionUID=1L;
- protected static final transient Logger logger=Logger.getLogger(ChunkedHTTPFileDownload.class);
+ protected static final transient Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS_IO);
private String uuid;
private Status status;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/Client.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/Client.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/Client.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -43,7 +43,6 @@
* simple command line "tool" to download a file.
*
* @author schuller
- * @version $Id: Client.java,v 1.1 2006/08/22 11:13:19 schuller Exp $
*/
public class Client {
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/CommonsConnectionFactory.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/CommonsConnectionFactory.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/CommonsConnectionFactory.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -40,7 +40,6 @@
* produces multithreaded httpclients
*
* @author schuller
- * @version $Id: CommonsConnectionFactory.java,v 1.1 2006/08/22 11:13:19 schuller Exp $
*/
public class CommonsConnectionFactory implements IConnectionFactory {
public CommonsConnectionFactory() {
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/HttpTransferCreator.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/HttpTransferCreator.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/HttpTransferCreator.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -40,7 +40,6 @@
import de.fzj.unicore.xnjs.io.IFileTransfer;
import de.fzj.unicore.xnjs.io.IFileTransferCreator;
import de.fzj.unicore.xnjs.io.simple.HTTPFileDownload;
-import de.fzj.unicore.xnjs.jsdl.IGrounder;
/**
* support for staging in files using HTTP GET
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/IConnectionFactory.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/IConnectionFactory.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/IConnectionFactory.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -37,7 +37,6 @@
/**
* cheap factory providing connections
* @author schuller
- * @version $Id: IConnectionFactory.java,v 1.1 2006/08/22 11:13:19 schuller Exp $
*/
public interface IConnectionFactory {
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/Reader.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/Reader.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/http/Reader.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -43,7 +43,6 @@
/**
* @author schuller
- * @version $Id: Reader.java,v 1.1 2006/08/22 11:13:19 schuller Exp $
*/
public class Reader extends Thread {
private IChunkManager mgr;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPDownload.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPDownload.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPDownload.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -40,8 +40,6 @@
import java.net.URL;
import java.util.UUID;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.io.IFileTransfer;
@@ -49,8 +47,6 @@
public class FTPDownload extends FTPTransferBase implements IFileTransfer {
- private static Logger logger=Logger.getLogger(FTPDownload.class);
-
protected static final long serialVersionUID=1L;
private Status status;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPTransferBase.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPTransferBase.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPTransferBase.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -41,13 +41,14 @@
import org.apache.log4j.Logger;
import org.apache.xmlbeans.XmlObject;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.jsdl.HPCPUtils;
public class FTPTransferBase extends XnjsComponentImpl {
- private static Logger logger=Logger.getLogger(FTPTransferBase.class);
+ protected static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS_IO);
protected static final long serialVersionUID=1;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPTransferCreator.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPTransferCreator.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPTransferCreator.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -37,6 +37,7 @@
import org.apache.log4j.Logger;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.ems.Action;
@@ -52,7 +53,7 @@
*/
public class FTPTransferCreator extends XnjsComponentImpl implements IFileTransferCreator {
- private static Logger log=Logger.getLogger(FTPTransferCreator.class);
+ private static Logger log=Logger.getLogger(XNJSConstants.LOGGER_XNJS_IO);
public FTPTransferCreator (Configuration config){
this.configuration=config;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPUpload.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPUpload.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FTPUpload.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -40,8 +40,6 @@
import java.net.URL;
import java.util.UUID;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.io.IFileTransfer;
@@ -49,8 +47,6 @@
public class FTPUpload extends FTPTransferBase implements IFileTransfer {
- private static Logger logger=Logger.getLogger(FTPUpload.class);
-
protected static final long serialVersionUID=12312312L;
private Status status;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FileCopy.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FileCopy.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/FileCopy.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -39,13 +39,19 @@
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.io.IFileTransfer;
import de.fzj.unicore.xnjs.tsi.TSI;
-
+/**
+ * file transfer using local copy
+ *
+ * @author schuller
+ */
public class FileCopy extends XnjsComponentImpl implements IFileTransfer {
- protected static final long serialVersionUID=12312312L;
+
+ protected static final long serialVersionUID=1L;
+
private Status status;
- private String source,target;
- private String uuid;
- private Client client;
+ private final String source,target;
+ private final String uuid;
+ private final Client client;
public FileCopy(Client client,String source, String target) {
status=Status.CREATED;
@@ -83,6 +89,7 @@
*/
public void run() {
try{
+ status=Status.RUNNING;
TSI tsi=getConfiguration().getTargetSystemInterface(client);
tsi.begin();
tsi.cp(source,target);
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/GSIFTPDownload.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/GSIFTPDownload.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/GSIFTPDownload.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -39,8 +39,6 @@
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.ems.Action;
@@ -61,8 +59,6 @@
*/
public class GSIFTPDownload extends FTPTransferBase implements IFileTransfer,Observer<XnjsFile> {
- private static Logger logger=Logger.getLogger(GSIFTPDownload.class);
-
protected static final long serialVersionUID=1L;
/**
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/GSIFTPUpload.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/GSIFTPUpload.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/GSIFTPUpload.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -38,8 +38,6 @@
import java.net.URI;
import java.util.UUID;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.ems.Action;
@@ -57,8 +55,6 @@
*/
public class GSIFTPUpload extends FTPTransferBase implements IFileTransfer{
- private static Logger logger=Logger.getLogger(GSIFTPUpload.class);
-
protected static final long serialVersionUID=1L;
/**
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/HTTPFileDownload.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/HTTPFileDownload.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/HTTPFileDownload.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -41,6 +41,7 @@
import org.apache.log4j.Logger;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.io.IFileTransfer;
@@ -54,7 +55,7 @@
public class HTTPFileDownload extends XnjsComponentImpl implements IFileTransfer{
protected static final long serialVersionUID=1L;
- private static Logger logger=Logger.getLogger(HTTPFileDownload.class);
+ private static Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS_IO);
private final String uuid;
private Status status;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/SimpleFileTransferEngine.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/SimpleFileTransferEngine.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/io/simple/SimpleFileTransferEngine.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -42,6 +42,7 @@
import org.apache.log4j.Logger;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.ems.Action;
@@ -59,8 +60,9 @@
* @author schuller
*/
public class SimpleFileTransferEngine extends XnjsComponentImpl implements IFileTransferEngine {
- protected static final Logger logger=Logger.getLogger(SimpleFileTransferEngine.class);
+ protected static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS_IO);
+
private final Map<String,IFileTransfer>map;
private final List<IFileTransferCreator>creators;
private final List<String>protocols;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/jsdl/AbstractGrounder.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/jsdl/AbstractGrounder.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/jsdl/AbstractGrounder.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -51,6 +51,7 @@
import org.ggf.schemas.jsdl.x2005.x11.jsdlPosix.POSIXApplicationType;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.beans.idb.ResourceSettingDocument;
@@ -73,22 +74,23 @@
* @author schuller
*/
public abstract class AbstractGrounder extends XnjsComponentImpl implements IGrounder {
- protected Logger logger=Logger.getLogger(AbstractGrounder.class);
+ protected static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS_JOBS);
+
//key is application "name<version>", value is posix app
- protected Map<String,POSIXApplicationType> idb;
+ protected final Map<String,POSIXApplicationType> idb;
- protected List<ApplicationType> apps;
+ protected final List<ApplicationType> apps;
- protected Map<String, String> filespaces;
+ protected final Map<String, String> filespaces;
protected ResourcesType resources;
- protected Map<String, String> textInfoProperties;
+ protected final Map<String, String> textInfoProperties;
- protected Map<String, String> scripts;
+ protected final Map<String, String> scripts;
- protected Map<String, ResourceSetting> siteSpecificResources;
+ protected final Map<String, ResourceSetting> siteSpecificResources;
protected String submitTemplate;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/jsdl/JSDLProcessor.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/jsdl/JSDLProcessor.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/jsdl/JSDLProcessor.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -37,7 +37,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionDocument;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDescriptionType;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobIdentificationType;
@@ -61,7 +60,6 @@
* @author schuller
*/
public class JSDLProcessor extends DefaultProcessor {
- protected static final Logger logger=Logger.getLogger(JSDLProcessor.class);
public static final String subactionkey_in="JSDL_de.fzj.unicore.xnjs.jsdl.JSDLProcessor_SUBACTION_STAGEIN";
public static final String KEY_DELETEONTERMINATION="JSDL_DELETEFILES";
@@ -106,7 +104,6 @@
JobDescriptionType job=jdd.getJobDefinition().getJobDescription();
if(job==null){
String msg="Empty job description. Setting to DONE.";
- logger.info(msg);
action.addLogTrace(msg);
setToDoneSuccessfully();
return;
@@ -211,8 +208,8 @@
goToPending();
}
else{
- //could have context variable
if(action.getProcessingContext().get(Action.AUTO_SUBMIT)==null){
+ //action will sleep until client starts it
action.setWaiting(true);
return;
}
@@ -241,7 +238,6 @@
if(ajd.getJobDefinition().getJobDescription()==null){
String msg="Empty job description. Setting to DONE.";
- logger.info(msg);
action.addLogTrace(msg);
setToDoneSuccessfully();
return;
@@ -369,9 +365,10 @@
private void addStageIn(JobDefinitionDocument jdd) throws ProcessingException{
try{
String subId=manager.addSubAction((Serializable)JSDLUtils.getStageInArrayAsList(jdd),
- XNJSConstants.jsdlStageInActionType,action);
+ XNJSConstants.jsdlStageInActionType,action,true);
action.getProcessingContext().put(subactionkey_in,subId);
action.addLogTrace("Adding stage in subaction with id="+subId);
+ action.setWaiting(true);
}catch(Exception ex){
throw new ProcessingException(ex);
}
@@ -387,9 +384,10 @@
//check if we can process STAGE_OUT
if(getConfiguration().haveProcessingFor(XNJSConstants.jsdlStageOutActionType)){
String subId=manager.addSubAction((Serializable)JSDLUtils.getStageOutArrayAsList(jdd),
- XNJSConstants.jsdlStageOutActionType,action);
+ XNJSConstants.jsdlStageOutActionType,action,true);
action.addLogTrace("Adding stage out subaction with id="+subId);
action.getProcessingContext().put(subactionkey_out, subId);
+ action.setWaiting(true);
}
else {
action.addLogTrace("Staging out not done.");
@@ -440,10 +438,12 @@
action.addLogTrace("Result: Success.");
deleteFiles();
action.addLogTrace(getTimeProfile(action.getProcessingContext()));
+ logger.info("Action "+action.getUUID()+ " SUCCESSFUL.");
}
private void setToDoneAndFailed(){
action.fail();
+ logger.info("Action "+action.getUUID()+ " FAILED.");
}
private int getExitCode(){
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/Execution.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/Execution.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/Execution.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -63,7 +63,7 @@
//GuardedBy bssJobStates
private Map<String,String> bssJobStates;
//GuardedBy bssJobStates
- private Map<String,String> jobIDs;
+ private final Map<String,String> jobIDs;
private int updateInterval;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/LegacyTSI.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/LegacyTSI.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/LegacyTSI.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -45,6 +45,7 @@
import org.apache.log4j.Logger;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.ems.ExecutionContext;
@@ -63,10 +64,11 @@
*/
@Dependency(classes={TSIConnectionFactory.class})
public class LegacyTSI extends XnjsComponentImpl implements TSI {
- protected static final Logger logger=Logger.getLogger(LegacyTSI.class);
+
+ protected static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS_TSI);
//command buffer
- private StringBuffer commands=new StringBuffer();
+ private StringBuilder commands=new StringBuilder();
private String user="nobody";
private ExecutionContext ec;
@@ -135,7 +137,7 @@
* @see de.fzj.unicore.xnjs.tsi.TSI#begin()
*/
public void begin() throws ExecutionException {
- commands=new StringBuffer();
+ commands=new StringBuilder();
}
/* (non-Javadoc)
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/Reservation.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/Reservation.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/Reservation.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -7,6 +7,7 @@
import org.apache.xmlbeans.XmlObject;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.ResourcesType;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.ems.ExecutionException;
@@ -22,8 +23,9 @@
* @author schuller
*/
public class Reservation extends XnjsComponentImpl implements IReservation {
- private Logger logger=Logger.getLogger(Reservation.class);
+ private Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS_JOBS);
+
/**
*Cancel a reservation on the classic TSI
*
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIConnection.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIConnection.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIConnection.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -45,17 +45,18 @@
import org.apache.log4j.Logger;
+import de.fzj.unicore.xnjs.XNJSConstants;
+
/**
* implementation of a "legacy" TSIConnection<br>
*
* lots of code from Sven van den Berghe's ClassicTSIConnection in here
*
* @author schuller
- * @version $Id: TSIConnection.java,v 1.5 2006/09/23 10:48:03 schuller Exp $
*/
public class TSIConnection {
- protected static Logger logger = Logger.getLogger(TSIConnection.class
- .getName());
+
+ protected static final Logger logger = Logger.getLogger(XNJSConstants.LOGGER_XNJS_TSI);
private String idLine;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIConnectionFactory.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIConnectionFactory.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIConnectionFactory.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -42,6 +42,7 @@
import org.apache.log4j.Logger;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.aaa.Client;
import de.fzj.unicore.xnjs.management.ManagedComponent;
@@ -56,8 +57,9 @@
*/
@ManagedComponent(mbean=TSIConnectionFactory.class,name="LegacyTSI")
public class TSIConnectionFactory extends XnjsComponentImpl implements Startable,TSIConnectionFactoryMBean{
- protected static final Logger log=Logger.getLogger(TSIConnectionFactory.class);
+ protected static final Logger log=Logger.getLogger(XNJSConstants.LOGGER_XNJS_TSI);
+
private final List<TSIConnection> pool=new ArrayList<TSIConnection>();
private InetAddress source_addr=null;
private ServerSocket server=null;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIUtils.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIUtils.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/legacy/TSIUtils.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -53,6 +53,7 @@
import org.ggf.schemas.jsdl.x2005.x11.jsdlPosix.POSIXApplicationType;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.beans.idb.ResourceSettingDocument.ResourceSetting;
import de.fzj.unicore.xnjs.ems.Action;
import de.fzj.unicore.xnjs.ems.ExecutionContext;
@@ -73,11 +74,11 @@
* a JSDL resource element, @see TSIUtils#appendTSIResourceSpec(StringBuffer, ResourcesType)
*
* @author schuller
- * @version $Id: TSIUtils.java,v 1.5 2006/09/23 10:48:03 schuller Exp $
*/
public class TSIUtils {
- protected static final Logger logger=Logger.getLogger(TSIUtils.class);
+ protected static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS_TSI);
+
public static final String EXITCODE_FILENAME="UNICORE_SCRIPT_EXIT_CODE";
private static final String TEMPLATE_COMMAND="#COMMAND";
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/management/JMX.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/management/JMX.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/management/JMX.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -9,6 +9,8 @@
import org.apache.log4j.Logger;
+import de.fzj.unicore.xnjs.XNJSConstants;
+
/**
* helper for dealing with JMX<br/>
* Allows to register beans, avoiding duplicates
@@ -17,7 +19,7 @@
*/
public class JMX {
- private static final Logger logger=Logger.getLogger(JMX.class);
+ private static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS);
private JMX(){}
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/AbstractActionStore.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/AbstractActionStore.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/AbstractActionStore.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -47,10 +47,10 @@
import de.fzj.unicore.persist.PersistenceException;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
import de.fzj.unicore.xnjs.XnjsComponentImpl;
import de.fzj.unicore.xnjs.ems.Action;
import de.fzj.unicore.xnjs.ems.ActionStatus;
-import de.fzj.unicore.xnjs.management.JMX;
/**
* abstract action storage class.
@@ -58,8 +58,9 @@
* @author schuller
*/
public abstract class AbstractActionStore extends XnjsComponentImpl implements IActionStore,ActionStoreJmxMBean{
- protected static final Logger logger=Logger.getLogger(AbstractActionStore.class);
+ protected static final Logger logger=Logger.getLogger(XNJSConstants.LOGGER_XNJS);
+
//minimum waiting time (milliseconds) before an Action is processed again
protected int updateInterval=10;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/BasicActionStore.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/BasicActionStore.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/BasicActionStore.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -34,14 +34,11 @@
package de.fzj.unicore.xnjs.persistence;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
-
import de.fzj.unicore.xnjs.Configuration;
import de.fzj.unicore.xnjs.ems.Action;
@@ -54,8 +51,6 @@
public class BasicActionStore extends AbstractActionStore {
protected Map<String,Action>map;
-
- protected static Logger log=Logger.getLogger(BasicActionStore.class);
public BasicActionStore(String id, Configuration config){
super(id,config);
@@ -63,10 +58,10 @@
@Override
protected void doInit() {
- map=Collections.synchronizedMap(new HashMap<String,Action>());
+ map=new HashMap<String,Action>();
}
- public Set<String> getUniqueIDs(){
+ public synchronized Set<String> getUniqueIDs(){
return map.keySet();
}
@@ -76,12 +71,12 @@
}
@Override
- protected Action doGet(String id) {
+ protected synchronized Action doGet(String id) {
return map.get(id);
}
@Override
- protected Action doGetForUpdate(String id) {
+ protected synchronized Action doGetForUpdate(String id) {
return map.get(id);
}
@@ -89,7 +84,7 @@
* @see de.fzj.unicore.xnjs.persistence.AbstractActionStore#doRemove(java.lang.String)
*/
@Override
- protected void doRemove(String id) {
+ protected synchronized void doRemove(String id) {
map.remove(id);
}
@@ -97,7 +92,7 @@
* @see de.fzj.unicore.xnjs.persistence.AbstractActionStore#doStore(de.fzj.unicore.xnjs.persistence.AbstractActionStore.ActionDAO)
*/
@Override
- protected void doStore(Action action) {
+ protected synchronized void doStore(Action action) {
map.put(action.getUUID(),action);
}
@@ -105,11 +100,11 @@
* @see de.fzj.unicore.xnjs.persistence.AbstractActionStore#size()
*/
@Override
- public int size() {
+ public synchronized int size() {
return map.size();
}
- public int size(int actionStatus) {
+ public synchronized int size(int actionStatus) {
int i=0;
for(Action action: map.values()){
if(action.getStatus()==actionStatus) i++;
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/BasicActionStoreFactory.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/BasicActionStoreFactory.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/BasicActionStoreFactory.java 2008-12-16 20:19:55 UTC (rev 3866)
@@ -39,10 +39,12 @@
import org.apache.log4j.Logger;
import de.fzj.unicore.xnjs.Configuration;
+import de.fzj.unicore.xnjs.XNJSConstants;
public class BasicActionStoreFactory implements IActionStoreFactory{
- protected static final Logger log=Logger.getLogger(BasicActionStoreFactory.class);
+ protected static final Logger log=Logger.getLogger(XNJSConstants.LOGGER_XNJS);
+
private static Map<String, IActionStore>map=new HashMap<String, IActionStore>();
public synchronized IActionStore getInstance(String id, Configuration config) {
Modified: xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/JDBCActionStoreFactory.java
===================================================================
--- xnjs/trunk/xnjs-module-core/src/main/java/de/fzj/unicore/xnjs/persistence/JDBCActionStoreFactory.java 2008-12-16 12:30:16 UTC (rev 3865)
+++ xnjs/trunk/xnjs-module...
[truncated message content] |