From dec2ca30c20c15a47f76d53f32d5f8c048391958 Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Tue, 27 Oct 2009 15:22:36 +0000
Subject: [PATCH] RESOLVED - issue SPR-4783: Add name attribute to all
 namespaces that use AbstractBeanDefinitionParser and declare name= attribute
 (includes <lang:groovy.../>).

---
 .../springframework/scripting/config/spring-lang-3.0.xsd   | 7 +++++++
 .../scripting/config/ScriptingDefaultsTests.java           | 7 +++++++
 .../org/springframework/scripting/config/TestBean.groovy   | 0
 .../scripting/config/scriptingDefaultsTests.xml            | 4 ++--
 4 files changed, 16 insertions(+), 2 deletions(-)
 rename org.springframework.context/src/test/{java => resources}/org/springframework/scripting/config/TestBean.groovy (100%)
 rename org.springframework.context/src/test/{java => resources}/org/springframework/scripting/config/scriptingDefaultsTests.xml (80%)

diff --git a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
index 928ca5c273..574fb05b43 100644
--- a/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
+++ b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd
@@ -87,6 +87,13 @@
 						]]></xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
+				<xsd:attribute name="name" type="xsd:string">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+	The name of this scripted bean as an alias or replacement for the id.
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
 				<xsd:attribute name="scope" type="xsd:string">
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
index 28d8882058..faccf0f190 100644
--- a/org.springframework.context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
@@ -27,6 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * @author Mark Fisher
+ * @author Dave Syer
  */
 public class ScriptingDefaultsTests extends TestCase {
 
@@ -51,6 +52,12 @@ public class ScriptingDefaultsTests extends TestCase {
 		assertTrue(testBean.isInitialized());
 	}
 
+	public void testNameAsAlias() {
+		ApplicationContext context = new ClassPathXmlApplicationContext(CONFIG);
+		ITestBean testBean = (ITestBean) context.getBean("/url");
+		assertTrue(testBean.isInitialized());
+	}
+
 	public void testDefaultDestroyMethod() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(CONFIG);
 		ITestBean testBean = (ITestBean) context.getBean("nonRefreshableTestBean");
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/config/TestBean.groovy b/org.springframework.context/src/test/resources/org/springframework/scripting/config/TestBean.groovy
similarity index 100%
rename from org.springframework.context/src/test/java/org/springframework/scripting/config/TestBean.groovy
rename to org.springframework.context/src/test/resources/org/springframework/scripting/config/TestBean.groovy
diff --git a/org.springframework.context/src/test/java/org/springframework/scripting/config/scriptingDefaultsTests.xml b/org.springframework.context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
similarity index 80%
rename from org.springframework.context/src/test/java/org/springframework/scripting/config/scriptingDefaultsTests.xml
rename to org.springframework.context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
index 50ccdf9585..e571ce2c88 100644
--- a/org.springframework.context/src/test/java/org/springframework/scripting/config/scriptingDefaultsTests.xml
+++ b/org.springframework.context/src/test/resources/org/springframework/scripting/config/scriptingDefaultsTests.xml
@@ -5,14 +5,14 @@
 		xsi:schemaLocation="http://www.springframework.org/schema/beans
 				http://www.springframework.org/schema/beans/spring-beans.xsd
 				http://www.springframework.org/schema/lang
-				http://www.springframework.org/schema/lang/spring-lang.xsd"
+				http://www.springframework.org/schema/lang/spring-lang-3.0.xsd"
 		default-autowire="byName"
 		default-init-method="startup"
 		default-destroy-method="shutdown">
 
 	<lang:defaults refresh-check-delay="5000"/>
 
-	<lang:groovy id="testBean" script-source="classpath:org/springframework/scripting/config/TestBean.groovy"/>
+	<lang:groovy id="testBean" name="/url" script-source="classpath:org/springframework/scripting/config/TestBean.groovy"/>
 
 	<lang:groovy id="nonRefreshableTestBean" refresh-check-delay="-1" 
 			script-source="classpath:org/springframework/scripting/config/TestBean.groovy"/>