|
36 | 36 | */ |
37 | 37 | package org.ow2.proactive.scheduler.common.job.factories; |
38 | 38 |
|
39 | | -import java.io.*; |
40 | | -import java.util.ArrayList; |
41 | | -import java.util.List; |
42 | | -import java.util.Map; |
43 | | -import java.util.concurrent.TimeUnit; |
44 | | - |
45 | | -import javax.xml.parsers.DocumentBuilder; |
46 | | -import javax.xml.parsers.DocumentBuilderFactory; |
47 | | -import javax.xml.parsers.ParserConfigurationException; |
48 | | -import javax.xml.transform.OutputKeys; |
49 | | -import javax.xml.transform.Transformer; |
50 | | -import javax.xml.transform.TransformerException; |
51 | | -import javax.xml.transform.TransformerFactory; |
52 | | -import javax.xml.transform.dom.DOMSource; |
53 | | -import javax.xml.transform.stream.StreamResult; |
54 | | - |
| 39 | +import org.apache.commons.io.IOUtils; |
| 40 | +import org.apache.log4j.Logger; |
55 | 41 | import org.objectweb.proactive.extensions.dataspaces.vfs.selector.FileSelector; |
56 | 42 | import org.ow2.proactive.scheduler.common.job.JobEnvironment; |
57 | 43 | import org.ow2.proactive.scheduler.common.job.TaskFlowJob; |
|
65 | 51 | import org.ow2.proactive.scripting.GenerationScript; |
66 | 52 | import org.ow2.proactive.scripting.Script; |
67 | 53 | import org.ow2.proactive.scripting.SelectionScript; |
68 | | -import org.ow2.proactive.topology.descriptor.ArbitraryTopologyDescriptor; |
69 | | -import org.ow2.proactive.topology.descriptor.BestProximityDescriptor; |
70 | | -import org.ow2.proactive.topology.descriptor.DifferentHostsExclusiveDescriptor; |
71 | | -import org.ow2.proactive.topology.descriptor.MultipleHostsExclusiveDescriptor; |
72 | | -import org.ow2.proactive.topology.descriptor.SingleHostDescriptor; |
73 | | -import org.ow2.proactive.topology.descriptor.SingleHostExclusiveDescriptor; |
74 | | -import org.ow2.proactive.topology.descriptor.ThresholdProximityDescriptor; |
75 | | -import org.ow2.proactive.topology.descriptor.TopologyDescriptor; |
76 | | -import org.apache.commons.io.IOUtils; |
77 | | -import org.apache.log4j.Logger; |
| 54 | +import org.ow2.proactive.topology.descriptor.*; |
78 | 55 | import org.w3c.dom.CDATASection; |
79 | 56 | import org.w3c.dom.Document; |
80 | 57 | import org.w3c.dom.Element; |
@@ -918,12 +895,15 @@ private Element createScriptExecutableElement(Document doc, ScriptTask t) { |
918 | 895 | } |
919 | 896 |
|
920 | 897 | private static String formatDate(long millis) { |
921 | | - String formatted = String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(millis), |
922 | | - TimeUnit.MILLISECONDS.toMinutes(millis) - |
923 | | - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(millis)), TimeUnit.MILLISECONDS |
924 | | - .toSeconds(millis) - |
925 | | - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(millis))); |
926 | | - return formatted.replace("00:", ""); |
| 898 | + long hours = TimeUnit.MILLISECONDS.toHours(millis); |
| 899 | + millis -= TimeUnit.HOURS.toMillis(hours); |
| 900 | + long minutes = TimeUnit.MILLISECONDS.toMinutes(millis); |
| 901 | + millis -= TimeUnit.MINUTES.toMillis(minutes); |
| 902 | + long seconds = TimeUnit.MILLISECONDS.toSeconds(millis); |
| 903 | + String formatted = String.format("%02d:%02d:%02d", hours, |
| 904 | + minutes, seconds); |
| 905 | + // replace heading 00: as it's not accepted by the schema validation |
| 906 | + return (formatted.replaceFirst("^(00:)+", "")); |
927 | 907 | } |
928 | 908 | } |
929 | 909 |
|
|
0 commit comments