Revision: 1491
http://svn.sourceforge.net/spring-rich-c/?rev=1491&view=rev
Author: ge0ffrey
Date: 2006-10-05 01:38:24 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
RCP-325 Upgrade to Spring 2.0 final after it's release
Modified Paths:
--------------
trunk/spring-richclient/pom.xml
trunk/spring-richclient/samples/petclinic/common/pom.xml
trunk/spring-richclient/src/site/apt/user/upgrading/upgradingTo0.3.x.apt
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/ValangRichValidator.java
Modified: trunk/spring-richclient/pom.xml
===================================================================
--- trunk/spring-richclient/pom.xml 2006-10-04 14:24:19 UTC (rev 1490)
+++ trunk/spring-richclient/pom.xml 2006-10-05 08:38:24 UTC (rev 1491)
@@ -477,7 +477,7 @@
</pluginRepositories>
<properties>
- <spring.version>1.2.8</spring.version>
+ <spring.version>2.0</spring.version>
</properties>
<dependencies>
@@ -680,6 +680,10 @@
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -688,90 +692,16 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.resource</groupId>
- <artifactId>connector</artifactId>
- </exclusion>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xdoclet</groupId>
- <artifactId>xjavadoc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.servlets</groupId>
- <artifactId>cos</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </exclusion>
- <exclusion>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jasperreports</groupId>
- <artifactId>jasperreports</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -790,16 +720,8 @@
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
+ <artifactId>spring-web</artifactId>
</exclusion>
- <!-- bug: http://jira.codehaus.org/browse/MNG-1797
- when dependency is listed elsewhere with a version,
- that one will override a transitive one, so no exclusions of
listed dependencies.
- -->
- <!--exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- </exclusion-->
</exclusions>
</dependency>
<dependency>
@@ -809,26 +731,21 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework</groupId>-->
<!--<artifactId>spring-mock</artifactId>-->
- <!--<version>1.2.6</version>-->
+ <!--<version>${spring.version}</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<!-- Spring's petclinic -->
- <dependency><!-- TODO verify that the one in repository indeed is
1.2.6 -->
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-petclinic</artifactId>
- <version>${spring.version}</version>
+ <version>1.2.8</version><!-- TODO Get in sync with
${spring.version} by deploying it in our repo -->
</dependency>
<dependency>
@@ -967,7 +884,7 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.5</version>
+ <version>1.8.0.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: trunk/spring-richclient/samples/petclinic/common/pom.xml
===================================================================
--- trunk/spring-richclient/samples/petclinic/common/pom.xml 2006-10-04
14:24:19 UTC (rev 1490)
+++ trunk/spring-richclient/samples/petclinic/common/pom.xml 2006-10-05
08:38:24 UTC (rev 1491)
@@ -18,11 +18,6 @@
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<scope>runtime</scope>
</dependency>
Modified:
trunk/spring-richclient/src/site/apt/user/upgrading/upgradingTo0.3.x.apt
===================================================================
--- trunk/spring-richclient/src/site/apt/user/upgrading/upgradingTo0.3.x.apt
2006-10-04 14:24:19 UTC (rev 1490)
+++ trunk/spring-richclient/src/site/apt/user/upgrading/upgradingTo0.3.x.apt
2006-10-05 08:38:24 UTC (rev 1491)
@@ -114,8 +114,10 @@
* Automatic service bean lookup
<<<DefaultApplicationServices>>> now searches for a bean with a name of
the decapitalized short name of the requested service type,
- if no bean was defined through direkt injection.
<<<ApplicationServicesLocator>>> can be used to lookup custom services as well
without
+ if no bean was defined through direct injection.
<<<ApplicationServicesLocator>>> can be used to lookup custom services as well
without
injecting them through <<<registryEntries>>> property of
<<<DefaultApplicationServices>>>.
If the service type is <<<org.springframework.rules.RulesSource>>> the
name to lookup will be <<<rulesSource>>>. If a bean can be found in
- the current application context and it implements
<<<org.springframework.rules.RulesSource>>> it will be used as the
implementation for it.
\ No newline at end of file
+ the current application context and it implements
<<<org.springframework.rules.RulesSource>>> it will be used as the
implementation for it.
+
+ * Upgraded dependencies on spring 2.0 final.
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/ValangRichValidator.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/ValangRichValidator.java
2006-10-04 14:24:19 UTC (rev 1490)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/binding/validation/support/ValangRichValidator.java
2006-10-05 08:38:24 UTC (rev 1491)
@@ -272,7 +272,7 @@
* properties.
*/
private class FormModel2BeanWrapperAdapter implements BeanWrapper {
-
+
public Object getPropertyValue(String propertyName) throws
BeansException {
return formModel.getValueModel(propertyName).getValue();
}
@@ -337,10 +337,15 @@
throw new UnsupportedOperationException("Not implemented");
}
- public void setPropertyValues(PropertyValues pvs, boolean
ignoreUnknown) throws BeansException {
+ public void setPropertyValues(PropertyValues propertyValues, boolean
ignoreUnknown) throws BeansException {
throw new UnsupportedOperationException("Not implemented");
}
+ public void setPropertyValues(PropertyValues propertyValues, boolean
ignoreUnknown, boolean ignoreInvalid)
+ throws BeansException {
+ throw new UnsupportedOperationException("Not implemented");
+ }
+
public void setExtractOldValueForEditor(boolean
extractOldValueForEditor){
throw new UnsupportedOperationException("Not implemented");
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
spring-rich-c-cvs mailing list
spring-rich-c-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
