Skip to content

Commit

Permalink
Spring 3.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@poutsma
poutsma committed Aug 19, 2010
1 parent 9ab2c66 commit b266bef
Show file tree
Hide file tree
Showing 30 changed files with 67 additions and 55 deletions.
4 changes: 2 additions & 2 deletions build-spring-framework/resources/changelog.txt
View file
Expand Up @@ -3,7 +3,7 @@ SPRING FRAMEWORK CHANGELOG
http://www.springsource.org


Changes in version 3.0.4 (2010-08-18)
Changes in version 3.0.4 (2010-08-19)
-------------------------------------

* support for Hibernate Core 3.6, Hibernate Validator 4.1, EclipseLink 2.1, EHCache 2.2
Expand All @@ -17,7 +17,7 @@ Changes in version 3.0.4 (2010-08-18)
* fixed double ConversionFailedException nesting for ObjectToObjectConverter invocations
* BeanWrapper preserves annotation information for individual array/list/map elements
* Spring's constructor resolution consistently finds non-public multi-arg constructors
* revised constructor argument caching for highly concurrent creation scenarios
* revised constructor argument caching, avoiding a race condition for converted argument values
* SpEL passes full collection type context (generics, annotations) to ConversionService
* SpEL 'select last' operator now works consistently with maps
* BeanWrapper/DataBinder's "autoGrowNestedPaths" works for Maps as well
Expand Down
3 changes: 2 additions & 1 deletion build.properties
View file
Expand Up @@ -5,7 +5,8 @@ spring.osgi.range="${spring.osgi.range.nq}"
aj.osgi.range="[1.5.4, 2.0.0)"

#
release.type=integration
release.type=release
build.stamp=RELEASE
natural.name=spring-framework
project.name=Spring Framework
project.key=SPR
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.aop/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.asm/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>


Expand Down
4 changes: 2 additions & 2 deletions org.springframework.aspects/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.beans/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
12 changes: 7 additions & 5 deletions ...rk.beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
View file
Expand Up @@ -44,7 +44,6 @@
import org.springframework.beans.factory.config.ConstructorArgumentValues;
import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
import org.springframework.beans.factory.config.DependencyDescriptor;
import org.springframework.beans.factory.config.TypedStringValue;
import org.springframework.core.GenericTypeResolver;
import org.springframework.core.MethodParameter;
import org.springframework.core.ParameterNameDiscoverer;
Expand Down Expand Up @@ -515,13 +514,13 @@ else if (factoryMethodToUse != null && typeDiffWeight == minTypeDiffWeight) {
}

if (factoryMethodToUse == null) {
boolean hasArgs = resolvedValues.getArgumentCount() > 0;
boolean hasArgs = (resolvedValues.getArgumentCount() > 0);
String argDesc = "";
if (hasArgs) {
List<String> argTypes = new ArrayList<String>();
for (ValueHolder value : resolvedValues.getIndexedArgumentValues().values()) {
String argType = value.getType() != null ?
ClassUtils.getShortName(value.getType()) : value.getValue().getClass().getSimpleName();
String argType = (value.getType() != null ?
ClassUtils.getShortName(value.getType()) : value.getValue().getClass().getSimpleName());
argTypes.add(argType);
}
argDesc = StringUtils.collectionToCommaDelimitedString(argTypes);
Expand Down Expand Up @@ -686,15 +685,18 @@ private ArgumentsHolder createArgumentArray(
try {
convertedValue = converter.convertIfNecessary(originalValue, paramType,
MethodParameter.forMethodOrConstructor(methodOrCtor, paramIndex));
// TODO re-enable once race condition has been found (SPR-7423)
/*
if (originalValue == sourceValue || sourceValue instanceof TypedStringValue) {
// Either a converted value or still the original one: store converted value.
sourceHolder.setConvertedValue(convertedValue);
args.preparedArguments[paramIndex] = convertedValue;
}
else {
*/
args.resolveNecessary = true;
args.preparedArguments[paramIndex] = sourceValue;
}
// }
}
catch (TypeMismatchException ex) {
throw new UnsatisfiedDependencyException(
Expand Down
2 changes: 2 additions & 0 deletions ...eans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View file
Expand Up @@ -36,6 +36,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static org.junit.Assert.*;
import org.junit.Ignore;
import org.junit.Test;
import test.beans.DerivedTestBean;
import test.beans.DummyFactory;
Expand Down Expand Up @@ -1752,6 +1753,7 @@ public void testPrototypeCreationWithDependencyCheckIsFastEnough() {
*/

@Test
@Ignore // TODO re-enable when ConstructorResolver TODO sorted out
public void testPrototypeCreationWithConstructorArgumentsIsFastEnough() {
if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
// Skip this test: Trace logging blows the time limit.
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.context.support/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>


Expand Down
4 changes: 2 additions & 2 deletions org.springframework.context/pom.xml
View file
Expand Up @@ -6,12 +6,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.core/pom.xml
View file
Expand Up @@ -6,12 +6,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
3 changes: 2 additions & 1 deletion ...ingframework.core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
View file
Expand Up @@ -149,7 +149,8 @@ public void require(int expectedType, String namespaceURI, String localName) thr
public String getAttributeValue(String namespaceURI, String localName) {
for (int i = 0; i < getAttributeCount(); i++) {
QName name = getAttributeName(i);
if (name.getNamespaceURI().equals(namespaceURI) && name.getLocalPart().equals(localName)) {
if (name.getLocalPart().equals(localName) &&
(namespaceURI == null || name.getNamespaceURI().equals(namespaceURI))) {
return getAttributeValue(i);
}
}
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.expression/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.instrument.tomcat/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-instrument-tomcat</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.instrument/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

</project>
4 changes: 2 additions & 2 deletions org.springframework.integration-tests/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-integration-tests</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.jdbc/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.jms/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.orm/pom.xml
View file
Expand Up @@ -6,12 +6,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.oxm/pom.xml
View file
Expand Up @@ -6,12 +6,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.spring-library/pom.xml
View file
Expand Up @@ -14,7 +14,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-library</artifactId>
<packaging>libd</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<name>Spring Framework</name>
<description>Spring is a layered Java/J2EE application platform, based on code published in Expert
One-on-One J2EE Design and Development by Rod Johnson (Wrox, 2002). </description>
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.spring-parent/pom.xml
View file
Expand Up @@ -14,7 +14,7 @@
<artifactId>spring-parent</artifactId>
<packaging>pom</packaging>
<name>Spring Framework - Parent</name>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<description>Spring Framework Parent</description>
<scm>
<url>https://fisheye.springframework.org/browse/spring-framework</url>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.test/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.transaction/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.springframework.web.portlet/pom.xml
View file
Expand Up @@ -4,12 +4,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
<packaging>jar</packaging>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
<parent>
<groupId>org.springframework</groupId>
<artifactId>spring-parent</artifactId>
<relativePath>../org.springframework.spring-parent</relativePath>
<version>3.0.4.BUILD-SNAPSHOT</version>
<version>3.0.4.RELEASE</version>
</parent>

<dependencies>
Expand Down

0 comments on commit b266bef

Please sign in to comment.