Prepare the introduction of Spring 3

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

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 af0afc416739211df779743d4e08b3434401e346..078ee569e53e78f30cc85871bfa66641c1fa3a33 100644 (file)
--- 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,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;
@@ -78,12 +94,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) {
@@ -92,12 +116,23 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware,
                        return choices;
                }
 
-               for (String beanName : getBeanFactory().getBeanNamesForType(
+               beanNames: 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;
        }