git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch b/server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch
deleted file mode 100644 (file)
index 7e5b62e..0000000
--- a/server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">\r
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>\r
-</listAttribute>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/user.jobengine.executors/deploy-steps-to-bsh-bkup.bat}"/>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.executors}"/>\r
-</launchConfiguration>\r

diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-main.bat b/server/user.jobengine.executors/deploy-steps-to-bsh-main.bat
deleted file mode 100644 (file)
index 69a77ed..0000000
--- a/server/user.jobengine.executors/deploy-steps-to-bsh-main.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@ECHO OFF\r
-\r
-SET REMOTE_HOST=10.10.1.28\r
-SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4\r
-SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST%\r
-\r
-SET LOCAL_STEPS_LOCATION=bin/user\r
-SET REMOTE_STEPS_LOCATION=/opt/mediacube/configuration/executors/user\r
-\r
-SET LOCAL_TEMPLATES_LOCATION=jobtemplates\r
-SET REMOTE_TEMPLATES_LOCATION=/opt/mediacube/configuration/jobtemplates\r
- \r
-       ECHO *** Deploy steps to server %REMOTE_HOST% ***\r
-       WinSCP.com /command ^\r
-       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
-       "lcd %LOCAL_STEPS_LOCATION%" ^\r
-       "cd %REMOTE_STEPS_LOCATION%" ^\r
-       "synchronize remote" ^\r
-       "exit"\r
-\r
-       ECHO *** Deploy templates to server %REMOTE_HOST% ***\r
-       WinSCP.com /command ^\r
-       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
-       "lcd %LOCAL_TEMPLATES_LOCATION%" ^\r
-       "cd %REMOTE_TEMPLATES_LOCATION%" ^\r
-       "synchronize remote" ^\r
-       "exit"\r
-\r
-@ECHO ON\r
- 
\ No newline at end of file

diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-main.launch b/server/user.jobengine.executors/deploy-steps-to-bsh-main.launch
deleted file mode 100644 (file)
index b0f17cc..0000000
--- a/server/user.jobengine.executors/deploy-steps-to-bsh-main.launch
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">\r
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>\r
-</listAttribute>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/user.jobengine.executors/deploy-steps-to-bsh-main.bat}"/>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.executors}"/>\r
-</launchConfiguration>\r

diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh.batx b/server/user.jobengine.executors/deploy-steps-to-bsh.batx
deleted file mode 100644 (file)
index 6373237..0000000
--- a/server/user.jobengine.executors/deploy-steps-to-bsh.batx
+++ /dev/null
@@ -1,32 +0,0 @@
-@ECHO OFF\r
-\r
-SET REMOTE_HOST=10.10.1.27\r
-SET REMOTE_LOCATION=/opt/mediacube/configuration/executors\r
-SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4\r
-SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST%\r
-SET LOCAL_STEPS_LOCATION=bin/user/jobengine/server/steps\r
-SET LOCAL_CONFIG_LOCATION=config\r
- \r
-       ECHO *** Begin deploy steps to server %REMOTE_HOST% ***\r
-       ECHO --- Deploying\r
-       \r
-       WinSCP.com /command ^\r
-       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
-       "cd %REMOTE_LOCATION%" ^\r
-       "lcd %LOCAL_STEPS_LOCATION%" ^\r
-       "synchronize remote" ^\r
-       "lcd ..\" ^\r
-       "lcd ..\" ^\r
-       "lcd ..\" ^\r
-       "lcd ..\" ^\r
-       "lcd ..\" ^\r
-       "lcd %LOCAL_CONFIG_LOCATION%" ^\r
-       "synchronize remote -filemask=config.xml" ^\r
-       "cd .." ^\r
-       "synchronize remote -filemask=scheduledjobs.json" ^\r
-       "exit"\r
-       \r
-       ECHO *** Completed ***\r
-@ECHO ON\r
-\r
- \r

diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh2.batx b/server/user.jobengine.executors/deploy-steps-to-bsh2.batx
deleted file mode 100644 (file)
index 288eec4..0000000
--- a/server/user.jobengine.executors/deploy-steps-to-bsh2.batx
+++ /dev/null
@@ -1,33 +0,0 @@
-@ECHO OFF\r
-\r
-SET REMOTE_HOST=10.10.1.27\r
-SET REMOTE_LOCATION=/opt/mediacube/configuration/executors\r
-SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4\r
-SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST%\r
-SET LOCAL_STEPS_LOCATION=bin/user/jobengine/server/steps\r
-SET LOCAL_CONFIG_LOCATION=config\r
- \r
-       ECHO *** Begin deploy steps to server %REMOTE_HOST% ***\r
-       ECHO --- Deploying\r
-       \r
-       WinSCP.com /command ^\r
-       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
-       "cd %REMOTE_LOCATION%" ^\r
-       "lcd %LOCAL_STEPS_LOCATION%" ^\r
-       "synchronize remote" ^\r
-       "lcd ..\" ^\r
-       "lcd ..\" ^\r
-       "lcd ..\" ^\r
-       "lcd ..\" ^\r
-       "lcd ..\" ^\r
-       "lcd %LOCAL_CONFIG_LOCATION%" ^\r
-       "synchronize remote -filemask=config.xml" ^\r
-       "cd .." ^\r
-       "synchronize remote -filemask=scheduledjobs.json" ^\r
-       "call pcs resource restart mediacube_script" ^\r
-       "exit"\r
-       \r
-       ECHO *** Completed ***\r
-@ECHO ON\r
-\r
- \r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java
index b30583a9bd63afad713903452c04819251e01f52..49c9503ecdd3cde0b0d22274b9a47e31707e8893 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java
@@ -48,6 +48,8 @@ public class TSMExtendedRetrieveStep extends TSMRestoreStep {
                                        outStream.close();\r
                                targetUri.cleanUp();\r
                        }\r
+               } else {\r
+                       super.afterRestore(targetUri, targetPath, killDateDays, targetFileName);\r
                }\r
        }\r
 \r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/deploy-steps-to-bsh.launch b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/deploy-steps-to-bsh.launch
deleted file mode 100644 (file)
index f6a5a70..0000000
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/deploy-steps-to-bsh.launch
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">\r
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>\r
-</listAttribute>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/user.jobengine.executors/deploy-steps-to-bsh.bat}"/>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.executors}"/>\r
-</launchConfiguration>\r