Fix issue related to serialization, old spring template files and logging

[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 1f66686f5680d89d47c85c32d74217e0c77c87fe..d47325d349b9065263d1974ee573847fc0959390 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,5 +1,22 @@
+/*
+ * 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.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -20,10 +37,11 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
 
 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>();
@@ -79,16 +97,19 @@ public class DefaultExecutionSpec implements ExecutionSpec, BeanNameAware,
                                RefSpecAttribute rsa = (RefSpecAttribute) attr;
                                if (rsa.getChoices() == null) {
                                        List<RefValueChoice> choices = buildRefValueChoices(rsa);
-                                       if (log.isTraceEnabled())
-                                               log.debug("Found " + choices.size() + " choices for "
-                                                               + rsa + " in spec " + name);
-
                                        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) {
@@ -99,6 +120,12 @@ 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);