X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionSpec.java;h=002d691ae1802e00dda3d7a49d1a29aedc4cc378;hb=f86db0937b395c7fa96fa4bf4a29cc2c676fe3f5;hp=af0afc416739211df779743d4e08b3434401e346;hpb=1535eecc68ecbda4e67e158de6bcecd074db2545;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java
index af0afc416..002d691ae 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionSpec.java
@@ -1,10 +1,25 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -19,16 +34,18 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
 
+/** Spring based implementation of execution specifications. */
 public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware,
-		ApplicationContextAware, InitializingBean {
+		ApplicationContextAware, InitializingBean, Serializable {
+	private static final long serialVersionUID = 5159882223926926539L;
 	private final static Log log = LogFactory
 			.getLog(DefaultExecutionSpec.class);
-	private ApplicationContext applicationContext;
+	private transient ApplicationContext applicationContext;
 
 	private String description;
 	private Map<String, ExecutionSpecAttribute> attributes = new HashMap<String, ExecutionSpecAttribute>();
 
-	private String name = getClass().getName() + "#" + UUID.randomUUID();
+	private String name = INTERNAL_NAME;
 
 	public Map<String, ExecutionSpecAttribute> getAttributes() {
 		return attributes;
@@ -42,6 +59,10 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware,
 		this.name = name;
 	}
 
+	/**
+	 * The Spring bean name (only relevant for specs declared has high-level
+	 * beans)
+	 */
 	public String getName() {
 		return name;
 	}
@@ -50,6 +71,10 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware,
 		return ((ExecutionSpec) obj).getName().equals(name);
 	}
 
+	/**
+	 * The Spring bean description (only relevant for specs declared has
+	 * high-level beans)
+	 */
 	public String getDescription() {
 		return description;
 	}
@@ -78,12 +103,20 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware,
 			if (attr instanceof RefSpecAttribute) {
 				RefSpecAttribute rsa = (RefSpecAttribute) attr;
 				if (rsa.getChoices() == null) {
-					rsa.setChoices(buildRefValueChoices(rsa));
+					List<RefValueChoice> choices = buildRefValueChoices(rsa);
+					rsa.setChoices(choices);
 				}
+				if (log.isTraceEnabled())
+					log.debug("Spec attr " + key + " has "
+							+ rsa.getChoices().size() + " choices");
 			}
 		}
 	}
 
+	/**
+	 * Generates a list of ref value choices based on the bean available in the
+	 * application ocntext.
+	 */
 	protected List<RefValueChoice> buildRefValueChoices(RefSpecAttribute rsa) {
 		List<RefValueChoice> choices = new ArrayList<RefValueChoice>();
 		if (applicationContext == null) {
@@ -94,10 +127,21 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware,
 
 		for (String beanName : getBeanFactory().getBeanNamesForType(
 				rsa.getTargetClass(), true, false)) {
+
+			// Since Spring 3, systemProperties is implicitly defined but has no
+			// bean definition
+			// if (beanName.equals("systemProperties"))
+			// continue beanNames;
+
 			BeanDefinition bd = getBeanFactory().getBeanDefinition(beanName);
 			RefValueChoice choice = new RefValueChoice();
 			choice.setName(beanName);
 			choice.setDescription(bd.getDescription());
+			if (log.isTraceEnabled())
+				log.debug("Found choice " + beanName + " for " + rsa);
+
+			choices.add(choice);
+
 		}
 		return choices;
 	}