svn commit: r1295146 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java

2012-02-29 Thread lukaszlenart
Author: lukaszlenart
Date: Wed Feb 29 15:14:22 2012
New Revision: 1295146

URL: http://svn.apache.org/viewvc?rev=1295146&view=rev
Log:
WW-3748 s:bean shouldn't load class, just delegate that to ObjectFactory

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?rev=1295146&r1=1295145&r2=1295146&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java 
Wed Feb 29 15:14:22 2012
@@ -21,18 +21,16 @@
 
 package org.apache.struts2.components;
 
-import java.io.Writer;
-
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+
+import java.io.Writer;
 
 /**
  * 
@@ -94,8 +92,8 @@ import com.opensymphony.xwork2.util.refl
  *
  * @see Param
  */
-@StrutsTag(name="bean", tldTagClass="org.apache.struts2.views.jsp.BeanTag",
-description="Instantiate a JavaBean and place it in the context")
+@StrutsTag(name = "bean", tldTagClass = "org.apache.struts2.views.jsp.BeanTag",
+description = "Instantiate a JavaBean and place it in the context")
 public class Bean extends ContextBean {
 protected static final Logger LOG = LoggerFactory.getLogger(Bean.class);
 
@@ -107,12 +105,12 @@ public class Bean extends ContextBean {
 public Bean(ValueStack stack) {
 super(stack);
 }
-
+
 @Inject
 public void setObjectFactory(ObjectFactory objectFactory) {
 this.objectFactory = objectFactory;
 }
-
+
 @Inject
 public void setReflectionProvider(ReflectionProvider prov) {
 this.reflectionProvider = prov;
@@ -124,11 +122,10 @@ public class Bean extends ContextBean {
 ValueStack stack = getStack();
 
 try {
-String beanName = findString(name, "name", "Bean name is required. 
Example: com.acme.FooBean");
-bean = objectFactory.buildBean(ClassLoaderUtil.loadClass(beanName, 
getClass()), stack.getContext());
+String beanName = findString(name, "name", "Bean name is required. 
Example: com.acme.FooBean or proper Spring bean ID");
+bean = objectFactory.buildBean(beanName, stack.getContext(), 
false);
 } catch (Exception e) {
 LOG.error("Could not instantiate bean", e);
-
 return false;
 }
 
@@ -152,9 +149,9 @@ public class Bean extends ContextBean {
 reflectionProvider.setProperty(key, value, bean, 
getStack().getContext());
 }
 
-@StrutsTagAttribute(description="The class name of the bean to be 
instantiated (must respect JavaBean specification)",
-required=true)
+@StrutsTagAttribute(description = "The class name of the bean to be 
instantiated (must respect JavaBean specification)", required = true)
 public void setName(String name) {
 this.name = name;
 }
+
 }




[CONF] Confluence Changes in the last 24 hours

2012-02-29 Thread confluence
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ)

Pages
-
Retroactive Consumer edited by  gtully  (11:33 AM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/Retroactive+Consumer



Apache Archiva (https://cwiki.apache.org/confluence/display/ARCHIVA)

Pages
-
Archiva on JBoss edited by  olamy  (10:35 AM)
https://cwiki.apache.org/confluence/display/ARCHIVA/Archiva+on+JBoss



Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Camel 2.10.0 Release edited by  davsclaus  (07:19 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.10.0+Release



Apache DeltaSpike (https://cwiki.apache.org/confluence/display/DeltaSpike)

Pages
-
CDI 1.1 Proposals created by gpetracek (09:09 AM)
https://cwiki.apache.org/confluence/display/DeltaSpike/CDI+1.1+Proposals

CDI Proposals created by gpetracek (09:08 AM)
https://cwiki.apache.org/confluence/display/DeltaSpike/CDI+Proposals



Apache Directory client API (https://cwiki.apache.org/confluence/display/DIRAPI)

Pages
-
Navigation edited by  pamarcelot  (09:33 AM)
https://cwiki.apache.org/confluence/display/DIRAPI/Navigation



Apache Directory Website (https://cwiki.apache.org/confluence/display/DIRxSITE)

Pages
-
Index edited by  pamarcelot  (10:07 AM)
https://cwiki.apache.org/confluence/display/DIRxSITE/Index

Apache Directory Studio 2.0 M3 released created by pamarcelot (09:41 AM)
https://cwiki.apache.org/confluence/display/DIRxSITE/2012/02/29/Apache+Directory+Studio+2.0+M3+released

ApacheDS 2.0.0-M6 released created by pamarcelot (09:38 AM)
https://cwiki.apache.org/confluence/display/DIRxSITE/2012/02/29/ApacheDS+2.0.0-M6+released

Apache Directory LDAP API 1.0.0-M11 released created by pamarcelot (09:35 AM)
https://cwiki.apache.org/confluence/display/DIRxSITE/2012/02/29/Apache+Directory+LDAP+API+1.0.0-M11+released

Navigation edited by  pamarcelot  (09:34 AM)
https://cwiki.apache.org/confluence/display/DIRxSITE/Navigation



Apache Directory Studio (https://cwiki.apache.org/confluence/display/DIRxSTUDIO)

Pages
-
Downloads edited by  pamarcelot  (10:09 AM)
https://cwiki.apache.org/confluence/display/DIRxSTUDIO/Downloads

Index edited by  pamarcelot  (10:08 AM)
https://cwiki.apache.org/confluence/display/DIRxSTUDIO/Index

Navigation edited by  pamarcelot  (09:34 AM)
https://cwiki.apache.org/confluence/display/DIRxSTUDIO/Navigation



Apache Flex (https://cwiki.apache.org/confluence/display/FLEX)

Pages
-
Decisions so far created by rsan...@spectacompany.com.br (09:20 PM)
https://cwiki.apache.org/confluence/display/FLEX/Decisions+so+far

Apache Flex (incubating) Wiki edited by  rsan...@spectacompany.com.br  (09:58 
PM)
https://cwiki.apache.org/confluence/display/FLEX/Apache+Flex+%28incubating%29+Wiki



Apache Geronimo v3.0 (https://cwiki.apache.org/confluence/display/GMOxDOC30)

Pages
-
Configuring Virtual Host in Tomcat edited by  rglaue  (04:58 PM)
https://cwiki.apache.org/confluence/display/GMOxDOC30/Configuring+Virtual+Host+in+Tomcat



Apache HCatalog (https://cwiki.apache.org/confluence/display/HCATALOG)

Pages
-
HBase Secure Bulk Load created by toffer (05:36 PM)
https://cwiki.apache.org/confluence/display/HCATALOG/HBase+Secure+Bulk+Load



OFBiz (Open For Business) Project Open Wiki 
(https://cwiki.apache.org/confluence/display/OFBIZ)

Pages
-
Main New Features edited by  sascha  (03:48 AM)
https://cwiki.apache.org/confluence/display/OFBIZ/Main+New+Features



Apache OpenOffice Community 
(https://cwiki.apache.org/confluence/display/OOOUSERS)

Pages
-
(Draft) Public Statement on Email Forwarding edited by  robweir  (02:16 PM)
https://cwiki.apache.org/confluence/display/OOOUSERS/%28Draft%29+Public+Statement+on+Email+Forwarding

AOO 3.4 Unofficial Developer Snapshots edited by  arie...@apache.org  (11:09 AM)
https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4+Unofficial+Developer+Snapshots



UIMA (https://cwiki.apache.org/confluence/display/UIMA)

Pages
--