Introduce JCR agent. Client agent not needed anymore.

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / DefaultExecutionFlow.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
index 7425a35c93a1e94ff9a16d8c66e27d83b53fc517..bf1cf99a5f5efc8e3b3da117407ce58c831b0537 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
@@ -15,6 +31,7 @@ import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.structure.StructureAware;
 import org.argeo.slc.structure.StructureRegistry;
+import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.validation.MapBindingResult;
@@ -91,7 +108,7 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
        public void run() {
                try {
                        for (Runnable executable : executables) {
-                               doExecuteRunnable(executable);
+                               this.doExecuteRunnable(executable);
                        }
                } catch (RuntimeException e) {
                        if (failOnError)
@@ -113,16 +130,26 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 
        @SuppressWarnings(value = { "unchecked" })
        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 StructureAware) {
+                               if (executable instanceof StructureAware
+                                               && !(executable instanceof ScopedObject)) {
                                        ((StructureAware<TreeSPath>) executable).notifyCurrentPath(
                                                        registry, new TreeSPath(path));
                                } else if (executable instanceof DefaultExecutionFlow) {
                                        // so we don't need to have DefaultExecutionFlow
                                        // implementing StructureAware
+                                       // FIXME: probably has side effects
                                        DefaultExecutionFlow flow = (DefaultExecutionFlow) executable;
-                                       flow.setPath(path + '/' + flow.getName());
+                                       String newPath = path + '/' + flow.getName();
+                                       flow.setPath(newPath);
+                                       log.warn(newPath + " was forcibly set on " + flow);
                                }
                        }
                }