You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jr...@apache.org on 2010/05/27 03:51:40 UTC
svn commit: r948649 - in
/wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring:
SpringBeanLocator.java SpringWebApplicationFactory.java
injection/annot/AnnotProxyFieldValueFactory.java
Author: jrthomerson
Date: Thu May 27 01:51:40 2010
New Revision: 948649
URL: http://svn.apache.org/viewvc?rev=948649&view=rev
Log:
fixes WICKET-2891
Modified:
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
Modified: wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java?rev=948649&r1=948648&r2=948649&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java Thu May 27 01:51:40 2010
@@ -150,7 +150,7 @@ public class SpringBeanLocator implement
}
StringBuilder msg = new StringBuilder();
- msg.append("more then one bean of type [");
+ msg.append("More than one bean of type [");
msg.append(clazz.getName());
msg.append("] found, you have to specify the name of the bean ");
msg.append("(@SpringBean(name=\"foo\")) in order to resolve this conflict. ");
Modified: wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java?rev=948649&r1=948648&r2=948649&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java Thu May 27 01:51:40 2010
@@ -166,7 +166,7 @@ public class SpringWebApplicationFactory
}
if (beans.size() > 1)
{
- throw new IllegalStateException("more then one bean of type [" +
+ throw new IllegalStateException("More than one bean of type [" +
WebApplication.class.getName() + "] found, must have only one");
}
return (WebApplication)beans.values().iterator().next();
@@ -221,4 +221,4 @@ public class SpringWebApplicationFactory
additionalContext.close();
}
}
-}
\ No newline at end of file
+}
Modified: wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java?rev=948649&r1=948648&r2=948649&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java Thu May 27 01:51:40 2010
@@ -215,7 +215,7 @@ public class AnnotProxyFieldValueFactory
}
}
StringBuilder msg = new StringBuilder();
- msg.append("more then one bean of type [");
+ msg.append("More than one bean of type [");
msg.append(clazz.getName());
msg.append("] found, you have to specify the name of the bean ");
msg.append("(@SpringBean(name=\"foo\")) in order to resolve this conflict. ");