You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by dr...@apache.org on 2010/01/28 08:07:46 UTC
svn commit: r903976 - in /tapestry/tapestry5/trunk/tapestry-spring: ./
src/main/java/org/apache/tapestry5/internal/spring/
src/main/java/org/apache/tapestry5/spring/
src/test/java/org/apache/tapestry5/internal/spring/
src/test/java/org/apache/tapestry5...
Author: drobiazko
Date: Thu Jan 28 07:07:45 2010
New Revision: 903976
URL: http://svn.apache.org/viewvc?rev=903976&view=rev
Log:
TAP5-976: Upgrade Spring dependencies to version 3.0.0.RELEASE
Added:
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java (contents, props changed)
- copied, changed from r901842, tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestyBeanFactory.java
Removed:
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestyBeanFactory.java
Modified:
tapestry/tapestry5/trunk/tapestry-spring/pom.xml
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestryApplicationContext.java
tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/internal/spring/SpringModuleDefTest.java
tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
Modified: tapestry/tapestry5/trunk/tapestry-spring/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/pom.xml?rev=903976&r1=903975&r2=903976&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/pom.xml Thu Jan 28 07:07:45 2010
@@ -26,7 +26,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.5.6</version>
+ <version>3.0.0.RELEASE</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Copied: tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java (from r901842, tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestyBeanFactory.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java?p2=tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java&p1=tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestyBeanFactory.java&r1=901842&r2=903976&rev=903976&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestyBeanFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java Thu Jan 28 07:07:45 2010
@@ -1,4 +1,4 @@
-// Copyright 2008 The Apache Software Foundation
+// Copyright 2008, 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -33,11 +33,11 @@
* org.apache.tapestry5.ioc.Registry#getObject(Class, org.apache.tapestry5.ioc.AnnotationProvider)} to provide the
* value.
*/
-public class TapestyBeanFactory extends DefaultListableBeanFactory
+public class TapestryBeanFactory extends DefaultListableBeanFactory
{
private final Registry registry;
- public TapestyBeanFactory(BeanFactory parentBeanFactory, Registry registry)
+ public TapestryBeanFactory(BeanFactory parentBeanFactory, Registry registry)
{
super(parentBeanFactory);
@@ -51,7 +51,7 @@
Class objectType = descriptor.getDependencyType();
- final Object[] annotations = descriptor.getAnnotations();
+ final Annotation[] annotations = descriptor.getAnnotations();
if (annotations != null)
{
Propchange: tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/TapestryBeanFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestryApplicationContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestryApplicationContext.java?rev=903976&r1=903975&r2=903976&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestryApplicationContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestryApplicationContext.java Thu Jan 28 07:07:45 2010
@@ -1,4 +1,4 @@
-// Copyright 2008 The Apache Software Foundation
+// Copyright 2008, 2009, 2010 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
package org.apache.tapestry5.spring;
import org.apache.tapestry5.TapestryFilter;
-import org.apache.tapestry5.internal.spring.TapestyBeanFactory;
+import org.apache.tapestry5.internal.spring.TapestryBeanFactory;
import org.apache.tapestry5.ioc.Registry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.web.context.support.XmlWebApplicationContext;
@@ -37,6 +37,6 @@
throw new IllegalStateException(
"Expected a Tapestry IoC Registry to be stored in the ServletContext, but the attribute was null.");
- return new TapestyBeanFactory(getInternalParentBeanFactory(), registry);
+ return new TapestryBeanFactory(getInternalParentBeanFactory(), registry);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/internal/spring/SpringModuleDefTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/internal/spring/SpringModuleDefTest.java?rev=903976&r1=903975&r2=903976&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/internal/spring/SpringModuleDefTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/internal/spring/SpringModuleDefTest.java Thu Jan 28 07:07:45 2010
@@ -67,7 +67,7 @@
assertEquals(sd.createServiceCreator(null).toString(),
"<ObjectCreator for externally configured Spring ApplicationContext>");
- expect(ac.getType("fred")).andReturn(Runnable.class);
+ expect((Class)ac.getType("fred")).andReturn(Runnable.class);
expect(ac.getBean("fred")).andReturn(fred);
@@ -85,7 +85,7 @@
verify();
- expect(ac.getType("barney")).andReturn(Runnable.class);
+ expect((Class)ac.getType("barney")).andReturn(Runnable.class);
expect(ac.getBean("barney")).andReturn(barney);
replay();
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java?rev=903976&r1=903975&r2=903976&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java Thu Jan 28 07:07:45 2010
@@ -49,7 +49,7 @@
{
open(BASE_URL);
- assertText("message", "SPRING VERSION 2.5.6: PIPELINE WAS INVOKED");
+ assertText("message", "SPRING VERSION 3.0.0.RELEASE: PIPELINE WAS INVOKED");
}
@Test