From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 28 Jul 2009 12:53:06 +0000 (+0000)
Subject: Improve ref appearance and logs
X-Git-Tag: argeo-slc-2.1.7~1593
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=85687cee381bedace4a36f7203229a42dbcbc44d;p=gpl%2Fargeo-slc.git

Improve ref appearance and logs

git-svn-id: https://svn.argeo.org/slc/trunk@2821 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
index a38526dff..092953fab 100644
--- a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
@@ -34,6 +34,18 @@
 					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
 						p:isParameter="false" p:isFrozen="false" />
 				</entry>
+				<entry key="refWithoutValueFrozen">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="true" p:isFrozen="true">
+						<property name="value">
+							<bean class="org.argeo.slc.core.test.BasicTestData">
+								<aop:scoped-proxy />
+								<property name="expected" value="tata" />
+								<property name="reached" value="tata" />
+							</bean>
+						</property>
+					</bean>
+				</entry>
 			</map>
 		</property>
 	</bean>
diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
index 968debcb7..0e51cfeaa 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
@@ -28,7 +28,7 @@ public class DefaultExecutionFlowDescriptorConverter implements
 	public final static String REF_VALUE_TYPE_BEAN_NAME = "beanName";
 
 	/** Workaround for https://www.spartadn.com/bugzilla/show_bug.cgi?id=206 */
-	private final static String REF_VALUE_IS_FROZEN = "__frozen";
+	private final static String REF_VALUE_IS_FROZEN = "[internal]";
 
 	private final static Log log = LogFactory
 			.getLog(DefaultExecutionFlowDescriptorConverter.class);
@@ -177,12 +177,14 @@ public class DefaultExecutionFlowDescriptorConverter implements
 				}
 			}
 			if (ref == null) {
-				if (log.isTraceEnabled())
-					log.warn("Cannot define reference for ref spec attribute "
+				log.warn("Cannot define reference for ref spec attribute "
+						+ key + " in " + executionFlow + " (" + rsa + ")."
+						+ " If it is an inner bean consider put it frozen.");
+			} else {
+				if (log.isDebugEnabled())
+					log.debug(ref + " is the reference for ref spec attribute "
 							+ key + " in " + executionFlow + " (" + rsa + ")");
-			} else if (log.isDebugEnabled())
-				log.debug(ref + " is the reference for ref spec attribute "
-						+ key + " in " + executionFlow + " (" + rsa + ")");
+			}
 			refValue.setRef(ref);
 		}
 		return refValue;