Author: ivaynberg
Date: Tue Nov 4 08:40:38 2008
New Revision: 711303
URL: http://svn.apache.org/viewvc?rev=711303&view=rev
Log:
WICKET-1913
Modified:
wicket/trunk/pom.xml
wicket/trunk/wicket-examples/pom.xml
wicket/trunk/wicket-spring/pom.xml
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=711303&r1=711302&r2=711303&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Tue Nov 4 08:40:38 2008
@@ -333,7 +333,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.0</version>
+ <version>2.5.6</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified: wicket/trunk/wicket-examples/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=711303&r1=711302&r2=711303&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Tue Nov 4 08:40:38 2008
@@ -63,6 +63,10 @@
<artifactId>wicket-spring</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
Modified: wicket/trunk/wicket-spring/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/pom.xml?rev=711303&r1=711302&r2=711303&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/pom.xml (original)
+++ wicket/trunk/wicket-spring/pom.xml Tue Nov 4 08:40:38 2008
@@ -45,6 +45,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java?rev=711303&r1=711302&r2=711303&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
Tue Nov 4 08:40:38 2008
@@ -40,8 +40,10 @@
* Mock application context object. This mock context allows easy creation of
unit tests by allowing
* the user to put bean instances into the context.
*
- * Only [EMAIL PROTECTED] #getBean(String)}, [EMAIL PROTECTED]
#getBean(String, Class)}, and [EMAIL PROTECTED] #getBeansOfType(Class)
- * } are implemented so far. Any other method throws [EMAIL PROTECTED]
UnsupportedOperationException}.
+ * Only [EMAIL PROTECTED] #getBean(String)}, [EMAIL PROTECTED]
#getBean(String, Class)}, and
+ * [EMAIL PROTECTED] #getBeansOfType(Class)
+ * } are implemented so far. Any other method throws
+ * [EMAIL PROTECTED] UnsupportedOperationException}.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -106,7 +108,7 @@
}
/**
- * @see
org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(
java.lang.Class)
+ * @see
org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(java.lang.Class)
*/
public Map getBeansOfType(Class type) throws BeansException
{
@@ -151,7 +153,7 @@
/**
* @see org.springframework.context.ApplicationContext#publishEvent(org.
- * springframework.context.ApplicationEvent)
+ * springframework.context.ApplicationEvent)
*/
public void publishEvent(ApplicationEvent event)
{
@@ -160,7 +162,7 @@
/**
* @see org.springframework.beans.factory.ListableBeanFactory#
- * containsBeanDefinition(java.lang.String)
+ * containsBeanDefinition(java.lang.String)
*/
public boolean containsBeanDefinition(String beanName)
{
@@ -185,7 +187,7 @@
/**
* @see org.springframework.beans.factory.ListableBeanFactory#
- * getBeanNamesForType(java.lang.Class)
+ * getBeanNamesForType(java.lang.Class)
*/
public String[] getBeanNamesForType(Class type)
{
@@ -207,7 +209,7 @@
/**
* @see org.springframework.beans.factory.ListableBeanFactory#
- * getBeanNamesForType(java.lang.Class, boolean, boolean)
+ * getBeanNamesForType(java.lang.Class, boolean, boolean)
*/
public String[] getBeanNamesForType(Class type, boolean
includePrototypes,
boolean includeFactoryBeans)
@@ -216,8 +218,8 @@
}
/**
- * @see
org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(
java.lang.Class,
- * boolean, boolean)
+ * @see
org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(java.lang.Class,
+ * boolean, boolean)
*/
public Map getBeansOfType(Class type, boolean includePrototypes,
boolean includeFactoryBeans)
throws BeansException
@@ -267,7 +269,7 @@
/**
* @see
org.springframework.context.MessageSource#getMessage(java.lang.String,
- * java.lang.Object[], java.lang.String, java.util.Locale)
+ * java.lang.Object[], java.lang.String, java.util.Locale)
*/
public String getMessage(String code, Object[] args, String
defaultMessage, Locale locale)
{
@@ -276,7 +278,7 @@
/**
* @see
org.springframework.context.MessageSource#getMessage(java.lang.String,
- * java.lang.Object[], java.util.Locale)
+ * java.lang.Object[], java.util.Locale)
*/
public String getMessage(String code, Object[] args, Locale locale)
throws NoSuchMessageException
@@ -286,7 +288,7 @@
/**
* @see
org.springframework.context.MessageSource#getMessage(org.springframework
- * .context.MessageSourceResolvable, java.util.Locale)
+ * .context.MessageSourceResolvable, java.util.Locale)
*/
public String getMessage(MessageSourceResolvable resolvable, Locale
locale)
throws NoSuchMessageException
@@ -296,7 +298,7 @@
/**
* @see
org.springframework.core.io.support.ResourcePatternResolver#getResources
- * (java.lang.String)
+ * (java.lang.String)
*/
public Resource[] getResources(String locationPattern) throws
IOException
{
@@ -321,7 +323,7 @@
/**
* @see org.springframework.beans.factory.HierarchicalBeanFactory#
- * containsLocalBean(java.lang.String)
+ * containsLocalBean(java.lang.String)
*/
public boolean containsLocalBean(String arg0)
{
@@ -336,4 +338,40 @@
throw new UnsupportedOperationException();
}
+ /**
+ * @see org.springframework.context.ApplicationContext#getId()
+ */
+ public String getId()
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ /**
+ * @see
org.springframework.beans.factory.BeanFactory#getBean(java.lang.String,
+ * java.lang.Object[])
+ */
+ public Object getBean(String name, Object[] args) throws BeansException
+ {
+ throw new UnsupportedOperationException();
+
+ }
+
+ /**
+ * @see
org.springframework.beans.factory.BeanFactory#isPrototype(java.lang.String)
+ */
+ public boolean isPrototype(String name) throws
NoSuchBeanDefinitionException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @see
org.springframework.beans.factory.BeanFactory#isTypeMatch(java.lang.String,
+ * java.lang.Class)
+ */
+ public boolean isTypeMatch(String name, Class targetType) throws
NoSuchBeanDefinitionException
+ {
+ throw new UnsupportedOperationException();
+ }
+
}
