import org.argeo.slc.execution.ExecutionSpec;
import org.argeo.slc.execution.ExecutionSpecAttribute;
import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.InitializingBean;
import org.springframework.validation.MapBindingResult;
/** Default implementation of an execution flow. */
-public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
- BeanNameAware {
+public class DefaultExecutionFlow implements ExecutionFlow, BeanNameAware {
private final static Log log = LogFactory
.getLog(DefaultExecutionFlow.class);
private Map<String, Object> parameters = new HashMap<String, Object>();
private List<Runnable> executables = new ArrayList<Runnable>();
- private String path;
-
private Boolean failOnError = true;
public DefaultExecutionFlow() {
runnable.run();
}
- public void afterPropertiesSet() throws Exception {
- if (path == null) {
- if (name.charAt(0) == '/') {
- path = name.substring(0, name.lastIndexOf('/'));
- }
- }
-
- if (path != null) {
- for (Runnable executable : executables) {
- if (executable instanceof DefaultExecutionFlow) {
- // so we don't need to have DefaultExecutionFlow
- // implementing StructureAware
- // FIXME: probably has side effects
- DefaultExecutionFlow flow = (DefaultExecutionFlow) executable;
- String newPath = path + '/' + flow.getName();
- flow.setPath(newPath);
- log.warn(newPath + " was forcibly set on " + flow);
- }
- }
- }
- }
-
public void setBeanName(String name) {
this.name = name;
}
return name.hashCode();
}
- public String getPath() {
- return path;
- }
-
+ /** @deprecated does nothing */
+ @Deprecated
public void setPath(String path) {
- this.path = path;
}
public Boolean getFailOnError() {
md.getExecutionFlows().addAll(set);
}
- @SuppressWarnings("deprecation")
public ExecutionFlowDescriptor getExecutionFlowDescriptor(
ExecutionFlow executionFlow) {
if (executionFlow.getName() == null)
ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(name, values,
executionSpec);
- if (executionFlow.getPath() != null)
- efd.setPath(executionFlow.getPath());
- else
- efd.setPath("");
+// if (executionFlow.getPath() != null)
+// efd.setPath(executionFlow.getPath());
+// else
+// efd.setPath("");
// Takes description from spring
BeanFactory bf = getBeanFactory();
* interpreted by UIs as a hierarchy;
*/
public String getName();
-
- /**
- * @deprecated will be removed in SLC 2.0, the path should be the part of
- * the name with '/'
- */
- public String getPath();
}
String relativePath, ExecutionFlowDescriptor efd)
throws RepositoryException {
Node flowNode = null;
+ // if (relativePath.startsWith("/"))
+ // relativePath = relativePath.substring(1);
+ // if (relativePath.endsWith("/"))
+ // relativePath = relativePath.substring(0, relativePath.length() - 1);
+
Iterator<String> names = Arrays.asList(relativePath.split("/"))
.iterator();
// create intermediary paths
* UTILITIES
*/
/** @return the relative path, never starts with '/' */
- @SuppressWarnings("deprecation")
protected String getExecutionFlowRelativePath(
ExecutionFlowDescriptor executionFlow) {
- String relativePath = executionFlow.getPath() == null ? executionFlow
- .getName() : executionFlow.getPath() + '/'
- + executionFlow.getName();
+ String relativePath = executionFlow.getName();
// we assume that it is more than one char long
if (relativePath.charAt(0) == '/')
relativePath = relativePath.substring(1);
}
}
- @SuppressWarnings("deprecation")
protected ObjectName flowMBeanName(Module module,
ExecutionFlow executionFlow) {
String executionModulesPrefix = "SLCExecutionModules";
- String path = executionFlow.getPath();
+ // String path = executionFlow.getPath();
String name = executionFlow.getName();
- if (path == null && name.indexOf('/') >= 0) {
- path = name.substring(0, name.lastIndexOf('/'));
- name = name.substring(name.lastIndexOf('/'));
- }
+ // if (path == null && name.indexOf('/') >= 0) {
+ // path = name.substring(0, name.lastIndexOf('/'));
+ // name = name.substring(name.lastIndexOf('/'));
+ // }
StringBuffer buf = new StringBuffer(executionModulesPrefix + ":"
+ "module=" + module.getName() + " [" + module.getVersion()
+ "],");
- if (path != null && !path.equals("")) {
- int depth = 0;
- for (String token : path.split("/")) {
- if (!token.equals("")) {
- buf.append("path").append(depth).append('=');
- // in order to have directories first
- buf.append('/');
- buf.append(token).append(',');
- depth++;
- }
- }
- }
+ // if (path != null && !path.equals("")) {
+ // int depth = 0;
+ // for (String token : path.split("/")) {
+ // if (!token.equals("")) {
+ // buf.append("path").append(depth).append('=');
+ // // in order to have directories first
+ // buf.append('/');
+ // buf.append(token).append(',');
+ // depth++;
+ // }
+ // }
+ // }
+
+ // FIXME deal with /
+
buf.append("name=").append(name);
try {
return new ObjectName(buf.toString());